X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a3fb6a5b9b358a602af040e781077149d22296b..c376962c9cc08d7787c28e447705c19242c0d638:/app/assets/stylesheets/common.scss?ds=sidebyside diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index d71538e66..848e3f1be 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -80,11 +80,10 @@ small, aside { /* Rules for the header */ #menu-icon { - display: none !important; + display: none; float: right; background: image-url("menu-icon.png") no-repeat; background-size: 30px 30px; - display: block; width: 30px; height: 30px; margin: 14px 10px 0 0; @@ -244,7 +243,7 @@ body.compact-nav { body.small-nav { #menu-icon { - display: inline-block !important; + display: block; } nav.primary, @@ -358,8 +357,6 @@ body.small-nav { width: 40px; background-color: #333; background-color: rgba(0,0,0,.6); - border-radius: 4px 0 0 4px; - margin-bottom: 10px; outline: none; &:hover, @@ -378,26 +375,18 @@ body.small-nav { background-color: $vibrant-green; } - .icon { - margin: 10px; + &-first { + border-start-start-radius: 4px; } -} -.leaflet-control .zoomin, -.control-layers .control-button { - margin-bottom: 0px; - border-radius: 4px 0 0 0; -} - -.leaflet-control .zoomout, -.control-key .control-button { - margin-bottom: 0; - border-radius: 0; -} + &-last { + border-end-start-radius: 4px; + margin-bottom: 10px; + } -.control-locate .control-button, -.control-share .control-button { - border-radius: 0 0 0 4px; + .icon { + margin: 10px; + } } /* Rules for the sidebar and main map area */ @@ -510,14 +499,6 @@ body.small-nav { border-bottom: 1px solid $grey; padding: 10px 20px; } - - .tooltip { - opacity: 1; - border: 1px solid $grey; - .tooltip-arrow { - border-top-color: $grey; - } - } } } @@ -530,6 +511,13 @@ body.small-nav { height: 50%; } + #map-ui { + z-index: 9999; + width: 100%; + height: 50%; + overflow-y: scroll; + } + .overlay-sidebar { #sidebar { position: absolute; @@ -538,23 +526,10 @@ body.small-nav { overflow: hidden; } - #map { + #map, #map-ui { height: 100%; } } - - #map-ui { - z-index: 9999; - width: 100%; - overflow-y: scroll; - } - } -} - -.layers-ui, -.share-ui { - li:last-child { - margin-bottom: 0; } } @@ -609,35 +584,6 @@ body.small-nav { } .share-ui { - .share-tabs { - margin-bottom: 10px; - - a { - color: #fff; - text-decoration: none; - background-color: $lightblue; - padding: 5px 10px; - border-right: 1px solid #fff; - } - - a:first-child { - border-right: 1px solid #fff; - border-radius: 4px 0 0 4px; - } - - a:last-child { - border-radius: 0 4px 4px 0; - } - - a.active { - background-color: $blue; - } - } - - .share-tab { - display: none; - } - .share-link { input[type=text], textarea { @@ -654,10 +600,6 @@ body.small-nav { } } - #embed_html { - resize: vertical; - } - #mapnik_scale { width: 100px; } @@ -685,19 +627,6 @@ body.small-nav { #attribution { display: none; - - table { - width: 100% - } -} - -.attribution_license, -.attribution_project { - text-align: left; -} - -.attribution_notice { - text-align: center; } .donate-attr { color: darken($green, 10%) !important; } @@ -723,21 +652,6 @@ body.small-nav { } } -#sidebar { - #sidebar_loader, - .search_more { - width: 100%; - margin: $lineheight auto; - } - - .loader { - text-align: center; - margin: auto; - width: 40px; - display: block; - } -} - /* Temporary label size override until we remove site-wide font customisation */ form { @@ -795,7 +709,6 @@ header .search_forms, .search_more .loader { display: none; - width: 100%; } } @@ -835,15 +748,6 @@ tr.turn:hover { .routing_marker { width: 15px; cursor: move; } -/* Rules for entity history */ - -#sidebar_content { - .browse_details { - position: relative; - border-bottom: $keyline; - } -} - .browse_status { display: none; } @@ -1098,6 +1002,10 @@ tr.turn:hover { [dir=rtl] .header-illustration { transform: scaleX(-1); + + h1 { + transform: scaleX(-1); + } } #content.maximised { @@ -1135,7 +1043,7 @@ tr.turn:hover { min-width: 200px; p { padding: 0 0 5px 0; - margin-top: 0 0 0 60px; + margin: 0 0 0 60px; font-size: 12px; } } @@ -1307,22 +1215,6 @@ tr.turn:hover { display: none; } -/* Rules for "flash" notice boxes shown at the top of the content area */ - -.flash { - &.error { - background-color: #ff7070; - } - - &.warning { - background-color: #ffe0cc; - } - - &.notice { - background-color: #CBEEA7; - } -} - /* Rules for highlighting fields with rails validation errors */ .formError { @@ -1374,14 +1266,6 @@ tr.turn:hover { .directions_form { background-color: $lightgrey; - - .loader_copy { - display: none; - - img { - vertical-align: middle; - } - } } /* Rules for user images */ @@ -1514,15 +1398,6 @@ dl.dl-inline { display: block; } - .icon-list { - padding-bottom: 20px; - div { - margin-bottom: 10px; - p { - padding-top: 10px; - } - } - } .sprite.small { width: 50px; height: 50px;