summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-03 23:52:39 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-03 23:52:39 -0500
commitacb5be88f394b126c3fba48ceb9798403c5afae1 (patch)
treed28ba5b07bc91cb92f02c9e490bff5501859e6fd /app/assets
parent9f246b9ec386ccb5e6665408d050cf71fc336283 (diff)
parentec9b2d4f40bd6a878aeca3ca32ba2aafe3836da5 (diff)
Merge branch 'master' of github.com:LukeShu/leager
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss14
1 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 2b8734e..39b6845 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -28,8 +28,8 @@ a {
color: #666;
}
&:hover {
- color: #fff;
- background-color: #000;
+ color: #000;
+ text-decoration: none;
}
}
@@ -84,6 +84,16 @@ hr {
margin: 18px 0;
}
+.navbar-brand {
+ a{
+ &:hover {
+ color: #FFF;
+ font-weight: normal;
+ text-decoration: none;
+ }
+ }
+}
+
#footer{
text-align: center;
}