Merge remote-tracking branch 'upstream/pull/2267'

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f1fdc136b502f632a2ba0b82501e35b33c09d243..d3488fe73766cc15e3f04bbdc8fa9d604223d3dd 100644 (file)
--- 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 {
 body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; }
 
 abbr, acronym {

-  border-bottom: .1em dotted;
+  text-decoration: underline dotted;

   cursor: help;
 }
 
   cursor: help;
 }
 


@@ -150,6 +150,10 @@ small, aside {
 
 .piwik { border: 0; }
 
 
 .piwik { border: 0; }
 

+[dir=rtl] { /* no-r2 */ text-align: right; }
+
+[dir=ltr] { /* no-r2 */ text-align: left; }
+

 /* Rules for icons */
 
 .icon {
 /* Rules for icons */
 
 .icon {


@@ -611,11 +615,18 @@ body.compact {
     height: auto;
     overflow: hidden;
 
     height: auto;
     overflow: hidden;
 

-    #banner,
-    .welcome {
+    #banner {

       display: block;
     }
 
       display: block;
     }
 

+    .welcome {
+      display: none;
+
+      &.visible {
+        display: block;
+      }
+    }
+

     #sidebar_content {
       display: none;
     }
     #sidebar_content {
       display: none;
     }


@@ -938,6 +949,10 @@ header .search_forms,
     border-radius: 0 2px 2px 0;
   }
 
     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. */
   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 +982,8 @@ header .search_forms,
 
   img.button {
     display: block;
 
   img.button {
     display: block;

+    width: 20px;
+    height: 20px;

   }
 
   span.force_width {
   }
 
   span.force_width {


@@ -1002,6 +1019,11 @@ header .search_forms,
       vertical-align: middle;
     }
   }
       vertical-align: middle;
     }
   }

+
+  a.reverse_directions {
+    cursor: pointer;
+    margin: 0px 0px 5px 25px;
+  }

 }
 
 /* Rules for the map key which appears in the popout sidebar */
 }
 
 /* Rules for the map key which appears in the popout sidebar */


@@ -1019,7 +1041,7 @@ header .search_forms,
 
 /* Rules for search sidebar */
 
 
 /* Rules for search sidebar */
 

-.search_results_entry {
+#sidebar .search_results_entry {

   ul li {
     border-bottom: $keyline;
     cursor: pointer;
   ul li {
     border-bottom: $keyline;
     cursor: pointer;


@@ -1027,12 +1049,9 @@ header .search_forms,
     &.selected { background: $list-highlight; }
   }
 
     &.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 +1141,11 @@ tr.turn:hover {
   .comments-0 {
     opacity: 0.5;
   }
   .comments-0 {
     opacity: 0.5;
   }

+
+  .changeset_more .loader {
+    display: none;
+    width: 100%;
+  }

 }
 
 /* Rules for the browse sidebar */
 }
 
 /* Rules for the browse sidebar */


@@ -1217,7 +1241,8 @@ tr.turn:hover {
     margin: $lineheight/2 0;
 
     p {
     margin: $lineheight/2 0;
 
     p {

-      margin-left: 10px;
+      margin: 10px 6px 0 6px;
+      line-height: 1.5;

     }
   }
 
     }
   }
 


@@ -1303,11 +1328,11 @@ tr.turn:hover {
     #maxlat { margin-top: -1px; }
     #minlon {
       float: left;
     #maxlat { margin-top: -1px; }
     #minlon {
       float: left;

-      margin-left: -1px;
+      /* no-r2 */ margin-left: -1px;

     }
     #maxlon {
       float: right;
     }
     #maxlon {
       float: right;

-      margin-right: -1px;
+      /* no-r2 */ margin-right: -1px;

     }
     #minlat { margin-bottom: 0; }
   }
     }
     #minlat { margin-bottom: 0; }
   }


