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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 42616fadbab6e9350f48dc76b454b2acd3ce24b9..83ae35680fd7c3213d36e3267a0925d1a37720f1 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; }


@@ -169,6 +176,7 @@ small, aside {
 .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 +230,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 +292,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 +373,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 +446,7 @@ nav.secondary {
   }
 }
 
   }
 }
 

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

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


@@ -466,90 +474,6 @@ nav.secondary {
   margin-top: 50px;
 }
 
   margin-top: 50px;
 }
 

-/* Rules for bootstrap tooltips */
-
-.tooltip {
-  position: absolute;
-  display: none;
-  color: #333;
-  text-align: left;
-  font-size: 12px;
-  max-width: 250px;
-}
-
-.tooltip.in {
-  opacity: 0.8;
-  z-index: 1030;
-  height: auto;
-  display: block;
-}
-
-.tooltip.top {
-  margin-top: -10px;
-  text-align: center;
-}
-
-.tooltip.right {
-  margin-left: 10px;
-}
-
-.tooltip.bottom {
-  margin-top: 10px;
-  text-align: center;
-}
-
-.tooltip.left {
-  margin-left: -10px;
-  text-align: right;
-}
-
-.tooltip-inner {
-  display: inline-block;
-  padding: 10px;
-  font-weight: normal;
-  background-color: white;
-}
-
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.tooltip.top .tooltip-arrow {
-  bottom: -5px;
-  left: 50%;
-  margin-left: -5px;
-  border-top-color: white;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: -5px;
-  margin-top: -5px;
-  border-right-color: white;
-  border-width: 5px 5px 5px 0;
-}
-
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: -5px;
-  margin-top: -5px;
-  border-left-color: white;
-  border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-  top: -5px;
-  left: 50%;
-  margin-left: -5px;
-  border-bottom-color: white;
-  border-width: 0 5px 5px;
-}
-

 /* Rules for Leaflet maps */
 
 .leaflet-control .control-button {
 /* Rules for Leaflet maps */
 
 .leaflet-control .control-button {


@@ -636,6 +560,12 @@ nav.secondary {
       float: right;
       cursor: pointer;
     }
       float: right;
       cursor: pointer;
     }

+
+    p.error {
+      background-color: #ff7070;
+      padding: 10px;
+      font-weight: bold;
+    }

   }
 
   .welcome {
   }
 
   .welcome {


@@ -688,6 +618,10 @@ nav.secondary {
     &.query-disabled {
       cursor: not-allowed;
     }
     &.query-disabled {
       cursor: not-allowed;
     }

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

   }
 
   #map-ui {
   }
 
   #map-ui {


@@ -745,7 +679,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;


@@ -789,6 +723,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 {


@@ -797,7 +732,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;
     }
 


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

+
+  table {
+    width: 100%
+  }

 }
 
 .attribution_license,
 }
 
 .attribution_license,


@@ -877,10 +815,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;

   }
 }
 
   }
 }
 


@@ -907,13 +845,15 @@ nav.secondary {
   }
 }
 
   }
 }
 

-/* Rules for the search box */
+/* Rules for the search and direction forms */

 
 

-header .search_form {
+header .search_forms,
+.directions_form {

   display: none;
 }
 
   display: none;
 }
 

