From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Oct 2023 17:47:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4266'
X-Git-Tag: live~585
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0d420a8374f89127d04de5143efdb06594bb5c9e?hp=-c

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

0d420a8374f89127d04de5143efdb06594bb5c9e
diff --combined app/assets/stylesheets/common.scss
index fc0a8292f,264412884..dd07ffd21
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -143,7 -143,7 +143,7 @@@ header 
  
  
  nav.primary {
-   .btn-outline-primary {
+   & > .btn-group .btn-outline-primary {
      @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
    }
  
@@@ -1055,11 -1055,12 +1055,12 @@@ tr.turn:hover 
  .search_form {
    background-color: $lightgrey;
  
+   #query {
+     z-index: 0;
+   }
+ 
    .describe_location {
-     top: 6px;
-     right: 6px;
      font-size: 10px;
-     color: $blue;
    }
  }
  
@@@ -1121,6 -1122,8 +1122,6 @@@ div.secondary-actions 
    code {
      background: $lightgrey;
      padding: 2px 3px;
 -    direction: inherit; /* fix for Bootstrap < 5.2 */
 -    unicode-bidi: unset; /* fix for Bootstrap < 5.2 */
    }
  
    pre {