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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 577df56c3..d456e0685 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -36,7 +36,10 @@ abbr, acronym {
   cursor: help;
 }
 
-strong { font-weight: bold; }
+strong {
+  font-weight: bold;
+  font-weight: 500;
+}
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
@@ -108,10 +111,14 @@ body.slim {
 
 h1, h2, h3 {
   font-weight: bold;
+  font-weight: 500;
   line-height: 1.2;
 }
 
-h4, h5 { font-weight: bold; }
+h4, h5 {
+  font-weight: bold;
+  font-weight: 500;
+}
 
 h1 {
   font-size: 18px;
@@ -206,6 +213,7 @@ table {
   }
   th {
     font-weight: bold;
+    font-weight: 500;
     vertical-align: top;
   }
   td {
@@ -236,13 +244,13 @@ table {
   opacity: 0.6;
 }
 
-header {
+#header {
   height: $headerHeight;
   position: relative;
   z-index: 1001;
   font-size: 13px;
 
-  h1, nav, nav > ul, nav > ul > li, .dropdown {
+  h1, .nav, .nav > ul, .nav > ul > li, .user-menu {
     display: inline-block;
   }
 
@@ -251,7 +259,7 @@ header {
     padding: $lineheight/2;
   }
 
-  h1, nav.primary {
+  h1, .nav.primary {
     float: left;
   }
 
@@ -276,7 +284,7 @@ header {
   }
 }
 
-nav.primary {
+.nav.primary {
   > ul {
     $border: 1px solid $green;
 
@@ -303,6 +311,7 @@ nav.primary {
   .dropdown-toggle {
     display: inline-block;
     font-weight: bold;
+    font-weight: 500;
     color: $green;
     padding: 5px 15px;
   }
@@ -338,11 +347,12 @@ nav.primary {
   }
 }
 
-nav.secondary {
+.nav.secondary {
   position: absolute;
   right: 0;
 
-  > ul {
+  > ul,
+  > #compact-secondary-nav {
     vertical-align: middle;
     a, .dropdown-toggle {
       display: inline-block;
@@ -350,7 +360,7 @@ nav.secondary {
       color: $darkgrey;
       padding: 5px;
 
-      &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 25%); }
     }
   }
 
@@ -360,8 +370,8 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
-
     font-weight: bold;
+    font-weight: 500;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
@@ -446,7 +456,7 @@ nav.secondary {
     display: inline-block;
   }
   .compact-hide {
-    display: none;
+    display: none !important;
   }
 }
 
@@ -654,6 +664,7 @@ nav.secondary {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
       font-weight: normal;
+      font-weight: 300;
     }
 
     .button {
@@ -697,6 +708,14 @@ nav.secondary {
       color:#222;
       border:1px solid #ddd;
     }
+
+    .tooltip {
+      opacity: 1;
+      border: 1px solid #ccc;
+      .tooltip-arrow {
+        border-top-color: #ccc;
+      }
+    }
   }
 }
 
@@ -731,9 +750,11 @@ nav.secondary {
         border-bottom-right-radius: 3px;
         cursor: pointer;
         font-weight: bold;
+        font-weight: 500;
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
+        z-index: 2; // For IE9
         input[type="radio"] {
           display: none;
         }
@@ -752,6 +773,7 @@ nav.secondary {
       font-size: 13px;
       margin-bottom: 8px;
     }
+    li.disabled { color: #999; }
   }
 }
 
@@ -879,7 +901,7 @@ nav.secondary {
 
 /* Rules for the search box */
 
-header .search_form {
+#header .search_form {
   display: none;
 }
 
@@ -977,7 +999,7 @@ header .search_form {
 #sidebar .changesets {
   li {
     padding: $lineheight;
-    border-bottom: $keyline;
+    border-bottom: 1px solid #ddd;
     cursor: pointer;
 
     &.selected { background: #FFFFE6; }
@@ -997,12 +1019,17 @@ header .search_form {
 #sidebar_content {
   .browse-section {
     padding: $lineheight/2 $lineheight;
+    border-bottom: 1px solid #ddd;
 
     h4:first-child {
       margin-top: 0;
     }
   }
 
+  :last-child {
+    border-bottom: none;
+  }
+
   .paginate {
     float: right;
     padding: 1px 6px;
@@ -1059,6 +1086,7 @@ header .search_form {
 
     .browse-tag-k {
       font-weight: bold;
+      font-weight: 500;
       background-color: #F6F6F6;
     }
 
@@ -1076,6 +1104,14 @@ header .search_form {
 
   .note-comments li {
     margin: $lineheight/2 0;
+
+    p {
+      margin-left: 10px;
+    }
+  }
+
+  .note-description {
+    margin: 0 0 10px 10px;
   }
 }
 
@@ -1493,7 +1529,7 @@ header .search_form {
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
-    height: 10em;
+    height: 20em;
   }
 
   #decline {
@@ -1502,11 +1538,6 @@ header .search_form {
       background: darken($lightblue, $hovercolor);
     }
   }
-
-  .form-row {
-    margin: auto;
-    max-width: 370px;
-  }
 }
 
 /* Rules for the account settings page */
@@ -1685,6 +1716,7 @@ header .search_form {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
+    font-weight: 500;
     font-size: 12px;
     background-color: #c00;
     color: #fff;
@@ -1718,6 +1750,7 @@ header .search_form {
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;
+    font-weight: 500;
     line-height: 1.5;
   }
   label.standard-label.secondary {
@@ -1847,7 +1880,6 @@ ul.secondary-actions {
 
 div.secondary-actions {
   padding: 10px;
-  border-top: 1px solid #ccc;
   text-align: center;
 }
 
@@ -2425,6 +2457,7 @@ a.button {
       display: block;
       color: white;
       font-weight: normal;
+      font-weight: 300;
       font-size: 34px;
       span {
         color: #76c551;