X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ae4487921350e141efed42fdf7cd3fd70d72bc97..43c09d8062fc4aef4f1e0e5d3598e526a02bb288:/app/assets/stylesheets/common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index cb55f1ae0..d725cc287 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;
 }
 
@@ -611,11 +611,18 @@ body.compact {
     height: auto;
     overflow: hidden;
 
-    #banner,
-    .welcome {
+    #banner {
       display: block;
     }
 
+    .welcome {
+      display: none;
+
+      &.visible {
+        display: block;
+      }
+    }
+
     #sidebar_content {
       display: none;
     }
@@ -938,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. */
@@ -967,6 +978,8 @@ header .search_forms,
 
   img.button {
     display: block;
+    width: 20px;
+    height: 20px;
   }
 
   span.force_width {
@@ -1002,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 */
@@ -1019,7 +1037,7 @@ header .search_forms,
 
 /* Rules for search sidebar */
 
-.search_results_entry {
+#sidebar .search_results_entry {
   ul li {
     border-bottom: $keyline;
     cursor: pointer;
@@ -1027,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%;
   }
 }
 
@@ -1122,6 +1137,11 @@ tr.turn:hover {
   .comments-0 {
     opacity: 0.5;
   }
+
+  .changeset_more .loader {
+    display: none;
+    width: 100%;
+  }
 }
 
 /* Rules for the browse sidebar */
@@ -1217,7 +1237,8 @@ tr.turn:hover {
     margin: $lineheight/2 0;
 
     p {
-      margin-left: 10px;
+      margin: 10px 6px 0 6px;
+      line-height: 1.5;
     }
   }
 
@@ -1303,11 +1324,11 @@ tr.turn:hover {
     #maxlat { margin-top: -1px; }
     #minlon {
       float: left;
-      margin-left: -1px;
+      /* no-r2 */ margin-left: -1px;
     }
     #maxlon {
       float: right;
-      margin-right: -1px;
+      /* no-r2 */ margin-right: -1px;
     }
     #minlat { margin-bottom: 0; }
   }
@@ -1382,9 +1403,9 @@ 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;
 
@@ -1395,10 +1416,10 @@ tr.turn:hover {
   }
 }
 
-.user-new,
-.user-create,
-.user-terms,
-.user-confirm {
+.users-new,
+.users-create,
+.users-terms,
+.users-confirm {
   .content-heading .content-inner {
     height: 200px;
   }
@@ -1490,7 +1511,7 @@ tr.turn:hover {
 
 /* Rules for the trace view */
 
-.trace-view {
+.trace-show {
   .trace_pending {
     color: red;
   }
@@ -1574,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;
@@ -1659,17 +1680,13 @@ tr.turn:hover {
   }
 }
 
-.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 */
 
-.diary_entry {
+.diary_entries {
   #map {
     position: relative;
     width: 90%;
@@ -1705,7 +1722,7 @@ tr.turn:hover {
   }
 }
 
-.diary_entry-view img.user_thumbnail {
+.diary_entries-show img.user_thumbnail {
   float: left;
 }
 
@@ -1729,7 +1746,7 @@ tr.turn:hover {
 
 /* Rules for the account confirmation page */
 
-.user-terms {
+.users-terms {
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
@@ -1882,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;
 }
 
@@ -2297,6 +2314,7 @@ a.button {
     font-size: 13px;
     background: #e8e8e8;
     padding: 2px 3px;
+    white-space: pre-wrap;
 
     code {
       padding: 0;
@@ -2324,11 +2342,11 @@ a.button {
     margin-left: $lineheight;
   }
 
-  ul li {
+  ul > li {
     list-style: disc;
   }
 
-  ol li {
+  ol > li {
     list-style: decimal;
   }
 }
@@ -2829,22 +2847,43 @@ input.richtext_title[type="text"] {
   margin-right:100px;
 }
 
-.related-block{
-  width:280px;
-  float:right;
+.related-reports {
+  width: 280px;
+  float: right;
+
+  ul {
+    padding-left: $lineheight;
+    margin-bottom: 0;
+
+    li {
+      list-style: disc;
+    }
+  }
 }
 
 .issue-comments {
   width:475px;
 }
 
-.report-button {
-  float:right;
+.issues-list {
+  td:nth-child(2) {
+    white-space: nowrap;
+  }
 }
 
-.disclaimer {
-  width: 600px;
+.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;
+    }
+  }
 }