From: Tom Hughes <tom@compton.nu>
Date: Thu, 2 Jan 2020 13:29:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2491'
X-Git-Tag: live~3323
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e7332b0c4178e8d9028cf64c200e0d18a92b0a3c?ds=inline;hp=-c

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

e7332b0c4178e8d9028cf64c200e0d18a92b0a3c
diff --combined app/assets/stylesheets/common.scss
index 3f2a151ab,ccb46005e..3d013339d
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -541,6 -541,7 +541,7 @@@ body.compact 
    #sidebar {
      float: left;
      width: $sidebarWidth;
+     background: #fff;
  
      #sidebar_loader {
        display: none;
@@@ -2269,6 -2270,12 +2270,6 @@@ a.button 
  
  .richtext,
  .prose {
 -  h1, h2 {
 -    padding-bottom: $lineheight/2;
 -    border-bottom: 1px dashed $grey;
 -    margin-bottom: $lineheight/2;
 -  }
 -
    code {
      font-size: 13px;
      background: $lightgrey;