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

diff --combined 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
@@@ -10,12 -10,26 +10,12 @@@ body 
    font-size: $typeheight;
  }
  
 -p > img {
 -  width: auto;
 -  max-width: 100%;
 -}
 -
 -small, aside {
 -  font-size: 12px;
 -}
 -
  time[title] {
    text-decoration: underline dotted;
  }
  
  #container { position: relative; }
  
 -.small_icon {
 -  vertical-align: middle;
 -  margin-right: $lineheight * 0.25;
 -}
 -
  /* Rules for icons */
  
  .icon {
@@@ -61,10 -75,7 +61,10 @@@
    .table-secondary {
      --bs-table-bg: rgb(var(--bs-secondary-rgb), .25);
    }
 -  .table-primary, .table-secondary {
 +  .table-success {
 +    --bs-table-bg: rgb(var(--bs-success-rgb), .25);
 +  }
 +  .table-primary, .table-secondary, .table-success {
      --bs-table-color: initial;
      border-color: inherit;
    }
@@@ -160,6 -171,10 +160,6 @@@ nav.secondary 
    .nav-link {
      padding: 0.2rem;
    }
 -
 -  #inboxanchor {
 -    background-color: lighten($grey, 10%);
 -  }
  }
  
  nav.primary, nav.secondary {
@@@ -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; }
@@@ -537,6 -544,10 +544,6 @@@ header .search_forms
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
 -  ul li.selected {
 -    background: $list-highlight;
 -  }
 -
    .search_more .loader {
      display: none;
    }
@@@ -577,9 -588,8 +584,9 @@@ tr.turn 
  
  #sidebar .changesets {
    li {
 -    &.selected { background: $list-highlight; }
 -    /* color is derived from changeset bbox fillColor in history.js */
 +    &.selected {
 +      @extend :hover;
 +    }
  
      a.stretched-link > span, a:not(.stretched-link), [title] {
        position: relative;
@@@ -613,8 -623,6 +620,8 @@@
    .browse-tag-list {
      table-layout: fixed;
      white-space: pre-wrap;
 +    word-wrap: break-word;
 +    word-break: break-word;
  
      tr:last-child th, tr:last-child td {
        border-bottom: 0;
@@@ -628,6 -636,18 +635,6 @@@
  
    .query-results {
      display: none;
 -
 -    ul {
 -      li {
 -        &.query-result {
 -          cursor: pointer;
 -        }
 -
 -        &.selected {
 -          background: $list-highlight;
 -        }
 -      }
 -    }
    }
  }
  
@@@ -755,6 -775,7 +762,6 @@@
  /* Rules for user popups on maps */
  
  .user_popup {
 -  min-width: 200px;
    p {
      padding: 0 0 5px 0;
      margin: 0 0 0 60px;
@@@ -796,6 -817,14 +803,6 @@@
    }
  }
  
 -/* Rules for messages pages */
 -
 -.messages {
 -  .inbox-row-unread td {
 -    background: #CBEEA7;
 -  }
 -}
 -
  /* Rules for user images */
  
  img.user_image {
@@@ -921,6 -950,11 +928,6 @@@ div.secondary-actions 
    .sprite.rules {
      /*rtl:ignore*/ background-position: -350px 0;
    }
 -
 -  .icon.note {
 -    background-color: #333;
 -    border-radius: 4px;
 -  }
  }
  
  .site-about #content {