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

diff --combined app/assets/stylesheets/common.scss
index 563082f5d08b7be5a03eda1b63ef8f950c54e129,1fdb62067cb23968aa62c09aca3bc8320945ac28..7d620f7d31ee9c65abc675f4fe39e67f7784f7aa
--- 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,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 {