X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7904b49bb13c23b8c8beb4f5bcf25fa12d8374dd..e6987d7dd3f976e2551fc11dcebd7184b0680a0d:/app/assets/stylesheets/common.scss?ds=sidebyside diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1e638d47d..2605bdd10 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, @@ -318,7 +317,7 @@ body.small-nav { display: inline-block; } - .overlay-sidebar #sidebar .welcome.visible { + .overlay-sidebar #sidebar .welcome { display: none; } @@ -376,25 +375,17 @@ body.small-nav { background-color: $vibrant-green; } - .icon { - margin: 10px; - } -} - -.leaflet-control-group-end + .leaflet-control { - padding-top: 10px; -} - -.leaflet-control:first-child, -.leaflet-control-group-end + .leaflet-control { - &.control-button, .control-button:first-child { + &-first { border-start-start-radius: 4px; } -} -.leaflet-control-group-end { - &.control-button, .control-button:last-child { + &-last { border-end-start-radius: 4px; + margin-bottom: 10px; + } + + .icon { + margin: 10px; } } @@ -448,11 +439,7 @@ body.small-nav { } .welcome { - display: none; - - &.visible { - display: block; - } + display: block; } #sidebar_content { @@ -508,14 +495,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; - } - } } } @@ -528,6 +507,13 @@ body.small-nav { height: 50%; } + #map-ui { + z-index: 9999; + width: 100%; + height: 50%; + overflow-y: scroll; + } + .overlay-sidebar { #sidebar { position: absolute; @@ -536,16 +522,10 @@ body.small-nav { overflow: hidden; } - #map { + #map, #map-ui { height: 100%; } } - - #map-ui { - z-index: 9999; - width: 100%; - overflow-y: scroll; - } } } @@ -607,31 +587,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; } @@ -721,21 +676,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 { @@ -793,7 +733,6 @@ header .search_forms, .search_more .loader { display: none; - width: 100%; } } @@ -833,15 +772,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; } @@ -1096,6 +1026,10 @@ tr.turn:hover { [dir=rtl] .header-illustration { transform: scaleX(-1); + + h1 { + transform: scaleX(-1); + } } #content.maximised { @@ -1133,7 +1067,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; } } @@ -1305,22 +1239,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 { @@ -1372,14 +1290,6 @@ tr.turn:hover { .directions_form { background-color: $lightgrey; - - .loader_copy { - display: none; - - img { - vertical-align: middle; - } - } } /* Rules for user images */ @@ -1512,15 +1422,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; @@ -1604,8 +1505,6 @@ dl.dl-inline { .icon { width: 30px; height: 30px; - margin-right: 10px; - vertical-align: middle; background: 40px 40px image-url('about/sprite.png') no-repeat; &.local {