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

diff --combined app/assets/stylesheets/common.scss
index 3d9e69b761a45219603860dd6c3d456e66244bfb,a04615a89d1dc2200e2dea9ad7232e445324bc06..ed79a7cec0d06ffb968d83887294508bc90e6b5a
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -377,6 -377,7 +377,6 @@@ body.small-nav 
      float: right;
      width: 250px;
      height: 100%;
 -    background: white;
      overflow: auto;
  
      .section {
@@@ -428,7 -429,7 +428,7 @@@
      li  {
        overflow: hidden;
        border-radius: 3px;
 -      border: 2px solid #fff;
 +      border: 2px solid transparent;
        margin-bottom: 8px;
        position: relative;
        transition: border-color 0.08s ease-in;
@@@ -442,8 -443,8 +442,8 @@@
          cursor: pointer;
          font-weight: 600;
          font-size: 16px;
 -        text-stroke: 2px #fff;
 -        background: rgba(255,255,255,.9);
 +        background-color: var(--bs-body-bg);
 +        opacity: 0.9;
          z-index: 1000;
          input[type="radio"] {
            display: none;
@@@ -685,6 -686,8 +685,6 @@@ tr.turn:hover 
    }
  
    .export_boxy {
 -    background: $lightgrey;
 -
      > * {
          margin: -1px;
      }
@@@ -898,12 -901,12 +898,12 @@@ div.secondary-actions 
  .richtext,
  .prose {
    code {
-     background: $lightgrey;
+     background: var(--bs-secondary-bg);
      padding: 2px 3px;
    }
  
    pre {
-     background: $lightgrey;
+     background: var(--bs-secondary-bg);
      padding: 2px 3px;
      white-space: pre-wrap;
  
@@@ -914,17 -917,17 +914,17 @@@
  
    img {
      padding: $lineheight;
-     background-color: $offwhite;
+     background-color: var(--bs-tertiary-bg);
      display: block;
      max-width: 100%;
      margin: auto;
    }
  
    blockquote {
-     border-left: $lineheight solid $offwhite;
+     border-left: $lineheight solid var(--bs-tertiary-bg);
      padding-left: $lineheight;
      margin: 0;
-     color: $darkgrey;
+     color: var(--bs-secondary-color);
    }
  }