X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ae0177fbe61d7d02e3c6b441bd395fff6fd96a18..f74c984a49695df755ed853bc42f1da0fca363e6:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index c2f642edc..b09becd04 100644
--- 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,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;
+      }
     }
   }
 
@@ -542,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;
@@ -605,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 {
@@ -959,7 +969,6 @@ a.donate {
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;
-  z-index: 9999;
   background: $offwhite;
   border-bottom: 1px solid #ccc;
   h4 {
@@ -1015,7 +1024,10 @@ a.donate {
 
   .search_details {
     display: block;
+    float: right;
     text-align: right;
+    margin-top: 0.2em;
+    margin-left: 0.5em;
   }
 }
 
@@ -1102,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;
   }