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

diff --combined app/assets/stylesheets/common.scss
index 3f7c0b48f92eb00c179932e42d46d6e0fe27b30b,1ecf1318b2ec087c30d9959c326b2faa2d7317f1..fd12d7e6b9882c8fbac395325a771a12ecec1840
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -245,7 -245,7 +245,7 @@@ body.small-nav 
  /* Utility for styling notification numbers */
  
  .count-number {
-   background: lighten($green, 30%);
+   background: transparentize(lighten($green, 25%), .25);
    color: $gray-800;
    font-weight: $font-weight-normal;
  }
@@@ -513,12 -513,6 +513,12 @@@ header .search_forms
    display: none;
  }
  
 +.search_form {
 +  .describe_location {
 +    font-size: 10px;
 +  }
 +}
 +
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
@@@ -651,9 -645,16 +651,9 @@@ tr.turn:hover 
  /* Rules for export sidebar */
  
  .export_form {
 -  .export_area_inputs,
 -  .export_button {
 -    text-align: center;
 -  }
 -
    .export_area_inputs {
 -    margin-bottom: $spacer;
      input[type="text"] {
        width: 100px;
 -      text-align: center;
      }
    }
  
@@@ -801,11 -802,21 +801,11 @@@
  /* 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 {
@@@ -854,7 -865,8 +854,7 @@@ div.secondary-actions 
  
  /* Rules for rich text */
  
 -.richtext,
 -.prose {
 +.richtext {
    code {
      background: var(--bs-secondary-bg);
      padding: 2px 3px;