@@ -1382,9 +1407,9 @@ tr.turn:hover {
 
 /* Overrides for pages that use new layout conventions */
 
 
 /* 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;
 
   .content-body .content-inner {
     padding: 0;
 


@@ -1395,10 +1420,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;
   }
   .content-heading .content-inner {
     height: 200px;
   }


@@ -1435,6 +1460,10 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

+[dir=rtl] .header-illustration {
+  transform: scaleX(-1);
+}
+

 #content.maximised {
   top: 0;
   left: 0;
 #content.maximised {
   top: 0;
   left: 0;


@@ -1490,7 +1519,7 @@ tr.turn:hover {
 
 /* Rules for the trace view */
 
 
 /* Rules for the trace view */
 

-.trace-view {
+.trace-show {

   .trace_pending {
     color: red;
   }
   .trace_pending {
     color: red;
   }


@@ -1574,7 +1603,7 @@ tr.turn:hover {
   margin-left: 70px;
 }
 
   margin-left: 70px;
 }
 

-.user-view {
+.users-show {

   // Silly exception; remove when user page is redesigned.
   .content-inner {
     max-width: none;
   // Silly exception; remove when user page is redesigned.
   .content-inner {
     max-width: none;


@@ -1635,10 +1664,18 @@ tr.turn:hover {
 
 .diary_post {
   position: relative;
 
 .diary_post {
   position: relative;

-  margin-top: $lineheight/2;

   padding-top: $lineheight;
   padding-top: $lineheight;

+  padding-bottom: $lineheight/2;

   border-top: 1px solid #ccc;
 
   border-top: 1px solid #ccc;
 

+  &:first-of-type {
+    margin-top: $lineheight/2;
+  }
+
+  &.deemphasize {
+    background-color: #fee;
+  }
+

   .post_heading {
     margin-bottom: $lineheight;
 
   .post_heading {
     margin-bottom: $lineheight;
 


@@ -1659,17 +1696,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 */
 
 .pagination {
   padding-top: $lineheight;
 }
 
 /* Rules for the diary entry page */
 

-.diary_entry {
+.diary_entries {

   #map {
     position: relative;
     width: 90%;
   #map {
     position: relative;
     width: 90%;


@@ -1687,14 +1720,17 @@ tr.turn:hover {
     max-width: 740px;
   }
   .diary-comment {
     max-width: 740px;
   }
   .diary-comment {

-    margin-top: $lineheight/2;

     border-top: 1px dashed #ccc;
     padding-top: $lineheight/2;
     border-top: 1px dashed #ccc;
     padding-top: $lineheight/2;

+    padding-bottom: $lineheight/2;

     &:first-child {
     &:first-child {

-      margin-top: $lineheight;
+      margin-top: $lineheight/2;

       padding-top: $lineheight;
       border-top: 1px solid #ccc;
     }
       padding-top: $lineheight;
       border-top: 1px solid #ccc;
     }

+    &.deemphasize {
+      background-color: #fee;
+    }

     p {
       margin-bottom: $lineheight/2;
     }
     p {
       margin-bottom: $lineheight/2;
     }


@@ -1705,7 +1741,7 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-.diary_entry-view img.user_thumbnail {
+.diary_entries-show img.user_thumbnail {

   float: left;
 }
 
   float: left;
 }
 


@@ -1729,7 +1765,7 @@ tr.turn:hover {
 
 /* Rules for the account confirmation page */
 
 
 /* Rules for the account confirmation page */
 

-.user-terms {
+.users-terms {

   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;


@@ -1882,14 +1918,14 @@ tr.turn:hover {
   display: none;
 }
 
   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;
 }
 
   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;
 }
 
   border-radius: 0;
 }
 


@@ -2297,6 +2333,7 @@ a.button {
     font-size: 13px;
     background: #e8e8e8;
     padding: 2px 3px;
     font-size: 13px;
     background: #e8e8e8;
     padding: 2px 3px;

+    white-space: pre-wrap;

 
     code {
       padding: 0;
 
     code {
       padding: 0;


@@ -2324,11 +2361,11 @@ a.button {
     margin-left: $lineheight;
   }
 
     margin-left: $lineheight;
   }
 

-  ul li {
+  ul > li {

     list-style: disc;
   }
 
     list-style: disc;
   }
 

-  ol li {
+  ol > li {

     list-style: decimal;
   }
 }
     list-style: decimal;
   }
 }


@@ -2602,7 +2639,7 @@ input.richtext_title[type="text"] {
   }
 
   .sprite.x {
   }
 
   .sprite.x {

-    background-position: -50px 0;
+    /* no-r2 */ background-position: -50px 0;

   }
 
   .sprite.term {
   }
 
   .sprite.term {


@@ -2611,27 +2648,27 @@ input.richtext_title[type="text"] {
   }
 
   .sprite.node {
   }
 
   .sprite.node {

-    background-position: -100px 0;
+    /* no-r2 */ background-position: -100px 0;

   }
 
   .sprite.way {
   }
 
   .sprite.way {

-    background-position: -150px 0;
+    /* no-r2 */ background-position: -150px 0;

   }
 
   .sprite.tag {
   }
 
   .sprite.tag {

-    background-position: -200px 0;
+    /* no-r2 */ background-position: -200px 0;

   }
 
   .sprite.editor {
   }
 
   .sprite.editor {

-    background-position: -250px 0;
+    /* no-r2 */ background-position: -250px 0;

   }
 
   .sprite.question {
   }
 
   .sprite.question {

-    background-position: -300px 0;
+    /* no-r2 */ background-position: -300px 0;

   }
 
   .sprite.rules {
   }
 
   .sprite.rules {

-    background-position: -350px 0;
+    /* no-r2 */ background-position: -350px 0;

   }
 
   .start-mapping {
   }
 
   .start-mapping {


@@ -2829,24 +2866,35 @@ input.richtext_title[type="text"] {
   margin-right:100px;
 }
 
   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;
 }
 
 }
 
 .issue-comments {
   width:475px;
 }
 

-.report-button {
-  float:right;
+.issues-list {
+  td:nth-child(2) {
+    white-space: nowrap;
+  }

 }
 
 .report-disclaimer {
   background: #fff1f0;
   color: #d85030;
   border-color: rgba(216, 80, 48, 0.3);
 }
 
 .report-disclaimer {
   background: #fff1f0;
   color: #d85030;
   border-color: rgba(216, 80, 48, 0.3);

-  padding: 5px;
+  padding: 10px 20px;

   margin-bottom: $lineheight;
 
   ul {
   margin-bottom: $lineheight;
 
   ul {