diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:52:43 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:52:43 -0500 |
| commit | ad24f46d94ad94003da412eb98d763c7a2beb863 (patch) | |
| tree | ec56fd2ece1f18931733569ffb72a10672c5b6c2 /app/assets | |
| parent | 2eb8e1c090071abf3108828efc831f12128e17df (diff) | |
| parent | 4050ce81532a65883cbadbfc17c21d05d67061ba (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/application.css | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 896d7c1..b3f5d46 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -19,5 +19,7 @@ color: #FFF; font-weight: bold; height: 30px; - +} +.navbar{ + background-color: white; } diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 25cac21..a8a8e68 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -1,6 +1,10 @@ @import "bootstrap"; header > nav { - @extend .navbar; + @extend .navbar; @extend .navbar-inverse; + color: white; +} +header > nav > #log-buttons{ + margin-top: 8px; } |