Rebase to current master

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 9fbca617195cd92a6e3752c26494025c138e6871..eb7cbf84545d7053271448bf4ff364e20ef0b2bb 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -15,9 +15,15 @@ fieldset,img { border: 0; }
 
 legend { color: #000; }
 
 
 legend { color: #000; }
 

-sup { vertical-align: text-top; }
+sup {
+  vertical-align: super;
+  font-size: smaller;
+}

 
 

-sub { vertical-align: text-bottom; }
+sub {
+  vertical-align: sub;
+  font-size: smaller;
+}

 
 table {
   border-collapse: collapse;
 
 table {
   border-collapse: collapse;


@@ -32,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;
 }
 


@@ -142,34 +148,39 @@ small, aside {
 
 .red { color: $red; }
 
 
 .red { color: $red; }
 

+.piwik { border: 0; }
+

 /* Rules for icons */
 
 .icon {
 /* 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.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 */
 
 
 /* Rules for links */
 


@@ -222,7 +233,7 @@ table {
 
 /* Rules for the header */
 
 
 /* Rules for the header */
 

-#menu-icon { 
+#menu-icon {

   display: none !important;
   float: right;
   background: image-url("menu-icon.png") no-repeat;
   display: none !important;
   float: right;
   background: image-url("menu-icon.png") no-repeat;


@@ -284,7 +295,7 @@ nav.primary {
     > li {
       border-right: $border;
       float: left;
     > li {
       border-right: $border;
       float: left;

-      &:last-child { 
+      &:last-child {

         border-right: 0;
       }
       > a:hover { background: lighten($green, 30%); }
         border-right: 0;
       }
       > a:hover { background: lighten($green, 30%); }


@@ -365,12 +376,12 @@ nav.secondary {
     > li {
       border-right: $border;
       float: left;
     > li {
       border-right: $border;
       float: left;

-      &:last-child { 
+      &:last-child {

         border-right: 0;
 
         > a {
           border-radius: 0 $border-radius $border-radius 0;
         border-right: 0;
 
         > a {
           border-radius: 0 $border-radius $border-radius 0;

-        } 
+        }

       }
       &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
       &:hover a { background: lighten($darkgrey, 30%); }
       }
       &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
       &:hover a { background: lighten($darkgrey, 30%); }


@@ -438,7 +449,7 @@ nav.secondary {
   }
 }
 
   }
 }
 

-@media only screen and (max-width:960px) {
+body.compact {

   #compact-secondary-nav {
     display: inline-block;
   }
   #compact-secondary-nav {
     display: inline-block;
   }


@@ -482,7 +493,8 @@ nav.secondary {
     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;


@@ -538,6 +550,17 @@ nav.secondary {
     background: #fff;
     font-size: 12px;
 
     background: #fff;
     font-size: 12px;
 

+    #sidebar_loader {
+      display: none;
+    }
+
+    > div {
+      position: relative;
+      float: left;
+      clear: both;
+      width: 100%;
+    }
+

     h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }
     h2 {
       padding: $lineheight $lineheight $lineheight/2;
     }


@@ -548,37 +571,60 @@ nav.secondary {
       font-size: 13px;
     }
 
       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;
     }
 
     .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;
   }
 
   .overlay-sidebar #sidebar {
     position: absolute;
     z-index: 1000;
     height: auto;

-    border-bottom-right-radius: 5px;

     overflow: hidden;
     overflow: hidden;

+
+    #banner,

     .welcome {
       display: block;
     }
     .welcome {
       display: block;
     }

+

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

+    display: none;
+    padding-bottom: 5px;
+

     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;
     p {
       padding: $lineheight/2 $lineheight $lineheight;
       font-size: 110%;


@@ -599,6 +645,15 @@ nav.secondary {
     }
   }
 
     }
   }
 

+  #banner {
+    display: none;
+
+    img {
+      display: block;
+      width: $sidebarWidth;
+    }
+  }
+

   #map {
     height: 100%;
     overflow: hidden;
   #map {
     height: 100%;
     overflow: hidden;


@@ -610,7 +665,7 @@ nav.secondary {
     &.query-disabled {
       cursor: not-allowed;
     }
     &.query-disabled {
       cursor: not-allowed;
     }

-    
+

     .leaflet-marker-draggable {
       cursor: move;
     }
     .leaflet-marker-draggable {
       cursor: move;
     }


@@ -671,7 +726,7 @@ nav.secondary {
       margin-bottom: 8px;
       position: relative;
       transition: border-color 0.08s ease-in;
       margin-bottom: 8px;
       position: relative;
       transition: border-color 0.08s ease-in;

-      
+

       label {
         position: absolute;
         top: 0;
       label {
         position: absolute;
         top: 0;


@@ -683,7 +738,7 @@ nav.secondary {
         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;
         }


@@ -715,6 +770,7 @@ nav.secondary {
       text-decoration: none;
       background-color: $lightblue;
       padding: 5px 10px;
       text-decoration: none;
       background-color: $lightblue;
       padding: 5px 10px;

+      border-right: 1px solid #fff;

     }
 
     a:first-child {
     }
 
     a:first-child {


@@ -723,7 +779,6 @@ nav.secondary {
     }
 
     a:last-child {
     }
 
     a:last-child {

-      border-left: 1px solid #fff;

       border-radius: 0 4px 4px 0;
     }
 
       border-radius: 0 4px 4px 0;
     }
 


@@ -783,6 +838,10 @@ nav.secondary {
 
 #attribution {
   display: none;
 
 #attribution {
   display: none;

+
+  table {
+    width: 100%
+  }

 }
 
 .attribution_license,
 }
 
 .attribution_license,


@@ -803,10 +862,10 @@ nav.secondary {
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid #ccc;
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid #ccc;

-  > .close { 
+  > .close {

     float: right;
     margin-top: 2px;
     float: right;
     margin-top: 2px;

-    cursor: pointer; 
+    cursor: pointer;

   }
 }
 
   }
 }
 


@@ -824,10 +883,15 @@ nav.secondary {
 
 #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;
   }


@@ -874,6 +938,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. */


@@ -938,6 +1006,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 */


@@ -955,7 +1028,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;


@@ -963,17 +1036,15 @@ 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%;

   }
 }
 
 .search_results_error {
   color: #f00;
   }
 }
 
 .search_results_error {
   color: #f00;

+  padding: 10px 20px;

 }
 
 /* Rules for routing */
 }
 
 /* Rules for routing */


@@ -990,8 +1061,8 @@ div.direction {
   height: 20px;
   background-repeat: no-repeat;
 }
   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 {
 }
 
 p#routing_summary {


@@ -1048,6 +1119,20 @@ tr.turn:hover {
       color: #000;
     }
   }
       color: #000;
     }
   }

