Merge pull request #32 from danstowell/jsrouting

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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index aa729640eadabf7b2e61ca06a528f38a94d6f48a..8d40bbe39dfc2e460d288d5474d48a25b345eb9a 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -169,7 +169,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.gear        { background-position: -260px 0; }
+.icon.query       { background-position: -260px 0; }

 
 /* Rules for links */
 
 
 /* Rules for links */
 


@@ -566,16 +566,16 @@ nav.secondary {
     background-color: black;
   }
 
     background-color: black;
   }
 

-  &.active {
-    background-color: #9ed485;
-  }
-

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

+  &.active {
+    background-color: #9ed485;
+  }
+

   .icon {
     margin: 10px;
   }
   .icon {
     margin: 10px;
   }


@@ -680,6 +680,14 @@ nav.secondary {
   #map {
     height: 100%;
     overflow: hidden;
   #map {
     height: 100%;
     overflow: hidden;

+
+    &.query-active {
+      cursor: help;
+    }
+
+    &.query-disabled {
+      cursor: not-allowed;
+    }

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


@@ -910,7 +918,6 @@ header .search_forms,
 .directions_form {
   position: relative;
   padding: $lineheight/2;
 .directions_form {
   position: relative;
   padding: $lineheight/2;

-  padding-top: 1px;

   background-color: $lightgrey;
 
   .query_wrapper {
   background-color: $lightgrey;
 
   .query_wrapper {


@@ -922,28 +929,71 @@ header .search_forms,
   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;
   }
   .query_options {
     text-align: right;
     font-size: 10px;
     color: $blue;
   }

+
+  .describe_location {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    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;
+  }
+
+  div.line {
+    width: 100%;
+    margin: 0px 0px 5px 0px;
+  }

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


@@ -966,7 +1016,7 @@ header .search_forms,
     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 {


@@ -990,17 +1040,14 @@ header .search_forms,
     border-collapse: separate;
 }
 
     border-collapse: separate;
 }
 

-td.direction {
-    background-image: image-url('routing-sprite.png'); 
-    width: 20px; height: 20px; 
-    background-repeat: no-repeat;
+div.direction {
+  background-image: image-url('routing-sprite.png');
+  width: 20px;
+  height: 20px;
+  background-repeat: no-repeat;

 }
 @for $i from 1 through 17 {
 }
 @for $i from 1 through 17 {

-td.direction.i#{$i}  { background-position: #{($i)*-20+20}px 0px; }
-}
-
-.directions_form input[type="submit"] {
-    margin-top: 30px !important;
+div.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }

 }
 
 p#routing_summary {
 }
 
 p#routing_summary {


@@ -1008,7 +1055,8 @@ p#routing_summary {
 }
 
 td.instruction, td.distance {
 }
 
 td.instruction, td.distance {

-    padding-top: 0;
+    padding-top: $lineheight/5;
+    padding-bottom: $lineheight/5;

     border-bottom: 1px solid #DDD;
 }
 td.distance {
     border-bottom: 1px solid #DDD;
 }
 td.distance {


@@ -1020,7 +1068,7 @@ tr.turn {
     cursor: pointer;
 }
 tr.turn:hover {
     cursor: pointer;
 }
 tr.turn:hover {

-    background: lighten($green, 30%); 
+    background: $list-highlight;

 }
 .routing_engines, #route_from, #route_to { margin-left: 25px; }
 .routing_marker { width: 15px; position: absolute; }
 }
 .routing_engines, #route_from, #route_to { margin-left: 25px; }
 .routing_marker { width: 15px; position: absolute; }


@@ -1046,7 +1094,7 @@ tr.turn:hover {
     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 */
   }
 


@@ -1180,6 +1228,34 @@ tr.turn:hover {
     overflow: hidden;
     margin: 0 0 10px 10px;
   }
     overflow: hidden;
     margin: 0 0 10px 10px;
   }

