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

diff --combined app/assets/stylesheets/common.scss
index 7df0cdc5258882e176be998f6a3e00a01889e281,97ed5907135d992c6da34bf612d52ede75368654..1329d05f4a644d8b4cc5188c151e6361ea5e18d5
--- 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,16 -98,12 +96,12 @@@ header 
    position: relative;
    font-size: 14px;
  
-   h1, nav, nav > ul, nav > ul > li {
-     display: inline-block;
-   }
- 
    > * {
 -    height: 100%;
      padding: $lineheight * 0.5;
    }
  
    h1 {
 +    height: $headerHeight;
      font-size: 18px;
    }
  
@@@ -152,7 -150,7 +148,7 @@@ nav.primary 
  
  nav.secondary {
    .nav-link {
-     padding: 0.2rem;
+     padding: 0.3rem;
    }
  }
  
@@@ -189,7 -187,7 +185,7 @@@ body.small-nav 
      min-height: $headerHeight;
  
      &.closed nav {
-       display: none;
+       display: none !important;
      }
  
      .search_forms {
@@@ -214,6 -212,8 +210,8 @@@
    }
  
    nav.secondary {
+     flex-direction: column;
+ 
      .user-menu, .login-menu {
        width: 100%;
      }
@@@ -421,6 -421,10 +419,6 @@@
    }
  
    .overlay-layers {
 -    p {
 -      font-size: 13px;
 -      margin-bottom: 8px;
 -    }
      li.disabled { color: $darkgrey; }
    }
  }
@@@ -487,6 -491,16 +485,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 {
@@@ -568,6 -582,10 +566,6 @@@ tr.turn 
  
  .routing_marker { width: 15px; cursor: move; }
  
 -.browse_status {
 -  display: none;
 -}
 -
  /* Rules for the history sidebar */
  
  #sidebar .changesets {
@@@ -616,11 -634,26 +614,11 @@@
      }
    }
  
 -  .note-description {
 -    overflow: hidden;
 -    margin: 0 0 10px 10px;
 -  }
 -
    .query-results {
      display: none;
    }
  }
  
 -/* 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 {