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

diff --combined app/assets/stylesheets/common.scss
index 548c2537220af55cb55da138ddcd2ca9afafe9e1,8abff460ae2b0a6cadb8e78411494a05631710a8..3d9e69b761a45219603860dd6c3d456e66244bfb
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -377,7 -377,6 +377,6 @@@ body.small-nav 
      float: right;
      width: 250px;
      height: 100%;
-     background: white;
      overflow: auto;
  
      .section {
@@@ -429,7 -428,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;
@@@ -443,8 -442,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;
@@@ -686,6 -685,8 +685,6 @@@ tr.turn:hover 
    }
  
    .export_boxy {
 -    background: $lightgrey;
 -
      > * {
          margin: -1px;
      }