X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e749fd5bed3a34fd01a7b901f433e6e23e1562d..4e42bccd5043141dd6acbeaa2e5b5a29f70fb45a:/app/assets/stylesheets/common.scss?ds=sidebyside diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9aefd3d69..71de054ce 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,4 +1,6 @@ +@use "sass:map"; @import "parameters"; +@import "browse"; @import "bootstrap"; @import "rails_bootstrap_forms"; @@ -10,11 +12,6 @@ body { font-size: $typeheight; } -p > img { - width: auto; - max-width: 100%; -} - time[title] { text-decoration: underline dotted; } @@ -82,7 +79,7 @@ time[title] { position: absolute; top: 0; right: 0; - background: image-url("menu-icon.png") no-repeat; + background: image-url("menu-icon.svg") no-repeat; background-size: 30px 30px; width: 30px; height: 30px; @@ -165,10 +162,6 @@ nav.secondary { .nav-link { padding: 0.2rem; } - - #inboxanchor { - background-color: lighten($grey, 10%); - } } nav.primary, nav.secondary { @@ -464,11 +457,21 @@ body.small-nav { border-top: 0px !important; } -.leaflet-popup-content-wrapper, -.leaflet-popup-tip { +.leaflet-popup-content-wrapper, .leaflet-popup-tip, +.leaflet-contextmenu, .leaflet-contextmenu-item, +.leaflet-control-attribution, .leaflet-control-scale-line { @extend .bg-body, .text-body; } +.leaflet-control-attribution, .leaflet-control-scale-line { + @extend .bg-opacity-75; + text-shadow: none !important; +} + +.leaflet-contextmenu-item.over { + @extend .bg-body-secondary, .border-secondary, .border-opacity-10; +} + .leaflet-popup-content-wrapper { @extend .rounded-1; @@ -477,6 +480,21 @@ body.small-nav { } } +@include color-mode(dark) { + .leaflet-tile-container, + .mapkey-table-entry td:first-child > * { + filter: brightness(.8); + } + + .leaflet-control-attribution a { + color: var(--bs-link-color); + } + + .leaflet-control-scale-line { + @extend .border-light, .border-opacity-75; + } +} + /* Rules for attribution text under the main map shown on printouts */ .donate-attr { color: darken($green, 10%) !important; } @@ -548,7 +566,7 @@ header .search_forms, /* Rules for routing */ div.direction { - background-image: image-url('routing-sprite.png'); + background-image: image-url('routing-sprite.svg'); width: 20px; height: 20px; background-repeat: no-repeat; @@ -705,6 +723,7 @@ tr.turn { &.new-user-main { background-image: image-url("sign-up-illustration.png"); + background-position-x: 50px; } &.confirm-main { @@ -714,17 +733,6 @@ tr.turn { &.new-user-terms { background-image: image-url("terms-illustration.png"); } - - &.new-user-arm { - height: 110px; - width: 130px; - left: 280px; - top: 180px; - background-image: image-url("sign-up-illustration-arm.png"); - position: absolute; - z-index: 100; - pointer-events: none; - } } [dir=rtl] .header-illustration { @@ -733,6 +741,10 @@ tr.turn { h1 { transform: scaleX(-1); } + + ul { + transform: scaleX(-1); + } } /* Rules for small maps in content areas */ @@ -882,25 +894,17 @@ div.secondary-actions { /* Rules for the "Welcome" page */ .site-welcome, .site-fixthemap { .sprite { - background-image: image-url("welcome-sprite.png"); - background-size: 500px 250px; - display: block; - } - - .sprite.small { width: 50px; height: 50px; + background-image: image-url("welcome-sprite.svg"); + background-size: 500px 250px; + display: block; } .sprite.x { /*rtl:ignore*/ background-position: -50px 0; } - .sprite.term { - margin-right: 10px; - vertical-align: middle; - } - .sprite.node { /*rtl:ignore*/ background-position: -100px 0; } @@ -992,6 +996,10 @@ div.secondary-actions { } } +.auth-container { + max-width: 600px; +} + /* Rules for tabs inside secondary background sections */ .bg-body-secondary .nav-tabs { @@ -1013,4 +1021,32 @@ img.trace_image { } } -@import 'browse'; +/* Rules for map sidebar icons */ + +.browse-section { + .node::before, + .way::before, + .relation::before { + display: inline-block; + width: 25px; + margin-left: -25px; + } + + .node, .way, .relation { + margin-left: 25px; + } +} + +@each $class, $item in $map-sidebar-icons { + .browse-section #{$class}::before { + content: image-url('browse/#{map.get($item, "filename")}'); + } + + @if map.get($item, "invert") { + @include color-mode(dark) { + .browse-section #{$class}::before { + filter: invert(.8) hue-rotate(180deg); + } + } + } +}