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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7c31b3cb1f20fdf19f4bbfb825ab972cbabad64e..84d78814bc6635f4afc5ccb07c32af97167ab974 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -474,6 +474,13 @@ body.small-nav {
   }
 }
 
+@include color-mode(dark) {
+  .leaflet-tile-container,
+  .mapkey-table-entry td:first-child > * {
+    filter: brightness(.8);
+  }
+}
+
 /* Rules for attribution text under the main map shown on printouts */
 
 .donate-attr { color: darken($green, 10%) !important; }

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index bcbe2096803e6117f1733f5f563cad1a1442fea3..0630dace5bc0f93e3ebbbae7e646f7a216a5cc5f 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -69,7 +69,7 @@
   <div id="map-ui" class="bg-body z-2">
   </div>
 
-  <div id="map" tabindex="2" class="z-0">
+  <div id="map" tabindex="2" class="bg-body-secondary z-0">
   </div>
 
   <div id="attribution" class="d-none">