X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/537d72b0f66562475808249a1a2ef3223df5dd52..28a4185bb2dd3cd9cdff38defc4173d77cc8e96c:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index ca65a1b3d..9f6be1979 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,20 +1,4 @@
-/* Parameters */
-$lineheight: 20px;
-$typeheight: 14px;
-
-$offwhite: #f4f4ff;
-$blue: #7092FF;
-$lightblue: #B8C5F0;
-$green: #7ebc6f;
-$grey: #CCC;
-$red: red;
-$lightgrey: #EEE;
-$darkgrey: #AAA;
-$hovercolor: 20%;
-$headerHeight: 54px;
-$sidebarWidth: 300px;
-$keyline: 1px solid $lightgrey;
-$border-radius: 3px;
+@import "parameters";
 
 /* Styles common to large and small screens */
 
@@ -52,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/ */
 
@@ -115,6 +102,7 @@ body {
   margin: 0px;
   padding: 0px;
   text-align: left;
+  height: 100%;
 }
 
 body.slim {
@@ -122,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;
@@ -145,6 +137,8 @@ small, aside {
   font-size: 12px;
 }
 
+#container { position: relative; }
+
 .column-1 {
   width: 50%;
   margin: 0 0 $lineheight/2 0;
@@ -189,7 +183,7 @@ small, aside {
 /* Rules for links */
 
 a {
-  color: #00f;
+  color: #24d;
   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;
@@ -218,6 +212,7 @@ table {
     line-height: $lineheight;
   }
   th {
+    font-weight: bold;
     font-weight: 500;
     vertical-align: top;
   }
@@ -238,9 +233,9 @@ table {
 /* Rules for the header */
 
 #menu-icon { 
-  display: none;
+  display: none !important;
   float: right;
-  background: url("/assets/menu-icon.png") no-repeat;
+  background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
   display: block;
   width: 30px;
@@ -252,7 +247,6 @@ table {
 header {
   height: $headerHeight;
   position: relative;
-  // border-bottom: $keyline;
   z-index: 1001;
   font-size: 13px;
 
@@ -262,7 +256,7 @@ header {
 
   > * {
     height: 100%;
-    padding: $lineheight/2 $lineheight;
+    padding: $lineheight/2;
   }
 
   h1, nav.primary {
@@ -282,7 +276,7 @@ header {
 
   h1 {
     margin: 0;
-    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
+    padding-top: 15px;
 
     a {
       color: #000;
@@ -299,11 +293,10 @@ nav.primary {
 
     > li {
       border-right: $border;
+      float: left;
       &: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%); }
@@ -317,6 +310,7 @@ nav.primary {
   a.tab,
   .dropdown-toggle {
     display: inline-block;
+    font-weight: bold;
     font-weight: 500;
     color: $green;
     padding: 5px 15px;
@@ -357,14 +351,16 @@ nav.secondary {
   position: absolute;
   right: 0;
 
-  > ul a,
-  .dropdown-toggle {
-    display: inline-block;
-    text-decoration: none;
-    color: $darkgrey;
-    padding: 5px;
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;
 
-    &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 10%); }
+    }
   }
 
   > ul li.current a {
@@ -373,7 +369,7 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
-
+    font-weight: bold;
     font-weight: 500;
     border: $border;
     border-radius: $border-radius;
@@ -381,6 +377,7 @@ nav.secondary {
 
     > li {
       border-right: $border;
+      float: left;
       &:last-child { 
         border-right: 0;
 
@@ -394,6 +391,7 @@ nav.secondary {
 
     a {
       padding: 5px 15px;
+
     }
 
     &.logged-in > a {
@@ -401,7 +399,9 @@ nav.secondary {
       > .user-button {
         padding: 5px 10px 5px 6px;
         display: inline-block;
+        color: $darkgrey;
       }
+      &:hover > .user-button { color: darken($darkgrey, 5%); }
     }
   }
 
@@ -430,7 +430,8 @@ nav.secondary {
 
   .dropdown-menu {
     left: auto;
-    right: 0;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;
 
     .count-number {
       float: right;
@@ -440,6 +441,24 @@ nav.secondary {
   }
 }
 
+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;
+    color: #333;
+    &:hover { color: #fff; }
+  }
+}
+
+@media only screen and (max-width:960px) {
+  #compact-secondary-nav {
+    display: inline-block;
+  }
+  .compact-hide {
+    display: none;
+  }
+}
+
 /* Utility for styling notification numbers */
 
 .count-number {
@@ -596,6 +615,7 @@ nav.secondary {
 
 .map-layout {
   #content {
+    overflow: hidden;
     position: absolute;
     top: $headerHeight;
     bottom: 0;
@@ -612,57 +632,51 @@ nav.secondary {
   #sidebar {
     float: left;
     width: $sidebarWidth;
+    background: #fff;
+    font-size: 13px;
 
-    h2, h3, h4 {
+    h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }
 
-    h4 {
-      font-weight: normal;
-      color: #666;
-      font-size: 12px;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
     }
 
     .icon.close {
-      position: absolute;
-      right: $lineheight;
+      float: right;
       cursor: pointer;
     }
-
-    .footer {
-      position: absolute;
-      bottom: 0;
-    }
-
-    p.credits {
-      font-size: 11px;
-      color: #999;
-
-      a {
-        color: #666;
-      }
-    }
-
-    p.large-text {
-      font-size: 1.7em;
-      line-height: 1.4em;
-      font-weight: 300;
-    }
   }
 
-  #sidebar.minimized {
+  .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
-    border-right: none;
+    border-bottom-right-radius: 5px;
+    overflow: hidden;
+  }
 
-    #sidebar_content {
-      display: none;
+  .welcome {
+    p {
+      padding: $lineheight/2 $lineheight $lineheight;
+      font-size: 110%;
+      font-weight: normal;
+      font-weight: 300;
     }
 
-    #search_form {
-      background: none;
-      width: 78%;
+    .button {
+      width: 50%;
+      float: left;
+      margin: 0;
+      border-radius: 0;
+      font-weight: normal;
+      padding: .6em;
+
+      &.learn-more {
+        border-right: 1px solid #fff;
+      }
     }
   }
 
@@ -726,15 +740,11 @@ 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);
-        text-shadow:
-         -2px -2px 1px #fff,  
-          2px -2px 1px #fff,
-          -2px 2px 1px #fff,
-           2px 2px 1px #fff;
         input[type="radio"] {
           display: none;
         }
@@ -811,8 +821,8 @@ nav.secondary {
   }
 }
 
-.leaflet-top.leaflet-right {
-  top: $lineheight !important;
+.leaflet-top {
+  top: $lineheight/2 !important;
   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;
@@ -845,6 +855,8 @@ nav.secondary {
   text-align: center;
 }
 
+.donate-attr { color: darken($green, 10%) !important; }
+
 /* Rules for the sidebar */
 
 .sidebar_heading {
@@ -859,13 +871,14 @@ nav.secondary {
   }
 }
 
-#sidebar_content {
-  position: absolute;
-  top: 50px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
+#browse_status {
+  p {
+    padding: $lineheight;
+  }
+}
 
+#sidebar {
+  #sidebar_loader,
   .loader,
   .load_more {
     text-align: center;
@@ -877,21 +890,25 @@ nav.secondary {
 
 /* Rules for the search box */
 
-#search_form {
+header .search_form {
+  display: none;
+}
+
+.search_form {
   position: relative;
-  padding: $lineheight/2 $lineheight;
+  padding: $lineheight/2;
   background-color: $lightgrey;
 
-  #query_wrapper {
+  .query_wrapper {
     position: relative;
     overflow: hidden;
+    border-radius: 2px 0 0 2px;
   }
 
-  input {
+  input[type=text] {
     width: 100%;
     height: 30px;
     border-right: none;
-    border-radius: 2px 0 0 2px;
 
     transition: 300ms linear;
     -webkit-transition: 300ms linear;
@@ -910,7 +927,7 @@ nav.secondary {
     border-radius: 0 2px 2px 0;
   }
 
-  #describe_location {
+  .describe_location {
     position: absolute;
     top: 6px;
     right: 6px;
@@ -919,48 +936,6 @@ nav.secondary {
   }
 }
 
-/* Rules for donation request box */
-
-a.donate {
-  display: block;
-  padding: $lineheight/4 $lineheight;
-  border: 1px solid $green;
-  font-size: $typeheight;
-  line-height: 1.4;
-  text-align: center;
-  border-radius: 2px;
-  color: #222;
-  margin: $lineheight/2 $lineheight;
-
-  &:hover {
-    background: $green;
-    text-decoration: none;
-  }
-}
-
-/* Rules for rotating sidebar ads */
-
-.ad-container {
-  display: block;
-  height: 120px;
-  margin: auto;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;
-
-  a {
-    display: block;
-    width: 165px;
-    margin: auto;
-  }
-
-  .ad {
-    height: 100px;
-    border: 0;
-    background: #fff;
-  }
-}
-
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
@@ -974,7 +949,7 @@ a.donate {
   }
 }
 
-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */
 
 .search_results_entry {
   ul li {
@@ -995,28 +970,8 @@ a.donate {
   color: #f00;
 }
 
-/* Rules for data browser information which appears in the popout sidebar */
-
-#browse_content {
-  position: relative;
-  .browse_show_list.button {
-    position: absolute;
-    left: $lineheight;
-    right: $lineheight;
-    bottom: -40px;
-    margin-bottom: 0;
-  }
-  a.more-details {
-    position: absolute;
-    top: 0;
-    right: $lineheight;
-  }
-  ul li {
-    margin-bottom: 0;
-  }
-}
-
 /* Rules for entity history */
+
 #sidebar_content {
   .browse_details {
     position: relative;
@@ -1028,7 +983,7 @@ a.donate {
   display: none;
 }
 
-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */
 
 #sidebar .changesets {
   li {
@@ -1036,27 +991,37 @@ a.donate {
     border-bottom: $keyline;
     cursor: pointer;
 
-    &.selected { background: lighten($green, 35%); }
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */
   }
 
-  .comment a {
-    font-weight: bold;
-    color: #000;
+  h4 {
+    margin-top: 0;
+    a {
+      color: #000;
+    }
   }
 }
 
-/* Rules for the data browser */
+/* Rules for the browse sidebar */
 
 #sidebar_content {
   .browse-section {
-    padding: 10px 20px;
+    padding: $lineheight/2 $lineheight;
 
-    h4 {
-      padding: 0;
+    h4:first-child {
+      margin-top: 0;
     }
   }
 
-  .paginate ul, .note-comments ul {
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;
+  }
+
+  .paginate ul {
     padding-left: 20px;
   }
 
@@ -1082,12 +1047,13 @@ a.donate {
   }
 
   .browse-tag-list {
-    border: 1px solid #CCC;
-    border-radius: 4px;
+    background-color: #F6F6F6;
+    border: 1px solid #ddd;
+    border-radius: 3px;
     font-size: 12px;
 
     li {
-      border-bottom: 1px solid #CCC;
+      border-bottom: 1px solid #ddd;
     }
 
     li:last-child {
@@ -1098,53 +1064,61 @@ a.donate {
     .browse-tag-v {
       display: inline-block;
       width: 50%;
-      height: 30px;
       float: left;
       padding: 6px 10px;
     }
 
     .browse-tag-k {
+      font-weight: bold;
       font-weight: 500;
       background-color: #F6F6F6;
-      border-radius: 4px 0 0 4px;
     }
 
     .browse-tag-v {
-      border-left: 1px solid #CCC;
+      border-left: 1px solid #ddd;
+      background-color: #fff;
     }
   }
-}
 
-/* Rules for export information which appears in the popout sidebar */
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }
 
-.export_bounds {
-  text-align: center;
+  .note-comments li {
+    margin: $lineheight/2 0;
+  }
 }
 
-.export_area_inputs {
-  margin-bottom: $lineheight/2;
-  input[type="text"] {
-    width: 80px;
-    margin-bottom: 5px;
+/* Rules for export sidebar */
+
+.export_form {
+  padding: $lineheight;
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;
   }
-}
 
-.export_bound {
-  margin: $lineheight/4;
-}
+  .export_area_inputs {
+    margin-bottom: $lineheight/2;
+    input[type="text"] {
+      width: 80px;
+      margin-bottom: 5px;
+    }
+  }
 
-#export_osm {
-  span.small-title { 
-    font-weight: 500;
-    display: block;
-    font-size: 14px;
-    padding-bottom: 5px; 
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;
   }
 
   dl {
-    padding-left: 30px;
-    font-size: 13px;
-    color: #666;
+    padding-left: $lineheight/2;
     dd {
       margin-left: 0;
       margin-bottom: 10px;
@@ -1722,6 +1696,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;
@@ -1755,6 +1730,7 @@ a.donate {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
+    font-weight: bold;
     font-weight: 500;
     line-height: 1.5;
   }
@@ -1951,7 +1927,7 @@ a.button {
     float: left;
     border-radius: 0;
     margin:0;
-    min-width: 100px;
+    min-width: 75px;
     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;
@@ -2166,66 +2142,6 @@ a.button {
   }
 }
 
-/* Rules for the notes interface */
-
-.leaflet-popup-content .note {
-  padding-top: $lineheight/2;
-}
-
-.leaflet-popup-content .note {
-  h2 {
-    margin-bottom: $lineheight/2;
-  }
-
-  div {
-    margin-top: $lineheight/2;
-  }
-
-  .permalink {
-    position: absolute;
-    top: $lineheight/4;
-    left: $lineheight/4;
-    min-width: 15px;
-    min-height: 15px;
-  }
-
-  .permalink span {
-    display: none;
-    padding-left: $lineheight;
-  }
-
-  .permalink:hover span {
-    display: block;
-  }
-
-  .warning {
-    display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: $lineheight/2;
-  }
-
-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
-
-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
-    }
-  }
-
-  .comment {
-    width: 100%;
-    height: 100px;
-  }
-
-  .buttons {
-    margin-top: $lineheight/4;
-    text-align: right;
-  }
-}
-
 /* Rules for the iD editor */
 
 .id-embed {
@@ -2277,6 +2193,7 @@ a.button {
   list-style: none;
   background-color: #ffffff;
   border: 1px solid #ccc;
+  border-radius: 0 3px 3px;
   *border-right-width: 2px;
   *border-bottom-width: 2px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -2521,6 +2438,7 @@ a.button {
     h1 {
       display: block;
       color: white;
+      font-weight: normal;
       font-weight: 300;
       font-size: 34px;
       span {
@@ -2576,7 +2494,7 @@ a.button {
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }
-    &.contributors { background-position: 0px -120px; }
+    &.partners     { background-position: 0px -120px; }
     &.infringement { background-position: 0px -160px; }
   }
 }