+
+  .comments {
+    float: right;
+    color: #999;
+  }
+
+  .comments-0 {
+    opacity: 0.5;
+  }
+
+  .changeset_more .loader {
+    display: none;
+    width: 100%;
+  }

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


@@ -1120,6 +1205,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 {


@@ -1134,9 +1220,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 {


@@ -1285,7 +1370,7 @@ tr.turn:hover {
 
 .content-heading {
   background: $lightgrey;
 
 .content-heading {
   background: $lightgrey;

-  
+

   h1 { font-size: 22px; }
 }
 
   h1 { font-size: 22px; }
 }
 


@@ -1313,6 +1398,11 @@ tr.turn:hover {
 .user-terms {
   .content-body .content-inner {
     padding: 0;
 .user-terms {
   .content-body .content-inner {
     padding: 0;

+
+    .message {
+      margin-top: 80px;
+      padding: 20px;
+    }

   }
 }
 
   }
 }
 


@@ -1409,6 +1499,18 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

+/* Rules for the trace view */
+
+.trace-view {
+  .trace_pending {
+    color: red;
+  }
+
+  .geo {
+    display: inline;
+  }
+}
+

 /* Rules for the new trace form */
 
 #new_trace {
 /* Rules for the new trace form */
 
 #new_trace {


@@ -1566,14 +1668,10 @@ tr.turn:hover {
     float: left;
     display: block;
   }
     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 */
 }
 
 /* Rules for the diary entry page */


@@ -1618,6 +1716,13 @@ tr.turn:hover {
   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 {


@@ -1638,6 +1743,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 {


@@ -1696,6 +1809,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 {


@@ -1802,6 +1921,19 @@ tr.turn:hover {
     display: inline-block;
     margin-left: $lineheight / 2;
     vertical-align: middle;
     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;
+      }
+    }

   }
 }
 
   }
 }
 


@@ -1881,7 +2013,7 @@ tr.turn:hover {
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }

-  .horizontal-list .form-row { 
+  .horizontal-list .form-row {

     float: left;
     padding-right: 10px;
   }
     float: left;
     padding-right: 10px;
   }


@@ -2449,7 +2581,7 @@ input.richtext_title[type="text"] {
 .site-welcome, .site-fixthemap {
   .center {
     text-align: center;
 .site-welcome, .site-fixthemap {
   .center {
     text-align: center;

-    .sprite { 
+    .sprite {

       float: none;
       margin: auto;
     }
       float: none;
       margin: auto;
     }


@@ -2462,7 +2594,7 @@ input.richtext_title[type="text"] {
     float: left;
   }
 
     float: left;
   }
 

-  .icon-list { 
+  .icon-list {

     padding-bottom: 20px;
     div {
       margin-bottom: 10px;
     padding-bottom: 20px;
     div {
       margin-bottom: 10px;


@@ -2505,6 +2637,10 @@ input.richtext_title[type="text"] {
     background-position: -300px 0;
   }
 
     background-position: -300px 0;
   }
 

+  .sprite.rules {
+    background-position: -350px 0;
+  }
+

   .start-mapping {
     margin: auto;
     cursor: pointer;
   .start-mapping {
     margin: auto;
     cursor: pointer;


@@ -2650,11 +2786,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; }
+    &.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;
+    }

   }
 }
 
   }
 }
 


@@ -2665,4 +2820,3 @@ input.richtext_title[type="text"] {
     display: none;
   }
 }
     display: none;
   }
 }

-