Adjust header layout for user menu

[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 fa6b71b8d061a35d0186268730f291387585f749..b09becd049510656af0969c9ac2bc2037576b28c 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -493,15 +493,21 @@ a.donate {
   right: 0;
 }
 
   right: 0;
 }
 

-#tabnav {
+#top-bar nav > ul {

   height: 29px;
   margin-bottom: 0;
   height: 29px;
   margin-bottom: 0;

+}

 
 

-  > li {
-    float: left;
+nav.primary {
+  float: left;

 
 

-    > * {
-      padding: 3px $lineheight/2;
+  > ul {
+    > li {
+      float: left;
+
+      > * {
+        padding: 3px $lineheight/2;
+      }

     }
   }
 
     }
   }
 


@@ -546,28 +552,17 @@ a.donate {
   color: #000;
 }
 
   color: #000;
 }
 

-/* Utility for styling notification numbers */
-
-.count-number {
-  padding: 2px $lineheight/4;
-  border-radius: 2px;
-  background: #d7d7ff;
-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
-}
-
-/* Rules for greeting bar in the top right corner */
-
-#greeting {
+nav.secondary {

   float: right;
   height: 100%;
 
   float: right;
   height: 100%;
 

-  &.secondary-actions {
+  > ul {
+    display: inline-block;

     padding: 3px $lineheight/2;
   }
 
     padding: 3px $lineheight/2;
   }
 

-  &.dropdown {
+  .dropdown {
+    display: inline-block;

     background-color: #EEE;
     &:hover {
       background-color: #CCC;
     background-color: #EEE;
     &:hover {
       background-color: #CCC;


@@ -609,6 +604,17 @@ a.donate {
   }
 }
 
   }
 }
 

+/* Utility for styling notification numbers */
+
+.count-number {
+  padding: 2px $lineheight/4;
+  border-radius: 2px;
+  background: #d7d7ff;
+  margin: 0 2px;
+  font-size: 11px;
+  color: #333;
+}
+

 /* Rules for the message shown in place of the map when javascript is disabled */
 
 #noscript {
 /* Rules for the message shown in place of the map when javascript is disabled */
 
 #noscript {