On hover, change border to a subtle darker orange, increase strokeWidth

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index b54b49fd369e079362091532b2366913a0054fc9..4b8a80c5469b58c1ae219cff2816a6157e994904 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;
 }
 


@@ -148,6 +148,8 @@ small, aside {
 
 .red { color: $red; }
 
 
 .red { color: $red; }
 

+.piwik { border: 0; }
+

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


@@ -161,24 +163,24 @@ small, aside {
   overflow: hidden;
 }
 
   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.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,
 .close-wrap:hover .icon.close,

-.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; }
+.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 */
 
 
 /* Rules for links */
 


@@ -491,7 +493,8 @@ body.compact {
     background-color: black;
   }
 
     background-color: black;
   }
 

-  &.disabled {
+  &.disabled,
+  &.leaflet-disabled {

     background-color: #333;
     background-color: rgba(0,0,0,.5);
     cursor: default;
     background-color: #333;
     background-color: rgba(0,0,0,.5);
     cursor: default;


@@ -547,6 +550,10 @@ body.compact {
     background: #fff;
     font-size: 12px;
 
     background: #fff;
     font-size: 12px;
 

+    #sidebar_loader {
+      display: none;
+    }
+

     > div {
       position: relative;
       float: left;
     > div {
       position: relative;
       float: left;


@@ -582,12 +589,19 @@ body.compact {
 
     .icon.close {
       float: right;
 
     .icon.close {
       float: right;

+      cursor: pointer;

     }
 
     }
 

-    p.error {
-      background-color: #ff7070;
-      padding: 10px;
-      font-weight: bold;
+    .flash {
+      padding: 15px;
+
+      picture {
+        margin-right: -25px;
+      }
+
+      div.message {
+        margin-left: 30px;
+      }

     }
   }
 
     }
   }
 


@@ -597,11 +611,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;
     }


@@ -724,7 +745,7 @@ body.compact {
         font-size: 16px;
         text-stroke: 2px #fff;
         background: rgba(255,255,255,.9);
         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;
         }
         input[type="radio"] {
           display: none;
         }


@@ -869,10 +890,15 @@ body.compact {
 
 #sidebar {
   #sidebar_loader,
 
 #sidebar {
   #sidebar_loader,

+  .search_more {
+    width: 100%;
+    margin: $lineheight auto;
+  }
+

   .loader,
   .load_more {
     text-align: center;
   .loader,
   .load_more {
     text-align: center;

-    margin: $lineheight auto;
+    margin: auto;

     width: 40px;
     display: block;
   }
     width: 40px;
     display: block;
   }


@@ -919,6 +945,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. */


@@ -948,6 +978,8 @@ header .search_forms,
 
   img.button {
     display: block;
 
   img.button {
     display: block;

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

   }
 
   span.force_width {
   }
 
   span.force_width {


@@ -983,6 +1015,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 */


@@ -1000,7 +1037,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;


@@ -1008,12 +1045,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%;

   }
 }
 
   }
 }
 


@@ -1036,8 +1070,8 @@ div.direction {
   height: 20px;
   background-repeat: no-repeat;
 }
   height: 20px;
   background-repeat: no-repeat;
 }

-@for $i from 1 through 18 {
-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 {
 }
 
 p#routing_summary {


@@ -1103,6 +1137,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 */


@@ -1175,6 +1214,7 @@ tr.turn:hover {
       width: 50%;
       padding: 6px 10px;
       word-wrap: break-word;
       width: 50%;
       padding: 6px 10px;
       word-wrap: break-word;

+      white-space: pre-wrap;

     }
 
     .browse-tag-k {
     }
 
     .browse-tag-k {


@@ -1189,9 +1229,8 @@ tr.turn:hover {
   }
 
   .warning {
   }
 
   .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 {
   }
 
   .note-comments li, .changeset-comments li {


@@ -1469,6 +1508,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 {
 /* Rules for the new trace form */
 
 #new_trace {


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

-.user-view {
+.user-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;


@@ -1628,8 +1679,8 @@ 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 */
 }
 
 /* Rules for the diary entry page */


@@ -1670,10 +1721,17 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

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

   float: left;
 }
 
   float: left;
 }
 

+
+.diary-subscribe-buttons {
+  position:relative;
+  top: -30px;
+  left: 130px;
+}
+

 /* Rules for the log in page */
 
 #login_auth_buttons {
 /* Rules for the log in page */
 
 #login_auth_buttons {


@@ -1694,6 +1752,14 @@ tr.turn:hover {
     margin-bottom: $lineheight;
     overflow: auto;
     height: 20em;
     margin-bottom: $lineheight;
     overflow: auto;
     height: 20em;

+
+    li {
+      list-style: inherit;
+    }
+
+    ol ol {
+      list-style-type: lower-alpha;
+    }

   }
 
   #decline {
   }
 
   #decline {


@@ -1752,6 +1818,12 @@ tr.turn:hover {
   border-radius: 0 2px 2px 0;
 }
 
   border-radius: 0 2px 2px 0;
 }
 

+/* Rules for the oauth authorization page */
+
+.oauth-authorize ul {
+  list-style: none;
+}
+

 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {


@@ -1826,14 +1898,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;
 }
 


@@ -2723,12 +2795,30 @@ input.richtext_title[type="text"] {
     vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
     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;
+    }

   }
 }
 
   }
 }
 


@@ -2739,3 +2829,59 @@ input.richtext_title[type="text"] {
     display: none;
   }
 }
     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;
+    }
+  }
+}