Add current state to all nav elements

[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 7395afc99845579160029f4be90739cc56dd9e8d..8de88f478e673274cfd81a5841f6fb62ec7686e5 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -241,6 +241,7 @@ table {
   border-bottom: $keyline;
 
   #query_wrapper {
+    position: relative;
     overflow: hidden;
   }
 
@@ -266,6 +267,14 @@ table {
     min-width: 0;
     border-radius: 0 2px 2px 0;
   }
+
+  #describe_location {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;
+  }
 }
 
 /* Utility for de-emphasizing content */
@@ -319,43 +328,56 @@ header {
     float: left;
   }
 
+  a, a:hover {
+    text-decoration: none;
+  }
+
   img.logo {
-    width: 30px;
-    height: 30px;
+    width: 40px;
+    height: 40px;
     vertical-align: middle;
   }
 
   h1 {
     margin: 0;
     border-right: $keyline;
+
+    a {
+      color: #000;
+    }
   }
 }
 
 nav.primary {
   > ul {
-    border: 1px solid darken($green, 20%);
+    $border: 1px solid darken($green, 20%);
+
+    border: $border;
     border-radius: 4px;
+
+    > li {
+      border-right: $border;
+      &:last-child { border-right: 0; }
+    }
   }
 
-  a.tab {
+  a.tab,
+  .dropdown-toggle {
     display: inline-block;
     font-weight: bold;
-    text-decoration: none;
     color: $green;
     padding: 5px 15px;
-    border-right: 1px solid darken($green, 20%);
   }
 
-  #edit_tab a.tab {
-    border-right: 1px solid lighten($green, 20%);
+  .dropdown-toggle {
+    padding: 5px 10px;
   }
 
-  .dropdown-toggle {
-    padding: 5px 10px 5px 5px;
+  #edit_tab a.tab {
+    border-right: 1px solid lighten($green, 20%);
   }
 
   .caret {
-    margin-top: 15px;
     border-top-color: $green;
   }
 
@@ -371,20 +393,17 @@ nav.primary {
       border-top-color: #ccc;
     }
   }
-}
 
-.site-index #view_tab,
-.changeset-list #history_tab,
-.site-export #export_tab,
-.site-edit #edit_tab {
-  background-color: $green;
+  > ul li.current {
+    background-color: $green;
 
-  .tab {
-    color: #fff;
-  }
+    .tab {
+      color: #fff;
+    }
 
-  .caret {
-    border-top-color: #fff;
+    .caret {
+      border-top-color: #fff;
+    }
   }
 }
 
@@ -392,39 +411,55 @@ nav.secondary {
   position: absolute;
   right: 0;
 
-  > ul a {
+  > ul a,
+  .dropdown-toggle {
+    display: inline-block;
     font-weight: bold;
     text-decoration: none;
     color: $darkgrey;
-    padding-right: 10px;
+    padding: 5px 5px;
+  }
+
+  > ul li.current a {
+    color: darken($darkgrey, 25%);
   }
 
-  .dropdown {
-    border: 1px solid $grey;
+  .user-menu {
+    $border: 1px solid $grey;
+
+    border: $border;
     border-radius: 4px;
+    margin-left: 10px;
+
+    > li {
+      border-right: $border;
+      &:last-child { border-right: 0; }
+    }
+
+    a {
+      padding: 5px 15px;
+    }
   }
 
-  img {
+  .caret {
+    border-top-color: $grey;
+    margin-top: 10px;
+  }
+
+  img.user_thumbnail_tiny {
+    border: 0;
     vertical-align: top;
+    margin-top: 2px;
     border-radius: 2px 0 0 2px;
-    margin-right: 5px;
   }
 
   #inboxanchor {
     display: inline-block;
-    position: relative;
+    vertical-align: top;
     height: 20px;
-    top: -2px;
-    margin: 0 2px 0 0;
-    padding: 0 5px 0 0;
-    border-radius: 2px;
-  }
-
-  .dropdown-toggle {
-    display: block;
-    padding: 3px 7px;
-    color: #000;
-    text-decoration: none;
+    margin: 2px 7px 0 0;
+    background-color: $grey;
+    border-radius: 0 2px 2px 0;
   }
 
   .dropdown-menu {
@@ -713,7 +748,7 @@ nav.secondary {
 }
 
 .leaflet-top.leaflet-right {
-  top: 10px !important;
+  top: $lineheight !important;
   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;
@@ -1400,19 +1435,6 @@ body.browse #sidebar_content {
     margin-bottom: $lineheight;
     overflow: auto;
     height: 10em;
-
-    &:p#last {
-      margin-bottom: 0px;
-    }
-
-    &:ol {
-      margin-bottom: 0px;
-    }
-
-    &:img {
-      display: block;
-      margin: $lineheight auto inherit auto;
-    }
   }
 
   #decline {
@@ -1722,12 +1744,6 @@ img.user_thumbnail_tiny {
   border: 1px solid #ccc;
 }
 
-/* Rule for "nowrap" class that can be applied to anything to stop wrapping */
-
-.nowrap {
-  white-space: nowrap;
-}
-
 /* Rules for geo microformats */
 
 abbr.geo {
@@ -1766,10 +1782,6 @@ ul.secondary-actions {
       margin-right: 0px;
     }
   }
-  .dropdown-menu {
-    left: auto;
-    right: 0;
-  }
 }
 
 /* Utility for managing inner content areas */
@@ -2225,7 +2237,7 @@ a.button {
 .dropdown-submenu:focus > a {
   color: #ffffff;
   text-decoration: none;
-  background-color: #0081c2;
+  background-color: $green;
 }
 
 .dropdown-menu > .active > a,
@@ -2233,7 +2245,7 @@ a.button {
 .dropdown-menu > .active > a:focus {
   color: #ffffff;
   text-decoration: none;
-  background-color: #0081c2;
+  background-color: $green;
   outline: 0;
 }