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

diff --combined app/assets/stylesheets/common.scss
index d73d40ff06d72a524b29b3fb848d2093b8f51182,d2a8f037d0213cc86dacabeb32b80d78011d578e..c3f71438988c252f5f7ef160ef8ddd513e473f24
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -473,17 -473,8 +473,17 @@@ body.small-nav 
    border-top: 0px !important;
  }
  
 +.leaflet-popup-content-wrapper,
 +.leaflet-popup-tip {
 +  @extend .bg-body, .text-body;
 +}
 +
  .leaflet-popup-content-wrapper {
 -  border-radius: 4px !important;
 +  @extend .rounded-1;
 +
 +  a {
 +    color: var(--bs-link-color) !important;
 +  }
  }
  
  /* Rules for attribution text under the main map shown on printouts */
@@@ -593,8 -584,9 +593,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;
@@@ -778,6 -770,7 +779,6 @@@
  /* Rules for user popups on maps */
  
  .user_popup {
 -  min-width: 200px;
    p {
      padding: 0 0 5px 0;
      margin: 0 0 0 60px;