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 0c2d8ed01330cde6d6db5278d2ac54a305c14bf9..b09becd049510656af0969c9ac2bc2037576b28c 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -400,11 +400,15 @@ table {
     height: 25px;
     padding: 2px 0px 2px $lineheight/4;
     box-shadow: inset #DDD 0px 1px 3px;
+
+    transition: 300ms linear;
+    -webkit-transition: 300ms linear;
+    -moz-transition: 300ms linear;
   }
 
   input[type="text"]:focus {
+    box-shadow: 0px 0px 7px #9ED485;
     outline: none;
-    border: 1px solid #000;
   }
 
   input[type="submit"] {
@@ -489,73 +493,76 @@ a.donate {
   right: 0;
 }
 
-#tabnav {
+#top-bar nav > ul {
   height: 29px;
-  margin-bottom:0;
-  overflow: hidden;
-  li {
-    display: inline;
+  margin-bottom: 0;
+}
+
+nav.primary {
+  float: left;
+
+  > ul {
+    > li {
+      float: left;
+
+      > * {
+        padding: 3px $lineheight/2;
+      }
+    }
   }
-  a, a:link, a:visited {
-    float: left;
+
+  a.tab {
+    display: inline-block;
     font-weight: bold;
-    padding: 3px $lineheight/2;
     text-decoration: none;
     color: #333;
-    float: left;
-    margin-right: 1px;
+
     -webkit-transition: color 200ms ease-in;
        -moz-transition: color 200ms ease-in;
          -o-transition: color 200ms ease-in;
             transition: color 200ms ease-in;
+
+    &:hover {
+      text-decoration: underline;
+    }
   }
-}
 
-.site-index #tabnav a#viewanchor,
-.site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor {
-  border-bottom: 1px solid #aaa;
-  background: #9ed485;
-  color: #000;
-}
+  .disabled a {
+    color: #ccc;
+    cursor: default;
 
-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
-}
+    &:hover {
+      text-decoration: none;
+    }
 
-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
-  &:hover {
-    text-decoration: none;
+    .caret {
+      border-top-color: #ccc;
+    }
   }
-}
-
-/* Utility for styling notification numbers */
 
-.count-number {
-  padding: 2px $lineheight/4;
-  border-radius: 2px;
-  background: #d7d7ff;
-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
+  .dropdown {
+    height: 29px;
+  }
 }
 
-/* Rules for greeting bar in the top right corner */
+.site-index #view_tab,
+.site-edit #edit_tab,
+.changeset-list #history_tab {
+  background: #9ed485;
+  color: #000;
+}
 
-#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;
@@ -565,7 +572,7 @@ a.donate {
   img {
     vertical-align: top;
     border-radius: 2px 0 0 2px;
-    padding-right: 5px;
+    margin-right: 5px;
   }
 
   #inboxanchor {
@@ -597,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 {
@@ -951,7 +969,6 @@ a.donate {
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;
-  z-index: 9999;
   background: $offwhite;
   border-bottom: 1px solid #ccc;
   h4 {
@@ -1007,7 +1024,10 @@ a.donate {
 
   .search_details {
     display: block;
+    float: right;
     text-align: right;
+    margin-top: 0.2em;
+    margin-left: 0.5em;
   }
 }
 
@@ -1094,7 +1114,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .user-terms,
 .user-confirm,
 .site-copyright,
-.site-welcome {
+.site-welcome,
+.site-help {
   #content {
     max-width: 740px;
   }
@@ -1337,11 +1358,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
-#browse_map .geolink {
-  display: none;
-}
-
 #browse_map .secondary-actions {
+  display: none;
   margin-bottom: $lineheight/2;
 }
 
@@ -1936,7 +1954,7 @@ ul.secondary-actions {
     display: inline-block;
     margin-right: 60px;
   }
-  li {
+  > li {
     display: block;
     float: left;
     list-style: none;
@@ -1951,6 +1969,10 @@ ul.secondary-actions {
       margin-right: 0px;
     }
   }
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+  }
 }
 
 /* Utility for managing inner content areas */