From: Tom Hughes <tom@compton.nu>
Date: Mon, 27 May 2024 09:48:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4838'
X-Git-Tag: live~869
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/7a5524c854901fb69a3eac513a28c0052a9a3788?hp=-c

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

7a5524c854901fb69a3eac513a28c0052a9a3788
diff --combined app/assets/stylesheets/common.scss
index 1517195f0,3d6ab94bf..7df0cdc52
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -16,8 -16,6 +16,6 @@@ time[title] 
    text-decoration: underline dotted;
  }
  
- #container { position: relative; }
- 
  /* Rules for icons */
  
  .icon {
@@@ -489,6 -487,16 +487,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 -578,10 +568,6 @@@ tr.turn 
  
  .routing_marker { width: 15px; cursor: move; }
  
 -.browse_status {
 -  display: none;
 -}
 -
  /* Rules for the history sidebar */
  
  #sidebar .changesets {
@@@ -623,6 -635,16 +621,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 {