X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/12e820c27e992572007a160936ec2051cb961b8e..c72940684ea5c702bf2963fae096a2d48d845267:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 86b6805d1..019223825 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,9 @@ abbr, acronym {
   cursor: help;
 }
 
-strong { font-weight: 500; }
+strong {
+  font-weight: bold;
+}
 
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
@@ -118,16 +104,14 @@ body {
   height: 100%;
 }
 
-body.slim {
-  background-color: #f0f0f0;
-}
-
 h1, h2, h3 {
-  font-weight: 500;
+  font-weight: 600;
   line-height: 1.2;
 }
 
-h4, h5 { font-weight: 500; }
+h4, h5 {
+  font-weight: 500;
+}
 
 h1 {
   font-size: 18px;
@@ -192,7 +176,7 @@ small, aside {
 /* Rules for links */
 
 a {
-  color: #00f;
+  color: #24d;
   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;
@@ -221,7 +205,7 @@ table {
     line-height: $lineheight;
   }
   th {
-    font-weight: 500;
+    font-weight: 600;
     vertical-align: top;
   }
   td {
@@ -256,7 +240,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;
@@ -264,7 +248,7 @@ header {
 
   > * {
     height: 100%;
-    padding: $lineheight/2 $lineheight;
+    padding: $lineheight/2;
   }
 
   h1, nav.primary {
@@ -278,13 +262,13 @@ header {
   img.logo {
     width: 30px;
     height: 30px;
-    margin-top: -4px;
+    margin-top: -2px;
     vertical-align: middle;
   }
 
   h1 {
     margin: 0;
-    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
+    padding-top: 15px;
 
     a {
       color: #000;
@@ -366,7 +350,7 @@ nav.secondary {
       color: $darkgrey;
       padding: 5px;
 
-      &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 25%); }
     }
   }
 
@@ -376,8 +360,6 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
-
-    font-weight: 500;
     border: $border;
     border-radius: $border-radius;
     margin-left: 10px;
@@ -404,7 +386,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;
       }
@@ -421,7 +404,7 @@ nav.secondary {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;
     border-radius: 2px;
   }
 
@@ -466,7 +449,6 @@ nav.secondary {
   }
 }
 
-
 /* Utility for styling notification numbers */
 
 .count-number {
@@ -623,6 +605,7 @@ nav.secondary {
 
 .map-layout {
   #content {
+    overflow: hidden;
     position: absolute;
     top: $headerHeight;
     bottom: 0;
@@ -639,57 +622,61 @@ nav.secondary {
   #sidebar {
     float: left;
     width: $sidebarWidth;
+    background: #fff;
+    font-size: 12px;
 
-    h2, h3, h4 {
+    h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }
 
-    h4, span.user, span.date {
-      font-weight: normal;
-      color: #666;
-      font-size: 12px;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
+      font-size: 13px;
     }
 
     .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;
-    }
+  .welcome {
+    display: none;
   }
 
-  #sidebar.minimized {
+  .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
-    border-right: none;
-
+    border-bottom-right-radius: 5px;
+    overflow: hidden;
+    .welcome {
+      display: block;
+    }
     #sidebar_content {
       display: none;
     }
+  }
 
-    #search_form {
-      background: none;
-      width: 78%;
+  .welcome {
+    p {
+      padding: $lineheight/2 $lineheight $lineheight;
+      font-size: 110%;
+      font-weight: 300;
+    }
+
+    .button {
+      width: 50%;
+      float: left;
+      margin: 0;
+      border-radius: 0;
+      font-weight: normal;
+      padding: .6em;
+
+      &.learn-more {
+        border-right: 1px solid #fff;
+      }
     }
   }
 
@@ -720,6 +707,14 @@ nav.secondary {
       color:#222;
       border:1px solid #ddd;
     }
+
+    .tooltip {
+      opacity: 1;
+      border: 1px solid #ccc;
+      .tooltip-arrow {
+        border-top-color: #ccc;
+      }
+    }
   }
 }
 
@@ -753,15 +748,11 @@ nav.secondary {
         padding: 2px 6px;
         border-bottom-right-radius: 3px;
         cursor: pointer;
-        font-weight: 500;
+        font-weight: 600;
         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;
+        z-index: 2; // For IE9
         input[type="radio"] {
           display: none;
         }
@@ -780,6 +771,7 @@ nav.secondary {
       font-size: 13px;
       margin-bottom: 8px;
     }
+    li.disabled { color: #999; }
   }
 }
 
@@ -838,8 +830,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;
@@ -888,39 +880,50 @@ nav.secondary {
   }
 }
 
-#sidebar_content {
-  position: absolute;
-  top: 50px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
+#browse_status {
+  p {
+    padding: $lineheight;
+  }
+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
 
+#sidebar {
+  #sidebar_loader,
   .loader,
   .load_more {
     text-align: center;
     margin: $lineheight auto;
-    width: $lineheight;
+    width: 40px;
     display: block;
   }
 }
 
 /* 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;
@@ -939,7 +942,7 @@ nav.secondary {
     border-radius: 0 2px 2px 0;
   }
 
-  #describe_location {
+  .describe_location {
     position: absolute;
     top: 6px;
     right: 6px;
@@ -948,48 +951,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 {
@@ -1003,12 +964,14 @@ a.donate {
   }
 }
 
-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */
 
 .search_results_entry {
   ul li {
     border-bottom: $keyline;
+    cursor: pointer;
     &:first-child { border-top: $keyline; }
+    &.selected { background: #FFFFE6; }
   }
 
   .search_details {
@@ -1024,28 +987,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;
@@ -1057,43 +1000,51 @@ a.donate {
   display: none;
 }
 
-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */
 
 #sidebar .changesets {
   li {
-    padding: $lineheight;
-    border-bottom: $keyline;
+    padding: 15px 20px;
+    border-bottom: 1px solid #ddd;
     cursor: pointer;
 
     &.selected { background: #FFFFE6; }
     /* color is derived from changeset bbox fillColor in history.js */
   }
 
-  .comment a {
-    font-weight: 500;
-    color: #000;
+  h4 {
+    margin: 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;
+    border-bottom: 1px solid #ddd;
 
-    h4 {
-      padding: 0;
+    h4:first-child {
+      margin-top: 0;
+      word-wrap: break-word;
     }
+  }
 
-    .paginate {
-      float: right;
-      padding: 1px 6px;
-      border: 1px solid #eee;
-      border-radius: 3px;
-    }
+  .browse-section:last-of-type {
+    border-bottom: none;
+  }
+
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;
   }
 
-  .paginate ul, .note-comments ul {
+  .paginate ul {
     padding-left: 20px;
   }
 
@@ -1120,26 +1071,25 @@ a.donate {
 
   .browse-tag-list {
     background-color: #F6F6F6;
-    border-top: 1px solid #ddd;
-    border-bottom: 1px solid #ddd;
+    border: 1px solid #ddd;
+    border-radius: 3px;
     font-size: 12px;
-    margin-left: -$lineheight;
-    margin-right: -$lineheight;
+    table-layout: fixed;
+    border-collapse: separate;
 
-    li {
+    th, td {
       border-bottom: 1px solid #ddd;
     }
 
-    li:last-child {
+    tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {
-      display: inline-block;
       width: 50%;
-      float: left;
-      padding: 6px 10px 6px $lineheight;
+      padding: 6px 10px;
+      word-wrap: break-word;
     }
 
     .browse-tag-k {
@@ -1152,38 +1102,74 @@ a.donate {
       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, .export_button {
-  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;
+    p {
+      margin-left: 10px;
+    }
   }
-}
 
-.export_bound {
-  margin: $lineheight/4;
+  .note-description {
+    overflow: hidden;
+    margin: 0 0 10px 10px;
+  }
 }
 
-#export_osm {
-  span.small-title { 
-    font-weight: 500;
-    display: block;
-    font-size: 14px;
-    padding-bottom: 5px; 
+/* Rules for export sidebar */
+
+.export_form {
+  padding: $lineheight;
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;
+  }
+
+  .export_area_inputs {
+    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;
+  }
+
+  .export_button {
+    margin-top: $lineheight;
+    margin-bottom: $lineheight;
   }
 
   dl {
-    padding-left: 30px;
-    font-size: 13px;
-    color: #666;
+    padding-left: $lineheight/2;
     dd {
       margin-left: 0;
       margin-bottom: 10px;
@@ -1203,6 +1189,7 @@ a.donate {
 
   #map {
     height: 100%;
+    overflow: hidden;
   }
 }
 
@@ -1215,7 +1202,7 @@ a.donate {
 }
 
 .content-body {
-  h1, h2, h3, p {
+  h1, h2, h3, p, ul, ol {
     margin-bottom: $lineheight;
   }
 
@@ -1287,43 +1274,7 @@ a.donate {
   right: 0;
   bottom: 0;
   border: 0;
-  z-index: 1000;
-}
-
-#slim_container {
-  width: 100%;
-}
-
-#slim_container_content {
-  max-width: 50em;
-  background-color: #FFFFFF;
-  margin: $lineheight/2 auto;
-  padding: 3px;
-  border-radius: 25px;
-  -moz-border-radius: 25px;
-  border: 1px solid #e6e6e6;
-}
-
-#slim_content {
-  margin: $lineheight/2;
-  margin-top: 95px;
-  max-width: 50em;
-
-  .content-heading {
-    margin-bottom: 15px;
-  }
-}
-
-#slim_header {
-  margin: 30px $lineheight/2;
-  position: absolute;
-  top: 0px;
-  margin-right: $lineheight/4;
-  img {
-    vertical-align: middle;
-    margin-bottom: $lineheight/4;
-    margin-right: $lineheight/4;
-  }
+  z-index: 2000;
 }
 
 /* Rules for small maps in content areas */
@@ -1370,6 +1321,34 @@ a.donate {
   }
 }
 
+/* Rules for the new trace form */
+
+#new_trace {
+  input[type=text] {
+    width: 50%;
+    width: -moz-calc(100% - 150px);
+    width: -webkit-calc(100% - 150px);
+    width: calc(100% - 150px);
+    max-width: 500px;
+  }
+}
+
+/* Rules for the edit trace form */
+
+.edit_trace {
+  .form-row p {
+    margin-bottom: 0px;
+  }
+
+  input[type=text] {
+    width: 50%;
+    width: -moz-calc(100% - 150px);
+    width: -webkit-calc(100% - 150px);
+    width: calc(100% - 150px);
+    max-width: 500px;
+  }
+}
+
 /* Rules for the user profile page */
 
 #userinformation {
@@ -1421,6 +1400,10 @@ a.donate {
 }
 
 .user-view {
+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }
   p#no_home_location {
     margin: $lineheight;
   }
@@ -1570,7 +1553,7 @@ a.donate {
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
-    height: 10em;
+    height: 20em;
   }
 
   #decline {
@@ -1579,11 +1562,6 @@ a.donate {
       background: darken($lightblue, $hovercolor);
     }
   }
-
-  .form-row {
-    margin: auto;
-    max-width: 370px;
-  }
 }
 
 /* Rules for the account settings page */
@@ -1694,6 +1672,10 @@ a.donate {
   vertical-align: middle;
 }
 
+.inbox-sent {
+  white-space: nowrap;
+}
+
 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {
@@ -1706,6 +1688,7 @@ a.donate {
 
 .message-read .message-buttons {
   margin-top: $lineheight;
+  margin-bottom: $lineheight * 1.5;
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
@@ -1733,12 +1716,6 @@ a.donate {
 
 /* Rules for highlighting fields with rails validation errors */
 
-.field_with_errors {
-  padding: 2px;
-  background-color: #ff7070;
-  display: inline-block;
-}
-
 .formError {
   display: inline-block;
   padding: 5px 10px;
@@ -1761,7 +1738,7 @@ a.donate {
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
-    font-weight: 500;
+    font-weight: bold;
     font-size: 12px;
     background-color: #c00;
     color: #fff;
@@ -1794,7 +1771,7 @@ a.donate {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
-    font-weight: 500;
+    font-weight: bold;
     line-height: 1.5;
   }
   label.standard-label.secondary {
@@ -1851,6 +1828,10 @@ textarea {
   padding: 2px 5px;
   margin: 0;
   width: 200px;
+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }
 }
 
 textarea {
@@ -1877,6 +1858,8 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
+  width: auto;
+  height: auto;
   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
@@ -1924,7 +1907,6 @@ ul.secondary-actions {
 
 div.secondary-actions {
   padding: 10px;
-  border-top: 1px solid #ccc;
   text-align: center;
 }
 
@@ -1949,7 +1931,6 @@ a.button {
   cursor: pointer;
   border: 0;
   display: inline-block;
-  line-height: 20px;
   padding: $lineheight/4 $lineheight/2;
   min-height: 20px + $lineheight/2;
   min-width: 120px;
@@ -1980,6 +1961,16 @@ a.button {
   }
 }
 
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+  line-height: normal;
+}
+
+a.button {
+  line-height: 20px;
+}
+
 .buttons {
   min-width: 200px;
   input[type="submit"],
@@ -1990,7 +1981,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;
@@ -2125,14 +2116,32 @@ a.button {
 
 /* Rules for rich text editors */
 
+input.richtext_title[type="text"] {
+  width: 50%;
+  width: -moz-calc(100% - 235px);
+  width: -webkit-calc(100% - 235px);
+  width: calc(100% - 235px);
+
+  @media only screen and (max-width:768px) {
+    width: 100%;
+  }
+}
+
 .richtext_container {
   margin-bottom: $lineheight;
 
   .richtext_content {
     width: 50%;
+    width: -moz-calc(100% - 235px);
+    width: -webkit-calc(100% - 235px);
+    width: calc(100% - 235px);
     display: inline-block;
     vertical-align: top;
 
+    @media only screen and (max-width:768px) {
+      width: 100%;
+    }
+
     .richtext_preview {
       display: inline-block;
       padding: $lineheight;
@@ -2205,66 +2214,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 {
@@ -2402,7 +2351,7 @@ a.button {
 }
 
 /* Rules for the "Welcome" page */
-.site-welcome {
+.site-welcome, .site-fixthemap {
   .center {
     text-align: center;
     .sprite { 
@@ -2489,13 +2438,6 @@ a.button {
   background-size: cover;
   background-attachment: fixed;
 
-  &.photo-0 { background-image: image-url('about/0.jpg'); .photo-0 { display: block; } }
-  &.photo-1 { background-image: image-url('about/1.jpg'); .photo-1 { display: block; } }
-  &.photo-2 { background-image: image-url('about/2.jpg'); .photo-2 { display: block; } }
-  &.photo-3 { background-image: image-url('about/4.jpg'); .photo-3 { display: block; } }
-  &.photo-4 { background-image: image-url('about/4.jpg'); .photo-4 { display: block; } }
-  &.photo-5 { background-image: image-url('about/5.jpg'); .photo-5 { display: block; } }
-
   .caption {
     max-width: 200px;
     font: 13px/20px Helvetica, Arial, sans-serif;
@@ -2616,7 +2558,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; }
   }
 }