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

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

afc8dad0b6fb046e7fddf382879cddd99c2e4f78
diff --combined app/assets/stylesheets/common.scss
index 7d620f7d3,100d489da..3edeeb4d8
--- 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,6 -852,11 +843,6 @@@ tr.turn:hover 
      bottom: 0;
      width: 100%;
    }
 -
 -  #map {
 -    height: 100%;
 -    overflow: hidden;
 -  }
  }
  
  /* Rules for non-map content pages */
@@@ -901,15 -915,6 +901,6 @@@
    }
  }
  
- #content.maximised {
-   top: 0;
-   left: 0;
-   right: 0;
-   bottom: 0;
-   border: 0;
-   z-index: 2000;
- }
- 
  /* Rules for small maps in content areas */
  
  .content_map {
@@@ -1088,6 -1093,13 +1079,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 {