X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0cb475cc1ad12c82ff0a36f7b9629c2288737a4f..b09c14218f917f9d76e89a5c2eebf6a6d0d5eedd:/app/assets/stylesheets/common.css.scss diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 95e5d8328..8d40bbe39 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -918,7 +918,6 @@ header .search_forms, .directions_form { position: relative; padding: $lineheight/2; - padding-top: 1px; background-color: $lightgrey; .query_wrapper { @@ -930,28 +929,71 @@ header .search_forms, 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; + 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 */ @@ -974,7 +1016,7 @@ header .search_forms, border-bottom: $keyline; cursor: pointer; &:first-child { border-top: $keyline; } - &.selected { background: #FFFFE6; } + &.selected { background: $list-highlight; } } .search_details { @@ -998,17 +1040,14 @@ header .search_forms, 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 { -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 { @@ -1016,7 +1055,8 @@ p#routing_summary { } td.instruction, td.distance { - padding-top: 0; + padding-top: $lineheight/5; + padding-bottom: $lineheight/5; border-bottom: 1px solid #DDD; } td.distance { @@ -1028,7 +1068,7 @@ tr.turn { 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; } @@ -1054,7 +1094,7 @@ tr.turn:hover { border-bottom: 1px solid #ddd; cursor: pointer; - &.selected { background: #FFFFE6; } + &.selected { background: $list-highlight; } /* color is derived from changeset bbox fillColor in history.js */ } @@ -1211,7 +1251,7 @@ tr.turn:hover { } &.selected { - background: #FFFFE6; + background: $list-highlight; } } } @@ -2075,7 +2115,8 @@ a.button { input[type="submit"], input[type="button"], input[type="reset"], - .button { + .button, + .button_to { box-sizing: border-box; float: left; border-radius: 0; @@ -2088,30 +2129,36 @@ a.button { overflow: hidden; } input:first-child, - .button:first-child { + .button:first-child, + .button_to:first-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, + .button_to:only-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), - *[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), - *[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; }