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

diff --combined app/assets/stylesheets/common.scss
index 7d620f7d31ee9c65abc675f4fe39e67f7784f7aa,100d489da88424773492079b4185c18fc9ffc06c..3edeeb4d8fcfbc6edcd6b01cd3e9409080c3355e
--- 1/app/assets/stylesheets/common.scss
--- 2/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 {