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

diff --cc app/assets/stylesheets/common.scss
index cabdfff493bac420e9daa5b1fe0b3cc3bc6570b9,c1e71cc2d7e53d892214df5e1bc4f82848ab11e6..323f60e08c192a91d2934f5e2309c1841591f357
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -505,29 -506,21 +506,33 @@@ body.small-nav 
  }
  
  @include color-mode(dark) {
-   .leaflet-tile-container .leaflet-tile,
 +  .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,
    .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;
    }
  }