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

diff --combined app/assets/stylesheets/common.scss
index dd07ffd214000278186453a541049ef153e19174,e89eb9d81301314015f971cba0e527998e44c63b..6ff46c07ce5be5304b8d42d0cfc777bef7974b85
--- 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);
    }
  
@@@ -729,14 -729,6 +729,6 @@@ tr.turn:hover 
      }
    }
  
-   .comments {
-     color: $darkgrey;
-   }
- 
-   .comments-0 {
-     opacity: 0.5;
-   }
- 
    .changeset_more .loader {
      display: none;
      width: 100%;
@@@ -1055,12 -1047,11 +1047,12 @@@
  .search_form {
    background-color: $lightgrey;
  
 +  #query {
 +    z-index: 0;
 +  }
 +
    .describe_location {
 -    top: 6px;
 -    right: 6px;
      font-size: 10px;
 -    color: $blue;
    }
  }
  
@@@ -1122,6 -1113,8 +1114,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 {