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

diff --combined app/assets/stylesheets/common.scss
index abff59a207a7748298bd7dde512e3b9f3cc8c4f0,4df8b4c2db79badb1a8b6eb37b4f41f9f1fb6836..1517195f0e45cfdfeb9d3fde20ad24da36190bd2
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -489,6 -489,16 +489,6 @@@ body.small-nav 
  
  .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,16 -637,6 +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 {