X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/170b8fd4c6c02d72994b8bfeefb06d0e51f28945..bd21a1f7ffe1bff79cc3e249119e26ec946c7cc4:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 7d6b1acd4..ebc5109c6 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: 500; }
+strong {
+  font-weight: bold;
+  font-weight: 500;
+}
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
@@ -107,11 +110,15 @@ body.slim {
 }
 
 h1, h2, h3 {
+  font-weight: bold;
   font-weight: 500;
   line-height: 1.2;
 }
 
-h4, h5 { font-weight: 500; }
+h4, h5 {
+  font-weight: bold;
+  font-weight: 500;
+}
 
 h1 {
   font-size: 18px;
@@ -205,6 +212,7 @@ table {
     line-height: $lineheight;
   }
   th {
+    font-weight: bold;
     font-weight: 500;
     vertical-align: top;
   }
@@ -240,7 +248,7 @@ header {
   height: $headerHeight;
   position: relative;
   z-index: 1001;
-  font-size: 13px;
+  font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
@@ -262,7 +270,7 @@ header {
   img.logo {
     width: 30px;
     height: 30px;
-    margin-top: -4px;
+    margin-top: -2px;
     vertical-align: middle;
   }
 
@@ -302,6 +310,7 @@ nav.primary {
   a.tab,
   .dropdown-toggle {
     display: inline-block;
+    font-weight: bold;
     font-weight: 500;
     color: $green;
     padding: 5px 15px;
@@ -348,9 +357,9 @@ nav.secondary {
       display: inline-block;
       text-decoration: none;
       color: $darkgrey;
-      padding: 5px;
+      padding: 3px 5px 5px 5px;
 
-      &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 25%); }
     }
   }
 
@@ -360,8 +369,6 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
-
-    font-weight: 500;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
@@ -388,7 +395,8 @@ nav.secondary {
     &.logged-in > a {
       padding: 0;
       > .user-button {
-        padding: 5px 10px 5px 6px;
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;
         display: inline-block;
         color: $darkgrey;
       }
@@ -405,7 +413,7 @@ nav.secondary {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;
     border-radius: 2px;
   }
 
@@ -641,18 +649,29 @@ nav.secondary {
     }
   }
 
+  .welcome {
+    display: none;
+  }
+
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
     border-bottom-right-radius: 5px;
     overflow: hidden;
+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }
   }
 
   .welcome {
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
+      font-weight: normal;
       font-weight: 300;
     }
 
@@ -661,7 +680,7 @@ nav.secondary {
       float: left;
       margin: 0;
       border-radius: 0;
-      font-weight: 400;
+      font-weight: normal;
       padding: .6em;
 
       &.learn-more {
@@ -697,6 +716,14 @@ nav.secondary {
       color:#222;
       border:1px solid #ddd;
     }
+
+    .tooltip {
+      opacity: 1;
+      border: 1px solid #ccc;
+      .tooltip-arrow {
+        border-top-color: #ccc;
+      }
+    }
   }
 }
 
@@ -730,10 +757,12 @@ nav.secondary {
         padding: 2px 6px;
         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 +781,7 @@ nav.secondary {
       font-size: 13px;
       margin-bottom: 8px;
     }
+    li.disabled { color: #999; }
   }
 }
 
@@ -866,12 +896,13 @@ nav.secondary {
   }
 }
 
-#sidebar_content {
+#sidebar {
+  #sidebar_loader,
   .loader,
   .load_more {
     text-align: center;
     margin: $lineheight auto;
-    width: $lineheight;
+    width: 40px;
     display: block;
   }
 }
@@ -975,8 +1006,8 @@ header .search_form {
 
 #sidebar .changesets {
   li {
-    padding: $lineheight;
-    border-bottom: $keyline;
+    padding: 15px 20px;
+    border-bottom: 1px solid #ddd;
     cursor: pointer;
 
     &.selected { background: #FFFFE6; }
@@ -984,7 +1015,7 @@ header .search_form {
   }
 
   h4 {
-    margin-top: 0;
+    margin: 0;
     a {
       color: #000;
     }
@@ -996,12 +1027,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;
@@ -1057,6 +1093,7 @@ header .search_form {
     }
 
     .browse-tag-k {
+      font-weight: bold;
       font-weight: 500;
       background-color: #F6F6F6;
     }
@@ -1075,6 +1112,14 @@ header .search_form {
 
   .note-comments li {
     margin: $lineheight/2 0;
+
+    p {
+      margin-left: 10px;
+    }
+  }
+
+  .note-description {
+    margin: 0 0 10px 10px;
   }
 }
 
@@ -1092,10 +1137,28 @@ header .search_form {
     margin-bottom: $lineheight/2;
     input[type="text"] {
       width: 80px;
+      text-align: center;
       margin-bottom: 5px;
     }
   }
 
+  .export_boxy {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+
+    #maxlat { margin-top: -1px; }
+    #minlon {
+      float: left;
+      margin-left: -1px;
+    }
+    #maxlon {
+      float: right;
+      margin-right: -1px;
+    }
+    #minlat { margin-bottom: 0; }
+  }
+
   .export_bound {
     margin: $lineheight/4;
   }
@@ -1343,6 +1406,10 @@ header .search_form {
 }
 
 .user-view {
+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }
   p#no_home_location {
     margin: $lineheight;
   }
@@ -1492,7 +1559,7 @@ header .search_form {
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
-    height: 10em;
+    height: 20em;
   }
 
   #decline {
@@ -1501,11 +1568,6 @@ header .search_form {
       background: darken($lightblue, $hovercolor);
     }
   }
-
-  .form-row {
-    margin: auto;
-    max-width: 370px;
-  }
 }
 
 /* Rules for the account settings page */
@@ -1683,6 +1745,7 @@ header .search_form {
   h2 {
     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;
@@ -1716,6 +1779,7 @@ header .search_form {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
+    font-weight: bold;
     font-weight: 500;
     line-height: 1.5;
   }
@@ -1846,7 +1910,6 @@ ul.secondary-actions {
 
 div.secondary-actions {
   padding: 10px;
-  border-top: 1px solid #ccc;
   text-align: center;
 }
 
@@ -2423,6 +2486,7 @@ a.button {
     h1 {
       display: block;
       color: white;
+      font-weight: normal;
       font-weight: 300;
       font-size: 34px;
       span {