From: Tom Hughes <tom@compton.nu>
Date: Sun, 7 Apr 2024 11:44:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4656'
X-Git-Tag: live~197
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/108984f04af55561898a6ae3dbb42cf0bef81674?hp=-c

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

108984f04af55561898a6ae3dbb42cf0bef81674
diff --combined app/assets/stylesheets/common.scss
index fc774a3ee,893dc14c8..db03b94ab
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -66,6 -66,12 +66,6 @@@ time[title] 
    color: $blue;
  }
  
 -/* Rules for borders */
 -/* These add additional colours to those provided by bootstrap */
 -.border-grey {
 -  border-color: $grey !important;
 -}
 -
  /* Rules for the header */
  
  #menu-icon {
@@@ -321,7 -327,6 +321,6 @@@ body.small-nav 
    #sidebar {
      float: left;
      width: $sidebarWidth;
-     background: #fff;
  
      #sidebar_loader {
        display: none;