Merge remote-tracking branch 'openstreetmap/pull/1344'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f48f02e50cd213284eafa427857c5d211bd69c5d..4529248c58f134b5925b3c829135899433771efb 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;


@@ -145,13 +151,14 @@ small, aside {
 /* 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;
+  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      { background-position: 0 0; }
 }
 
 .icon.search      { background-position: 0 0; }


@@ -166,9 +173,11 @@ small, aside {
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }

+.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.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; }
 
 /* Rules for links */
 .icon.query       { background-position: -260px 0; }
 
 /* Rules for links */


@@ -222,7 +231,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 +293,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 +374,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 +447,7 @@ nav.secondary {
   }
 }
 
   }
 }
 

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

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


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

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

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


@@ -548,6 +564,22 @@ 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;


@@ -560,25 +592,26 @@ nav.secondary {
     }
   }
 
     }
   }
 

-  .welcome {
-    display: none;
-  }
-

   .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 +632,15 @@ nav.secondary {
     }
   }
 
     }
   }
 

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

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


@@ -610,7 +652,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 +713,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 +725,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 +757,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 +766,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;
     }
 


@@ -807,10 +849,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;

   }
 }
 
   }
 }
 


@@ -828,10 +870,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;
   }


@@ -995,8 +1042,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 {


@@ -1053,6 +1100,15 @@ tr.turn:hover {
       color: #000;
     }
   }
       color: #000;
     }
   }

+
+  .comments {
+    float: right;
+    color: #999;
+  }
+
+  .comments-0 {
+    opacity: 0.5;
+  }

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


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

-  
+

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


@@ -1318,6 +1374,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;
+    }

   }
 }
 
   }
 }
 


@@ -1571,10 +1632,6 @@ 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
 }
 
 .content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div


@@ -1623,6 +1680,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 {


@@ -1807,6 +1871,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;
+      }
+    }

   }
 }
 
   }
 }
 


@@ -1886,7 +1963,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;
   }


@@ -2454,7 +2531,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;
     }


@@ -2467,7 +2544,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;


@@ -2510,6 +2587,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;


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

-