summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-04 17:09:50 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-04 17:09:50 -0500
commitc45d69d4a7e6232d088986a78f6e12a25ae7be63 (patch)
treed3b5625887ed1743e5dc512a24849ea3fb36c273 /app/assets
parentf10de077a7d5d6978bcb6d1264aa14880d4ce6b0 (diff)
parent4050ce81532a65883cbadbfc17c21d05d67061ba (diff)
Merge branch 'master' of github.com:LukeShu/leager
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/application.css6
-rw-r--r--app/assets/stylesheets/custom.css.scss6
2 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 35fe66b..b3f5d46 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,11 +13,13 @@
*/
#query{
- background-color: #888;
+ background-color: white;
border: 2px solid #ED9C28;
border-radius: 5px;
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;
}