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

diff --combined app/assets/stylesheets/common.scss
index fd12d7e6b9882c8fbac395325a771a12ecec1840,ec91b281884a12e2cf108c598381b0932c574722..6c1a65e7b97c52fab2e814d0af4f91a1e8a0ccaa
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -66,6 -66,21 +66,21 @@@ time[title] 
    color: $blue;
  }
  
+ /* Bootstrap contextual table classes overrides in dark mode */
+ 
+ @include color-mode(dark) {
+   .table-primary {
+     --bs-table-bg: rgb(var(--bs-primary-rgb), .25);
+   }
+   .table-secondary {
+     --bs-table-bg: rgb(var(--bs-secondary-rgb), .25);
+   }
+   .table-primary, .table-secondary {
+     --bs-table-color: initial;
+     border-color: inherit;
+   }
+ }
+ 
  /* Rules for the header */
  
  #menu-icon {
@@@ -245,7 -260,7 +260,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 -528,6 +528,12 @@@ header .search_forms
    display: none;
  }
  
 +.search_form {
 +  .describe_location {
 +    font-size: 10px;
 +  }
 +}
 +
  /* Rules for search sidebar */
  
  #sidebar .search_results_entry {
@@@ -651,9 -660,16 +666,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 -817,21 +816,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 -880,8 +869,7 @@@ div.secondary-actions 
  
  /* Rules for rich text */
  
 -.richtext,
 -.prose {
 +.richtext {
    code {
      background: var(--bs-secondary-bg);
      padding: 2px 3px;