From: Tom Hughes <tom@compton.nu>
Date: Mon, 29 Apr 2024 21:38:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4737'
X-Git-Tag: live~1002
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a76a2db37ce91ced0a2ea403a9e90c646c664fb6?ds=sidebyside;hp=-c

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

a76a2db37ce91ced0a2ea403a9e90c646c664fb6
diff --combined app/assets/stylesheets/common.scss
index 1cd7d4c6d,105f7927e..7c31b3cb1
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -160,6 -160,10 +160,6 @@@ nav.secondary 
    .nav-link {
      padding: 0.2rem;
    }
 -
 -  #inboxanchor {
 -    background-color: lighten($grey, 10%);
 -  }
  }
  
  nav.primary, nav.secondary {
@@@ -456,10 -460,16 +456,16 @@@ body.small-nav 
  }
  
  .leaflet-popup-content-wrapper,
- .leaflet-popup-tip {
+ .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 {
    @extend .rounded-1;