Merge branch 'master' into routing

diff --combined app/assets/stylesheets/common.scss
index b7ba464c0cdea8296ebcc0c6c1b1d58f399cda7a,42616fadbab6e9350f48dc76b454b2acd3ce24b9..740305cd3ed64a02ad29193bbaed439c3a7f5c11
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -907,15 -907,13 +907,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;
  }
  
 -.search_form {
 +.search_form,
 +.directions_form {
    position: relative;
    padding: $lineheight/2;
    background-color: $lightgrey;
@@@ -929,37 -927,23 +929,37 @@@
    input[type=text] {
      width: 100%;
      height: 30px;
 -    border-right: none;
 -
      transition: 300ms linear;
    }
  
 +  input[type=text].overflow {
 +    border-right: none;
 +  }
 +
    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;
    }
  
 +  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;
@@@ -967,38 -951,6 +967,38 @@@
      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.line {
 +    width: 100%;
 +    margin: 0px 0px 5px 0px;
 +  }
  }
  
  /* Rules for the map key which appears in the popout sidebar */
@@@ -1021,7 -973,7 +1021,7 @@@
      border-bottom: $keyline;
      cursor: pointer;
      &:first-child { border-top: $keyline; }
 -    &.selected { background: #FFFFE6; }
 +    &.selected { background: $list-highlight; }
    }
  
    .search_details {
@@@ -1037,47 -989,6 +1037,47 @@@
    color: #f00;
  }
  
 +/* 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 17 {
 +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; }
 +
  /* Rules for entity history */
  
  #sidebar_content {
@@@ -1099,7 -1010,7 +1099,7 @@@
      border-bottom: 1px solid #ddd;
      cursor: pointer;
  
 -    &.selected { background: #FFFFE6; }
 +    &.selected { background: $list-highlight; }
      /* color is derived from changeset bbox fillColor in history.js */
    }
  
@@@ -1256,7 -1167,7 +1256,7 @@@
          }
  
          &.selected {
 -          background: #FFFFE6;
 +          background: $list-highlight;
          }
        }
      }
@@@ -1317,15 -1228,6 +1317,15 @@@
    }
  }
  
 +/* Rules for the routing sidebar */
 +
 +#sidebar_content {
 +  #routing_credit {
 +    text-align: center;
 +    padding: 0.5em;
 +  }
 +}
 +
  /* Rules for edit pages */
  
  .site-edit {
@@@ -1973,6 -1875,7 +1973,7 @@@ input[type="email"]
  input[type="url"],
  input[type="password"],
  textarea {
+   color: #222;
    background-color: #fff;
    border: 1px solid #ccc;
    padding: 2px 5px;