X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/91bd0b4b12469746a6e867332262907e35b2a013..4530f6e3e4a327f5adf348f1cb69fd1ef0bd90f9:/app/assets/stylesheets/common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 009082e28..56c4515d0 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -38,7 +38,7 @@ textarea,
 body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; }
 
 abbr, acronym {
-  border-bottom: .1em dotted;
+  text-decoration: underline dotted;
   cursor: help;
 }
 
@@ -148,35 +148,39 @@ small, aside {
 
 .red { color: $red; }
 
+.piwik { border: 0; }
+
 /* Rules for icons */
 
 .icon {
-  display:inline-block;
-  vertical-align:top;
-  width:20px;
-  height:20px;
-  background:transparent image-url("sprite.png") no-repeat 0 0;
-  text-indent:-9999px;
-  overflow:hidden;
-}
-
-.icon.search      { background-position: 0 0; }
-.icon.donate      { background-position: -20px 0; }
-.icon.zoomin      { background-position: -40px 0; }
-.icon.zoomout     { background-position: -60px 0; }
-.icon.geolocate   { background-position: -80px 0; }
-.active .icon.geolocate   { background-position: -80px -20px; }
-.icon.layers      { background-position: -100px 0; }
-.icon.key         { background-position: -120px 0; }
-.icon.share       { background-position: -140px 0; }
-.icon.clipboard   { background-position: -160px 0; }
-.icon.link        { background-position: -180px 0; }
-.icon.close       { background-position: -200px 0; }
-.icon.close:hover { background-position: -200px -20px; }
-.icon.check       { background-position: -220px 0; }
-.icon.note        { background-position: -240px 0; }
-.icon.note.grey   { background-position: -240px -20px; }
-.icon.query       { background-position: -260px 0; }
+  display: inline-block;
+  vertical-align: top;
+  width: 20px;
+  height: 20px;
+  background: transparent image-url("sprite.png") no-repeat 0 0;
+  background-image: image-url("sprite.svg");
+  text-indent: -9999px;
+  overflow: hidden;
+}
+
+.icon.search      { /* no-r2 */ background-position: 0 0; }
+.icon.donate      { /* no-r2 */ background-position: -20px 0; }
+.icon.zoomin      { /* no-r2 */ background-position: -40px 0; }
+.icon.zoomout     { /* no-r2 */ background-position: -60px 0; }
+.icon.geolocate   { /* no-r2 */ background-position: -80px 0; }
+.active .icon.geolocate   { /* no-r2 */ background-position: -80px -20px; }
+.icon.layers      { /* no-r2 */ background-position: -100px 0; }
+.icon.key         { /* no-r2 */ background-position: -120px 0; }
+.icon.share       { /* no-r2 */ background-position: -140px 0; }
+.icon.clipboard   { /* no-r2 */ background-position: -160px 0; }
+.icon.link        { /* no-r2 */ background-position: -180px 0; }
+.icon.close       { /* no-r2 */ background-position: -200px 0; }
+.close-wrap:hover .icon.close,
+.icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
+.icon.check       { /* no-r2 */ background-position: -220px 0; }
+.icon.note        { /* no-r2 */ background-position: -240px 0; }
+.icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
+.icon.query       { /* no-r2 */ background-position: -260px 0; }
 
 /* Rules for links */
 
@@ -489,7 +493,8 @@ body.compact {
     background-color: black;
   }
 
-  &.disabled {
+  &.disabled,
+  &.leaflet-disabled {
     background-color: #333;
     background-color: rgba(0,0,0,.5);
     cursor: default;
@@ -545,6 +550,17 @@ body.compact {
     background: #fff;
     font-size: 12px;
 
+    #sidebar_loader {
+      display: none;
+    }
+
+    > div {
+      position: relative;
+      float: left;
+      clear: both;
+      width: 100%;
+    }
+
     h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }
@@ -555,37 +571,67 @@ body.compact {
       font-size: 13px;
     }
 
+    .close-wrap {
+      cursor: pointer;
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: 60px;
+      height: 60px;
+
+      .icon.close {
+        pointer-events: none;
+        position: absolute;
+        right: 20px;
+        top: 20px;
+      }
+    }
+
     .icon.close {
       float: right;
       cursor: pointer;
     }
 
-    p.error {
-      background-color: #ff7070;
-      padding: 10px;
-      font-weight: bold;
-    }
-  }
+    .flash {
+      padding: 15px;
 
-  .welcome {
-    display: none;
+      picture {
+        margin-right: -25px;
+      }
+
+      div.message {
+        margin-left: 30px;
+      }
+    }
   }
 
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;
-    border-bottom-right-radius: 5px;
     overflow: hidden;