+
+  .query-intro p {
+    padding: $lineheight $lineheight $lineheight/2;
+  }
+
+  .query-results {
+    display: none;
+
+    h3 {
+      padding: $lineheight $lineheight $lineheight/2;
+      margin: 0;
+    }
+
+    ul {
+      li {
+        padding: 15px 20px;
+        border-bottom: 1px solid #ddd;
+
+        &.query-result {
+          cursor: pointer;
+        }
+
+        &.selected {
+          background: $list-highlight;
+        }
+      }
+    }
+  }

 }
 
 /* Rules for export sidebar */
 }
 
 /* Rules for export sidebar */


@@ -2039,7 +2115,8 @@ a.button {
   input[type="submit"],
   input[type="button"],
   input[type="reset"],
   input[type="submit"],
   input[type="button"],
   input[type="reset"],

-  .button {
+  .button,
+  .button_to {

     box-sizing: border-box;
     float: left;
     border-radius: 0;
     box-sizing: border-box;
     float: left;
     border-radius: 0;


@@ -2052,30 +2129,36 @@ a.button {
     overflow: hidden;
   }
   input:first-child,
     overflow: hidden;
   }
   input:first-child,

-  .button:first-child {
+  .button:first-child,
+  .button_to:first-child {

     border-radius:2px 0 0 2px;
   }
   input:last-child,
     border-radius:2px 0 0 2px;
   }
   input:last-child,

-  .button:last-child {
+  .button:last-child,
+  .button_to:last-child {

     border-radius:0 2px 2px 0;
     border-right-width: 0;
   }
   input:only-child,
   .button:only-child,
     border-radius:0 2px 2px 0;
     border-right-width: 0;
   }
   input:only-child,
   .button:only-child,

+  .button_to:only-child,

   *[value="Hide"] + input:last-child,
   *[value="Hide"] + input:last-child,

-  *[value="Hide"] + .button:last-child {
+  *[value="Hide"] + .button:last-child,
+  *[value="Hide"] + .button_to:last-child {

     border-radius:2px;
     border-right-width: 0;
   }
     /* if a 3-button set has a hidden middle button */
   *[value="Hide"] + input:nth-child(3),
     border-radius:2px;
     border-right-width: 0;
   }
     /* if a 3-button set has a hidden middle button */
   *[value="Hide"] + input:nth-child(3),

-  *[value="Hide"] + .button:nth-child(3) {
+  *[value="Hide"] + .button:nth-child(3),
+  *[value="Hide"] + .button_to:nth-child(3) {

     border-radius:0 2px 2px 0;
     border-right-width: 0;
   }
   /* if a 3-button set starts with a hidden button */
   *[value="Hide"] + input:nth-child(2):not(:last-child),
     border-radius:0 2px 2px 0;
     border-right-width: 0;
   }
   /* if a 3-button set starts with a hidden button */
   *[value="Hide"] + input:nth-child(2):not(:last-child),

-  *[value="Hide"] + .button:nth-child(2):not(:last-child) {
+  *[value="Hide"] + .button:nth-child(2):not(:last-child),
+  *[value="Hide"] + .button_to:nth-child(2):not(:last-child) {

     border-radius:2px 0 0 2px;
     border-right-width: 1px;
   }
     border-radius:2px 0 0 2px;
     border-right-width: 1px;
   }


@@ -2618,36 +2701,6 @@ input.richtext_title[type="text"] {
   }
 }
 
   }
 }
 

-#sidebar #sotm {
-  padding: 10px;
-  min-height: 120px;
-
-  img {
-    float: left;
-    width: 100px;
-    height: 100px;
-  }
-
-  h2 {
-    margin-left: 100px;
-    padding: 7px 10px 6px 15px;
-  }
-
-  p {
-    margin-left: 100px;
-    padding: 6px 10px 7px 15px;
-  }
-
-  a {
-    color: $darkgrey;
-  }
-
-  :hover {
-    text-decoration: none;
-    color: darken($darkgrey, 25%);
-  }
-}
-

 @import 'browse';
 
 @media only screen and (max-width:960px) {
 @import 'browse';
 
 @media only screen and (max-width:960px) {