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

diff --combined app/assets/stylesheets/common.scss
index 1cd7d4c6d2f317e1500ee295ceaafd835c16f6ac,105f7927ec6952dbe7db6567b9babc8b139c52dd..7c31b3cb1f20fdf19f4bbfb825ab972cbabad64e
--- 1/app/assets/stylesheets/common.scss
--- 2/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;