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

diff --combined app/assets/stylesheets/common.scss
index 67813e1788029c06cf1c9deab81424d1e76717c0,7cd5d98ab3517dff2edef16e8416e5cfa96062dc..931d10c8aba5f6fdb74b42310ca59bd941fb93a5
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -513,6 -513,12 +513,12 @@@ header .search_forms
    display: none;
  }
  
+ .search_form {
+   .describe_location {
+     font-size: 10px;
+   }
+ }
+ 
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
@@@ -802,17 -808,15 +808,11 @@@ tr.turn:hover 
  /* Rules for messages pages */
  
  .messages {
 -  .inbox-row {
 -    background: $offwhite;
 -  }
 -
    .inbox-row-unread td {
      background: #CBEEA7;
    }
  }
  
- .search_form {
-   .describe_location {
-     font-size: 10px;
-   }
- }
- 
  /* Rules for user images */
  
  img.user_image {
@@@ -861,7 -865,8 +861,7 @@@ div.secondary-actions 
  
  /* Rules for rich text */
  
 -.richtext,
 -.prose {
 +.richtext {
    code {
      background: var(--bs-secondary-bg);
      padding: 2px 3px;