X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d4a137959573a9bada01e2622613c87b5056f92..ee9642a28b5e412db8ffff940b3097dbefb458e6:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 43d59cfb5..6e1c8e016 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -10,9 +10,10 @@ $grey: #CCC;
 $lightgrey: #EEE;
 $darkgrey: #AAA;
 $hovercolor: 20%;
-$headerHeight: 75px;
-$sidebarWidth: 350px;
-$keyline: 1px solid $grey;
+$headerHeight: 54px;
+$sidebarWidth: 300px;
+$keyline: 1px solid $lightgrey;
+$border-radius: 3px;
 
 /* Styles common to large and small screens */
 
@@ -118,7 +119,7 @@ body.slim {
 }
 
 h1, h2, h3 {
-  font-weight: bold;
+  font-weight: 500;
   line-height: 1.2;
 }
 
@@ -182,6 +183,8 @@ small, aside {
 a {
   color: #00f;
   text-decoration: none;
+  -webkit-appearance: none;
+  outline: 0;
   &:hover {
     text-decoration: underline;
   }
@@ -207,7 +210,7 @@ table {
     line-height: $lineheight;
   }
   th {
-    font-weight: bold;
+    font-weight: 500;
     vertical-align: top;
   }
   td {
@@ -229,8 +232,9 @@ table {
 header {
   height: $headerHeight;
   position: relative;
-  border-bottom: $keyline;
+  // border-bottom: $keyline;
   z-index: 1001;
+  font-size: 13px;
 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
@@ -238,7 +242,7 @@ header {
 
   > * {
     height: 100%;
-    padding: $lineheight;
+    padding: $lineheight/2 $lineheight;
   }
 
   h1, nav.primary {
@@ -250,14 +254,15 @@ header {
   }
 
   img.logo {
-    width: 40px;
-    height: 40px;
+    width: 30px;
+    height: 30px;
+    margin-top: -4px;
     vertical-align: middle;
   }
 
   h1 {
     margin: 0;
-    border-right: $keyline;
+    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
 
     a {
       color: #000;
@@ -267,35 +272,43 @@ header {
 
 nav.primary {
   > ul {
-    $border: 1px solid darken($green, 20%);
+    $border: 1px solid $green;
 
     border: $border;
-    border-radius: 4px;
+    border-radius: $border-radius;
 
     > li {
       border-right: $border;
-      &:last-child { border-right: 0; }
+      &:last-child { 
+        border-right: 0;
+        > a { border-radius: 0 $border-radius $border-radius 0; } 
+      }
+      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
+      > a:hover { background: lighten($green, 30%); }
+      &.current > a:hover { background: $green; }
+      &.disabled > a:hover { background: lighten($green, 38%); }
+      &.dropdown {
+        > a.tab { border-right: 1px solid lighten($green, 30%); }
+        &.current > a.tab { border-right: 1px solid lighten($green, 10%); }
+      }
     }
   }
 
   a.tab,
   .dropdown-toggle {
     display: inline-block;
-    font-weight: bold;
+    font-weight: 500;
     color: $green;
     padding: 5px 15px;
   }
 
   .dropdown-toggle {
-    padding: 5px 10px;
-  }
-
-  #edit_tab a.tab {
-    border-right: 1px solid lighten($green, 20%);
+    padding: 5px 6px;
   }
 
   .caret {
     border-top-color: $green;
+    margin-top: 10px;
   }
 
   .disabled a {
@@ -327,10 +340,11 @@ nav.secondary {
   > ul a,
   .dropdown-toggle {
     display: inline-block;
-    font-weight: bold;
     text-decoration: none;
     color: $darkgrey;
-    padding: 5px 5px;
+    padding: 5px;
+
+    &:hover { color: darken($darkgrey, 10%); }
   }
 
   > ul li.current a {
@@ -340,39 +354,58 @@ nav.secondary {
   .user-menu {
     $border: 1px solid $grey;
 
+    font-weight: 500;
     border: $border;
-    border-radius: 4px;
+    border-radius: $border-radius;
     margin-left: 10px;
 
     > li {
       border-right: $border;
-      &:last-child { border-right: 0; }
+      &:last-child { 
+        border-right: 0;
+
+        > a {
+          border-radius: 0 $border-radius $border-radius 0;
+        } 
+      }
+      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
+      &:hover a { background: lighten($darkgrey, 30%); }
     }
 
     a {
       padding: 5px 15px;
     }
+
+    &.logged-in > a {
+      padding: 0;
+      > .user-button {
+        padding: 5px 10px 5px 6px;
+        display: inline-block;
+      }
+    }
   }
 
   .caret {
     border-top-color: $grey;
-    margin-top: 10px;
+    margin-top: 9px;
   }
 
   img.user_thumbnail_tiny {
     border: 0;
     vertical-align: top;
-    margin-top: 2px;
-    border-radius: 2px 0 0 2px;
+    margin-top: 0px;
+    margin: 3px 0 0 3px;
+    border-radius: 2px;
   }
 
   #inboxanchor {
     display: inline-block;
     vertical-align: top;
-    height: 20px;
-    margin: 2px 7px 0 0;
-    background-color: $grey;
-    border-radius: 0 2px 2px 0;
+    height: 25px;
+    margin: 3px 0 3px 3px;
+    background-color: lighten($grey, 10%);
+    line-height: 20px;
+    border-radius: 2;
   }
 
   .dropdown-menu {
@@ -561,17 +594,14 @@ nav.secondary {
     width: $sidebarWidth;
     border-right: $keyline;
 
-    .alert {
-      background: #e00;
-    }
-
     h2, h3, h4 {
-      padding: $lineheight;
-      border-bottom: $keyline;
+      padding: $lineheight $lineheight $lineheight/2;
     }
 
     h4 {
       font-weight: normal;
+      color: #666;
+      font-size: 12px;
     }
 
     .icon.close {
@@ -592,6 +622,28 @@ nav.secondary {
         color: #666;
       }
     }
+
+    p.large-text {
+      font-size: 1.7em;
+      line-height: 1.4em;
+      font-weight: 300;
+    }
+  }
+
+  #sidebar.minimized {
+    position: absolute;
+    z-index: 1000;
+    height: auto;
+    border-right: none;
+
+    #sidebar_content {
+      display: none;
+    }
+
+    #search_form {
+      background: none;
+      width: 78%;
+    }
   }
 
   #map {
@@ -767,19 +819,26 @@ nav.secondary {
 
 #sidebar_content {
   position: absolute;
-  top: 72px;
+  top: 50px;
   bottom: 0;
   width: 100%;
   overflow-y: auto;
+
+  .loader,
+  .load_more {
+    text-align: center;
+    margin: $lineheight auto;
+    width: $lineheight;
+    display: block;
+  }
 }
 
 /* Rules for the search box */
 
 #search_form {
   position: relative;
-  padding: $lineheight;
+  padding: $lineheight/2 $lineheight;
   background-color: $lightgrey;
-  border-bottom: $keyline;
 
   #query_wrapper {
     position: relative;
@@ -877,21 +936,10 @@ a.donate {
 
 /* Rules for search results which appear in the popout sidebar */
 
-.search_searching {
-  margin-top: $lineheight/4;
-  margin-bottom: $lineheight/4;
-}
-
 .search_results_entry {
-  .search_searching {
-    text-align: center;
-    margin: $lineheight auto;
-    width: $lineheight;
-    display: block;
-  }
-
   ul li {
-    border-bottom: 1px solid #ccc;
+    border-bottom: $keyline;
+    &:first-child { border-top: $keyline; }
   }
 
   .search_details {
@@ -928,8 +976,12 @@ a.donate {
   }
 }
 
-.browse_details {
-  position: relative;
+/* Rules for entity history */
+#sidebar_content {
+  .browse_details {
+    position: relative;
+    border-bottom: $keyline;
+  }
 }
 
 .browse_status {
@@ -942,6 +994,11 @@ a.donate {
   li {
     padding: $lineheight;
     border-bottom: $keyline;
+    cursor: pointer;
+  }
+
+  li.selected {
+    background: #FCFEA4;
   }
 }
 
@@ -949,8 +1006,15 @@ a.donate {
 
 #sidebar_content {
   .browse-section {
-    padding: 20px;
-    border-bottom: 1px solid #CCC;
+    padding: 10px 20px;
+
+    h4 {
+      padding: 0;
+    }
+  }
+
+  .paginate ul {
+    padding-left: 20px;
   }
 
   .browse-field {
@@ -993,11 +1057,11 @@ a.donate {
       width: 50%;
       height: 30px;
       float: left;
-      padding: 9px 10px;
+      padding: 6px 10px;
     }
 
     .browse-tag-k {
-      font-weight: bold;
+      font-weight: 500;
       background-color: #F6F6F6;
       border-radius: 4px 0 0 4px;
     }
@@ -1008,6 +1072,20 @@ a.donate {
   }
 }
 
+/* Rules for the changeset details */
+
+#sidebar_content {
+  .browse-section.header {
+    padding: 20px;
+    border-bottom: $keyline;
+
+    h2 {
+      padding: 0 0 5px 0;
+      border-bottom: none;
+    }
+  }
+}
+
 /* Rules for export information which appears in the popout sidebar */
 
 .export_bounds {
@@ -1026,11 +1104,26 @@ a.donate {
   margin: $lineheight/4;
 }
 
+/* Rules for edit pages */
+
+.site-edit {
+  #content {
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;
+  }
+
+  #map {
+    height: 100%;
+  }
+}
+
 /* Rules for non-map content pages */
 
 .content-heading {
   background: $lightgrey;
-  border-bottom: $keyline;
+  // border-bottom: $keyline;
 }
 
 .content-body {
@@ -1541,17 +1634,19 @@ a.donate {
 
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
-.flash {
-    padding: $lineheight;
-  &#error {
-    background-color: #ff7070;
-  }
-  &#warning {
-    background-color: #ffe0cc;
-  }
-  &#notice {
-    background-color: #CBEEA7;
-  }
+.error {
+  padding: $lineheight;
+  background-color: #ff7070;
+}
+
+.warning {
+  padding: $lineheight;
+  background-color: #ffe0cc;
+}
+
+.notice {
+  padding: $lineheight;
+  background-color: #CBEEA7;
 }
 
 /* Rules for highlighting fields with rails validation errors */
@@ -1584,7 +1679,7 @@ a.donate {
   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;
     color: #fff;
@@ -1617,7 +1712,7 @@ a.donate {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
-    font-weight: bold;
+    font-weight: 500;
     line-height: 1.5;
   }
   label.standard-label.secondary {
@@ -1745,6 +1840,12 @@ ul.secondary-actions {
   }
 }
 
+div.secondary-actions {
+  padding: 10px;
+  border-top: 1px solid #ccc;
+  text-align: center;
+}
+
 /* Utility for managing inner content areas */
 
 .inner22 { padding: $lineheight;}
@@ -2123,7 +2224,7 @@ a.button {
 .dropdown-menu {
   position: absolute;
   top: 100%;
-  left: 0;
+  left: -1px;
   z-index: 1000;
   display: none;
   float: left;
@@ -2401,7 +2502,7 @@ a.button {
       width: 240px;
       height: 150px;
       padding: 20px 20px 20px 40px;
-      font: bold 24px/25px Helvetica, Arial, sans-serif;
+      font: 500 24px/25px Helvetica, Arial, sans-serif;
       white-space: nowrap;
       color: #fff;
       background: #76c551