-    .welcome {
+
+    #banner {
       display: block;
     }
+
+    .welcome {
+      display: none;
+
+      &.visible {
+        display: block;
+      }
+    }
+
     #sidebar_content {
       display: none;
     }
   }
 
   .welcome {
+    display: none;
+    padding-bottom: 5px;
+
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
@@ -606,6 +652,15 @@ body.compact {
     }
   }
 
+  #banner {
+    display: none;
+
+    img {
+      display: block;
+      width: $sidebarWidth;
+    }
+  }
+
   #map {
     height: 100%;
     overflow: hidden;
@@ -690,7 +745,7 @@ body.compact {
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
-        z-index: 2; // For IE9
+        z-index: 1000;
         input[type="radio"] {
           display: none;
         }
@@ -835,10 +890,15 @@ body.compact {
 
 #sidebar {
   #sidebar_loader,
+  .search_more {
+    width: 100%;
+    margin: $lineheight auto;
+  }
+
   .loader,
   .load_more {
     text-align: center;
-    margin: $lineheight auto;
+    margin: auto;
     width: 40px;
     display: block;
   }
@@ -885,6 +945,10 @@ header .search_forms,
     border-radius: 0 2px 2px 0;
   }
 
+  input.error {
+    background-color: rgba($red, 0.4);
+  }
+
   select {
     /* this next line is to polyfill the vertical alignment of text within a select element,
      * which is different between firefox and chrome. */
@@ -914,6 +978,8 @@ header .search_forms,
 
   img.button {
     display: block;
+    width: 20px;
+    height: 20px;
   }
 
   span.force_width {
@@ -949,6 +1015,11 @@ header .search_forms,
       vertical-align: middle;
     }
   }
+
+  a.reverse_directions {
+    cursor: pointer;
+    margin: 0px 0px 5px 25px;
+  }
 }
 
 /* Rules for the map key which appears in the popout sidebar */
@@ -966,7 +1037,7 @@ header .search_forms,
 
 /* Rules for search sidebar */
 
