Merge branch 'master' into notes

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 5eeab68a0c0d8c5d13c43f409bec098c5c896aff..0d8b882cba1ab6f084daf3504f008ccf91b3b955 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -511,6 +511,7 @@ table {
 #greeting {
   float: right;
   padding-top: 3px;
 #greeting {
   float: right;
   padding-top: 3px;

+  margin-right: 5px;

 }
 
 .greeting-bar-unread {
 }
 
 .greeting-bar-unread {


@@ -1508,6 +1509,9 @@ ul.secondary-actions {
       border-left: 0;
       padding-left: 0;
     }
       border-left: 0;
       padding-left: 0;
     }

+    &:last-child {
+      margin-right: 0px;
+    }

   }
 }
 
   }
 }