Merge branch 'master' of github.com:LukeShu/leager

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/index.html.erb

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;
 }