From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Dec 2024 17:09:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/5387'
X-Git-Tag: live
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/325deabc916acab952089a4b093fa6bafa66083c?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/pull/5387'
---

325deabc916acab952089a4b093fa6bafa66083c
diff --combined app/assets/stylesheets/common.scss
index cabdfff49,c1e71cc2d..323f60e08
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -9,6 -9,7 +9,7 @@@
  
  body {
    font-size: $typeheight;
+   --dark-mode-map-filter: brightness(.8);
  }
  
  time[title] {
@@@ -505,29 -506,21 +506,33 @@@ body.small-nav 
  }
  
  @include color-mode(dark) {
 +  .leaflet-container .leaflet-control-attribution a {
 +    color: var(--bs-link-color);
 +  }
 +
 +  .leaflet-control-scale-line {
 +    border-color: rgba(var(--bs-light-rgb), .75) !important;
 +  }
 +}
 +
 +@mixin dark-map-color-scheme {
-   .leaflet-tile-container .leaflet-tile,
+   .leaflet-tile-container,
    .mapkey-table-entry td:first-child > * {
-     filter: brightness(.8);
+     filter: var(--dark-mode-map-filter);
+   }
+ 
+   .leaflet-tile-container .leaflet-tile {
+     filter: none;
    }
 +}
  
 -  .leaflet-container .leaflet-control-attribution a {
 -    color: var(--bs-link-color);
 -  }
 +body[data-map-theme="dark"] {
 +  @include dark-map-color-scheme;
 +}
  
 -  .leaflet-control-scale-line {
 -    border-color: rgba(var(--bs-light-rgb), .75) !important;
 +@include color-mode(dark) {
 +  body:not([data-map-theme]) {
 +    @include dark-map-color-scheme;
    }
  }