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

diff --combined app/assets/stylesheets/common.scss
index edef1444b85b00a924d1ad554edef97cf832c059,7c216ad4b861a7c9bf2c92efe92bb61e72b868dc..4b7380ffcc8aef2fd8d2aa035338a312ce7a1ef9
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -16,6 -16,8 +16,6 @@@ time[title] 
    text-decoration: underline dotted;
  }
  
 -#container { position: relative; }
 -
  /* Rules for icons */
  
  .icon {
@@@ -96,6 -98,10 +96,6 @@@ header 
    position: relative;
    font-size: 14px;
  
 -  h1, nav, nav > ul, nav > ul > li {
 -    display: inline-block;
 -  }
 -
    > * {
      padding: $lineheight * 0.5;
    }
@@@ -112,10 -118,6 +112,10 @@@
    nav.primary {
      margin-right: auto;
    }
 +
 +  .username {
 +    max-width: 12em;
 +  }
  }
  
  nav.primary {
@@@ -152,7 -154,7 +152,7 @@@
  
  nav.secondary {
    .nav-link {
 -    padding: 0.2rem;
 +    padding: 0.3rem;
    }
  }
  
@@@ -189,7 -191,7 +189,7 @@@ body.small-nav 
      min-height: $headerHeight;
  
      &.closed nav {
 -      display: none;
 +      display: none !important;
      }
  
      .search_forms {
@@@ -214,8 -216,6 +214,8 @@@
    }
  
    nav.secondary {
 +    flex-direction: column;
 +
      .user-menu, .login-menu {
        width: 100%;
      }
@@@ -489,6 -489,16 +489,6 @@@
  
  .donate-attr { color: darken($green, 10%) !important; }
  
 -/* Rules for the sidebar */
 -
 -#browse_status {
 -  input {
 -    display: block;
 -    margin-left: auto;
 -    margin-right: auto;
 -  }
 -}
 -
  /* Temporary label size override until we remove site-wide font customisation */
  
  form {
@@@ -570,6 -580,10 +570,6 @@@ tr.turn 
  
  .routing_marker { width: 15px; cursor: move; }
  
 -.browse_status {
 -  display: none;
 -}
 -
  /* Rules for the history sidebar */
  
  #sidebar .changesets {
@@@ -623,6 -637,16 +623,6 @@@
    }
  }
  
 -/* Bootstrap buttons don't have any vertical margin, so
 -   they touch when adjacent buttons wrap onto a new line
 -   e.g. wide form buttons on a narrow sidebar */
 -
 -.btn-wrapper {
 -  > .btn {
 -    margin-bottom: $spacer * 0.25;
 -  }
 -}
 -
  /* Force LTR/RTL alignment for placeholder text */
  
  .form-control::placeholder {
@@@ -852,45 -876,6 +852,6 @@@ div.secondary-actions 
    }
  }
  
- /* Rules for the "Welcome" and "Fix the map" pages */
- 
- .site-welcome, .site-fixthemap {
-   .sprite {
-     width: 50px;
-     height: 50px;
-     background-image: image-url("welcome-sprite.svg");
-     background-size: 500px 250px;
-   }
- 
-   .sprite.x {
-     /*rtl:ignore*/ background-position: -50px 0;
-   }
- 
-   .sprite.node {
-     /*rtl:ignore*/ background-position: -100px 0;
-   }
- 
-   .sprite.way {
-     /*rtl:ignore*/ background-position: -150px 0;
-   }
- 
-   .sprite.tag {
-     /*rtl:ignore*/ background-position: -200px 0;
-   }
- 
-   .sprite.editor {
-     /*rtl:ignore*/ background-position: -250px 0;
-   }
- 
-   .sprite.question {
-     /*rtl:ignore*/ background-position: -300px 0;
-   }
- 
-   .sprite.rules {
-     /*rtl:ignore*/ background-position: -350px 0;
-   }
- }
- 
  /* Rules for the "About" page */
  
  .site-about #content {