-.search_form {
+.search_form,
+.directions_form {

   position: relative;
   padding: $lineheight/2;
   background-color: $lightgrey;
   position: relative;
   padding: $lineheight/2;
   background-color: $lightgrey;


@@ -927,23 +867,37 @@ header .search_form {
   input[type=text] {
     width: 100%;
     height: 30px;
   input[type=text] {
     width: 100%;
     height: 30px;

-    border-right: none;
-

     transition: 300ms linear;
   }
 
     transition: 300ms linear;
   }
 

+  input[type=text].overflow {
+    border-right: none;
+  }
+

   input:focus {
     outline: none;
     box-shadow: 0px 0px 7px #9ED485;
   }
 
   input:focus {
     outline: none;
     box-shadow: 0px 0px 7px #9ED485;
   }
 

-  input[type=submit] {
+  input[type=submit].float {

     float: right;
     width: auto;
     min-width: 0;
     border-radius: 0 2px 2px 0;
   }
 
     float: right;
     width: auto;
     min-width: 0;
     border-radius: 0 2px 2px 0;
   }
 

+  select {
+    /* this next line is to polyfill the vertical alignment of text within a select element,
+     * which is different between firefox and chrome. */
+    padding: 0.3em 0;
+  }
+
+  .query_options {
+    text-align: right;
+    font-size: 10px;
+    color: $blue;
+  }
+

   .describe_location {
     position: absolute;
     top: 6px;
   .describe_location {
     position: absolute;
     top: 6px;


@@ -951,6 +905,51 @@ header .search_form {
     font-size: 10px;
     color: $blue;
   }
     font-size: 10px;
     color: $blue;
   }

+
+  .switch_link {
+    float: right;
+    width: auto;
+    min-width: 0;
+    margin-left: 6px;
+  }
+
+  img.button {
+    display: block;
+  }
+
+  span.force_width {
+    width: 100%;
+    padding-right: 25px;
+    display: block;
+  }
+
+  select.routing_engines {
+    min-height: 30px;
+    margin: 0px 0px 5px 25px;
+  }
+
+  input.routing_go {
+    min-width: 100px;
+    float: right;
+  }
+
+  div.header {
+    width: 100%;
+    height: 30px;
+  }
+
+  div.line {
+    width: 100%;
+    margin: 0px 0px 5px 0px;
+  }
+
+  div.loader_copy {
+    display: none;
+
+    img {
+      vertical-align: middle;
+    }
+  }

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


@@ -973,7 +972,7 @@ header .search_form {
     border-bottom: $keyline;
     cursor: pointer;
     &:first-child { border-top: $keyline; }
     border-bottom: $keyline;
     cursor: pointer;
     &:first-child { border-top: $keyline; }

-    &.selected { background: #FFFFE6; }
+    &.selected { background: $list-highlight; }

   }
 
   .search_details {
   }
 
   .search_details {


@@ -987,8 +986,50 @@ header .search_form {
 
 .search_results_error {
   color: #f00;
 
 .search_results_error {
   color: #f00;

+  padding: 10px 20px;

 }
 
 }
 

+/* Rules for routing */
+
+#sidebar_content>table {
+    padding: 5px 20px 10px 15px;
+    width: 100%;
+    border-collapse: separate;
+}
+
+div.direction {
+  background-image: image-url('routing-sprite.png');
+  width: 20px;
+  height: 20px;
+  background-repeat: no-repeat;
+}
+@for $i from 1 through 18 {
+div.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }
+}
+
+p#routing_summary {
+    padding: 0 $lineheight $lineheight/4;
+}
+
+td.instruction, td.distance {
+    padding-top: $lineheight/5;
+    padding-bottom: $lineheight/5;
+    border-bottom: 1px solid #DDD;
+}
+td.distance {
+    color: #BBB;
+    text-align: right;
+    font-size: x-small;
+}
+tr.turn {
+    cursor: pointer;
+}
+tr.turn:hover {
+    background: $list-highlight;
+}
+.routing_engines, #route_from, #route_to { margin-left: 25px; }
+.routing_marker { width: 15px; position: absolute; cursor: move; }
+

 /* Rules for entity history */
 
 #sidebar_content {
 /* Rules for entity history */
 
 #sidebar_content {


@@ -1010,7 +1051,7 @@ header .search_form {
     border-bottom: 1px solid #ddd;
     cursor: pointer;
 
     border-bottom: 1px solid #ddd;
     cursor: pointer;
 

-    &.selected { background: #FFFFE6; }
+    &.selected { background: $list-highlight; }

     /* color is derived from changeset bbox fillColor in history.js */
   }
 
     /* color is derived from changeset bbox fillColor in history.js */
   }
 


@@ -1020,6 +1061,15 @@ header .search_form {
       color: #000;
     }
   }
       color: #000;
     }
   }

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

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


@@ -1167,7 +1217,7 @@ header .search_form {
         }
 
         &.selected {
         }
 
         &.selected {

-          background: #FFFFE6;
+          background: $list-highlight;

         }
       }
     }
         }
       }
     }


@@ -1228,6 +1278,15 @@ header .search_form {
   }
 }
 
   }
 }
 

+/* Rules for the routing sidebar */
+
+#sidebar_content {
+  #routing_credit {
+    text-align: center;
+    padding: 0.5em;
+  }
+}
+

 /* Rules for edit pages */
 
 .site-edit {
 /* Rules for edit pages */
 
 .site-edit {


@@ -1248,7 +1307,7 @@ header .search_form {
 
 .content-heading {
   background: $lightgrey;
 
 .content-heading {
   background: $lightgrey;

-  
+

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


@@ -1529,10 +1588,6 @@ header .search_form {
     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


@@ -1583,11 +1638,11 @@ header .search_form {
 
 /* Rules for the log in page */
 
 
 /* Rules for the log in page */
 

-#login_openid_buttons {
+#login_auth_buttons {

   margin-bottom: 0;
 }
 
   margin-bottom: 0;
 }
 

-#login_openid_buttons li {
+#login_auth_buttons li {

   float: left;
   padding: $lineheight/4 $lineheight/2;
 }
   float: left;
   padding: $lineheight/4 $lineheight/2;
 }


@@ -1746,19 +1801,39 @@ header .search_form {
 
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 
 /* Rules for "flash" notice boxes shown at the top of the content area */
 

-.error {
+.flash {

   padding: $lineheight;
   padding: $lineheight;

-  background-color: #ff7070;
-}

 
 

-.warning {
-  padding: $lineheight;
-  background-color: #ffe0cc;
-}
+  &.error {
+    background-color: #ff7070;
+  }

 
 

-.notice {
-  padding: $lineheight;
-  background-color: #CBEEA7;
+  &.warning {
+    background-color: #ffe0cc;
+  }
+
+  &.notice {
+    background-color: #CBEEA7;
+  }
+
+  div.message {
+    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;
+      }
+    }
+  }

 }
 
 /* Rules for highlighting fields with rails validation errors */
 }
 
 /* Rules for highlighting fields with rails validation errors */


@@ -1837,7 +1912,7 @@ header .search_form {
     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;
   }


@@ -2405,7 +2480,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;
     }


@@ -2418,7 +2493,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;


@@ -2461,6 +2536,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;


@@ -2611,6 +2690,7 @@ input.richtext_title[type="text"] {
     &.open         { background-position: 0px  -80px; }
     &.partners     { background-position: 0px -120px; }
     &.infringement { background-position: 0px -160px; }
     &.open         { background-position: 0px  -80px; }
     &.partners     { background-position: 0px -120px; }
     &.infringement { background-position: 0px -160px; }

+    &.legal        { background-position: -45px -160px; }

   }
 }
 
   }
 }
 


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

-