From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Nov 2023 18:40:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4341'
X-Git-Tag: live~1423
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/96ee97ff93db3191459b5e15b7ba3da61f4d1748?ds=sidebyside;hp=-c

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

96ee97ff93db3191459b5e15b7ba3da61f4d1748
diff --combined app/assets/stylesheets/common.scss
index 563082f5d,1fdb62067..7d620f7d3
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -405,6 -405,10 +405,6 @@@ body.small-nav 
      #sidebar_content {
        padding: $spacer;
      }
 -
 -    > div {
 -      position: relative;
 -    }
    }
  
    .overlay-sidebar #sidebar {
@@@ -428,6 -432,11 +428,6 @@@
  
    .welcome {
      display: none;
 -
 -    p {
 -      font-size: 110%;
 -      font-weight: 300;
 -    }
    }
  
    #banner {
@@@ -843,11 -852,6 +843,6 @@@ tr.turn:hover 
      bottom: 0;
      width: 100%;
    }
- 
-   #map {
-     height: 100%;
-     overflow: hidden;
-   }
  }
  
  /* Rules for non-map content pages */
@@@ -1093,13 -1097,6 +1088,6 @@@ div.secondary-actions 
    }
  }
  
- /* Rules for the iD editor */
- 
- .id-embed {
-   width: 100%;
-   height: 100%;
- }
- 
  /* Rules for the "Welcome" page */
  .site-welcome, .site-fixthemap {
    .sprite {