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

diff --combined app/assets/stylesheets/common.scss
index 526fef99ef7c2cf07d703bfc924406e33de1f7e4,10dbf9413fad09512b5d801123e8e4c6f939f7cf..d73d40ff06d72a524b29b3fb848d2093b8f51182
--- 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 */
@@@ -778,7 -769,6 +778,6 @@@ tr.turn 
  /* Rules for user popups on maps */
  
  .user_popup {
-   min-width: 200px;
    p {
      padding: 0 0 5px 0;
      margin: 0 0 0 60px;