-.search_results_entry {
+#sidebar .search_results_entry {
   ul li {
     border-bottom: $keyline;
     cursor: pointer;
@@ -974,12 +1045,9 @@ header .search_forms,
     &.selected { background: $list-highlight; }
   }
 
-  .search_details {
-    display: block;
-    float: right;
-    text-align: right;
-    margin-top: 0.2em;
-    margin-left: 0.5em;
+  .search_more .loader {
+    display: none;
+    width: 100%;
   }
 }
 
@@ -1002,8 +1070,8 @@ div.direction {
   height: 20px;
   background-repeat: no-repeat;
 }
-@for $i from 1 through 17 {
-div.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }
+@for $i from 0 through 25 {
+div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
 p#routing_summary {
@@ -1069,6 +1137,11 @@ tr.turn:hover {
   .comments-0 {
     opacity: 0.5;
   }
+
+  .changeset_more .loader {
+    display: none;
+    width: 100%;
+  }
 }
 
 /* Rules for the browse sidebar */
@@ -1141,6 +1214,7 @@ tr.turn:hover {
       width: 50%;
       padding: 6px 10px;
       word-wrap: break-word;
+      white-space: pre-wrap;
     }
 
     .browse-tag-k {
@@ -1155,16 +1229,16 @@ tr.turn:hover {
   }
 
   .warning {
-    margin: $lineheight/2 0;
-    padding: $lineheight/2;
-    font-size: 90%;
+    margin: 0 0 $lineheight/2 0;
+    padding: 0 $lineheight/2;
   }
 
   .note-comments li, .changeset-comments li {
     margin: $lineheight/2 0;
 
     p {
-      margin-left: 10px;
+      margin: 10px 6px 0 6px;
+      line-height: 1.5;
     }
   }
 
@@ -1329,18 +1403,23 @@ tr.turn:hover {
 
 /* Overrides for pages that use new layout conventions */
 
-.user-new,
-.user-create,
-.user-terms {
+.users-new,
+.users-create,
+.users-terms {
   .content-body .content-inner {
     padding: 0;
+
+    .message {
+      margin-top: 80px;
+      padding: 20px;
+    }
   }
 }
 
-.user-new,
-.user-create,
-.user-terms,
-.user-confirm {
+.users-new,
+.users-create,
+.users-terms,
+.users-confirm {
   .content-heading .content-inner {
     height: 200px;
   }
@@ -1430,6 +1509,18 @@ tr.turn:hover {
   }
 }
 
+/* Rules for the trace view */
+
+.trace-show {
+  .trace_pending {
+    color: red;
+  }
+
+  .geo {
+    display: inline;
+  }
+}
+
 /* Rules for the new trace form */
 
 #new_trace {
@@ -1504,7 +1595,7 @@ tr.turn:hover {
   margin-left: 70px;
 }
 
-.user-view {
+.users-show {
   // Silly exception; remove when user page is redesigned.
   .content-inner {
     max-width: none;
@@ -1587,14 +1678,10 @@ tr.turn:hover {
     float: left;
     display: block;
   }
-
-  ul.secondary-actions {
-    display: inline-block;
-  }
 }
 
-.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
-  display: inline;
+.pagination {
+  padding-top: $lineheight;
 }
 
 /* Rules for the diary entry page */
@@ -1635,10 +1722,17 @@ tr.turn:hover {
   }
 }
 
-.diary_entry-view img.user_thumbnail {
+.diary_entry-show img.user_thumbnail {
   float: left;
 }
 
+
+.diary-subscribe-buttons {
+  position:relative;
+  top: -30px;
+  left: 130px;
+}
+
 /* Rules for the log in page */
 
 #login_auth_buttons {
@@ -1652,13 +1746,21 @@ tr.turn:hover {
 
 /* Rules for the account confirmation page */
 
-.user-terms {
+.users-terms {
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
     height: 20em;
+
+    li {
+      list-style: inherit;
+    }
+
+    ol ol {
+      list-style-type: lower-alpha;
+    }
   }
 
   #decline {
@@ -1717,6 +1819,12 @@ tr.turn:hover {
   border-radius: 0 2px 2px 0;
 }
 
+/* Rules for the oauth authorization page */
+
+.oauth-authorize ul {
+  list-style: none;
+}
+
 /* Rules for messages pages */
 
 .messages {
@@ -1791,14 +1899,14 @@ tr.turn:hover {
   display: none;
 }
 
-.message-read .message-buttons {
+.messages-show .message-buttons {
   margin-top: $lineheight;
   margin-bottom: $lineheight * 1.5;
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
 
-.message-read .buttons .mark-unread-button {
+.messages-show .buttons .mark-unread-button {
   border-radius: 0;
 }
 
@@ -1823,6 +1931,19 @@ tr.turn:hover {
     display: inline-block;
     margin-left: $lineheight / 2;
     vertical-align: middle;
+
+    p {
+      margin-top: $lineheight * 0.5;
+      margin-bottom: $lineheight * 0.5;
+
+      &:first-child {
+        margin-top: 0px;
+      }
+
+      &:last-child {
+        margin-bottom: 0px;
+      }
+    }
   }
 }
 
@@ -2675,12 +2796,30 @@ input.richtext_title[type="text"] {
     vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
-    &.local        { background-position: 0px    0px; }
-    &.community    { background-position: 0px  -40px; }
-    &.open         { background-position: 0px  -80px; }
-    &.partners     { background-position: 0px -120px; }
-    &.infringement { background-position: 0px -160px; }
-    &.legal        { background-position: -45px -160px; }
+    &.local {
+      /* no-r2 */
+      background-position: 0px 0px;
+    }
+    &.community {
+      /* no-r2 */
+      background-position: 0px -40px;
+    }
+    &.open {
+      /* no-r2 */
+      background-position: 0px -80px;
+    }
+    &.partners {
+      /* no-r2 */
+      background-position: 0px -120px;
+    }
+    &.infringement {
+      /* no-r2 */
+      background-position: 0px -160px;
+    }
+    &.legal {
+      /* no-r2 */
+      background-position: -45px -160px;
+    }
   }
 }
 
@@ -2691,3 +2830,59 @@ input.richtext_title[type="text"] {
     display: none;
   }
 }
+
+.read-reports {
+  background: #eee;
+  opacity: 0.7;
+}
+
+.report-related-block {
+  display:inline-block;
+}
+
+.report-block {
+  width:475px;
+  float:left;
+  margin-right:100px;
+}
+
+.related-reports {
+  width: 280px;
+  float: right;
+
+  ul {
+    padding-left: $lineheight;
+    margin-bottom: 0;
+
+    li {
+      list-style: disc;
+    }
+  }
+}
+
+.issue-comments {
+  width:475px;
+}
+
+.issues-list {
+  td:nth-child(2) {
+    white-space: nowrap;
+  }
+}
+
+.report-disclaimer {
+  background: #fff1f0;
+  color: #d85030;
+  border-color: rgba(216, 80, 48, 0.3);
+  padding: 10px 20px;
+  margin-bottom: $lineheight;
+
+  ul {
+    padding-left: $lineheight;
+    margin-bottom: 0;
+
+    li {
+      list-style: disc;
+    }
+  }
+}