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

diff --cc app/assets/stylesheets/common.scss
index 7c31b3cb1f20fdf19f4bbfb825ab972cbabad64e,abd6966035a7153290a194640b0884aa3ce3db40..84d78814bc6635f4afc5ccb07c32af97167ab974
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -455,25 -470,17 +455,32 @@@ body.small-nav 
    border-top: 0px !important;
  }
  
 +.leaflet-popup-content-wrapper,
 +.leaflet-popup-tip,
 +.leaflet-contextmenu,
 +.leaflet-contextmenu-item {
 +  @extend .bg-body, .text-body;
 +}
 +
 +.leaflet-contextmenu-item.over {
 +  @extend .bg-body-secondary, .border-secondary, .border-opacity-10;
 +}
 +
  .leaflet-popup-content-wrapper {
 -  border-radius: 4px !important;
 +  @extend .rounded-1;
 +
 +  a {
 +    color: var(--bs-link-color) !important;
 +  }
  }
  
+ @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; }