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

diff --combined app/assets/stylesheets/common.scss
index fc0a8292fd33920a0661bde8bfa65c3c884516e6,2644128849b9b9b374f181b4c9f0fae0625a4167..dd07ffd214000278186453a541049ef153e19174
--- 1/app/assets/stylesheets/common.scss
--- 2/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 {