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 c9b7046f97158cf4f9bed5b4d43fc21567f53bb1..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;
 }
 
-#tabnav {
+#top-bar nav > ul {
   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;
 }
 
-/* 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%;
 
-  &.secondary-actions {
+  > ul {
+    display: inline-block;
     padding: 3px $lineheight/2;
   }
 
-  &.dropdown {
+  .dropdown {
+    display: inline-block;
     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 {
@@ -2560,43 +2566,3 @@ a.button {
     border-radius: 4px;
   }
 }
-
-.site-help {
-  #content {
-    a {
-      display: inline-block;
-      width: 45%;
-      height: 200px;
-      float: left;
-      text-align: center;
-      color: #000;
-      margin: 10px;
-      padding: 10px;
-      border-radius: 10px;
-    }
-
-    h3 {
-      margin-top: 50px;
-    }
-
-    a:hover {
-      text-decoration: none;
-    }
-
-    .welcome {
-      background-color: #D6FFB9;
-    }
-
-    .learnosm {
-      background-color: #BAFCFF;
-    }
-
-    .help {
-      background-color: #FCFFB9;
-    }
-
-    .wiki {
-      background-color: #FFB9CC;
-    }
-  }
-}