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

diff --combined app/assets/stylesheets/common.scss
index c02b0bb89b2b34179969047e9344e877b13943eb,f88e75f2e42ca6d07263688f335ef4f47fd6a932..3f43eb2a15e4eeafb0b3be08c9a7744c10269814
--- 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 {
@@@ -418,14 -419,43 +418,14 @@@
  }
  
  .layers-ui {
 -  .base-layers {
 -    .leaflet-container {
 -      width: 100%;
 -      height: 50px;
 -      cursor: pointer;
 -    }
 +  .base-layers > * {
 +    height: 56px;
  
 -    li  {
 -      overflow: hidden;
 -      border-radius: 3px;
 -      border: 2px solid #fff;
 -      margin-bottom: 8px;
 -      position: relative;
 -      transition: border-color 0.08s ease-in;
 -
 -      label {
 -        position: absolute;
 -        top: 0;
 -        left: 0;
 -        padding: 2px 6px;
 -        border-bottom-right-radius: 3px;
 -        cursor: pointer;
 -        font-weight: 600;
 -        font-size: 16px;
 -        text-stroke: 2px #fff;
 -        background: rgba(255,255,255,.9);
 -        z-index: 1000;
 -        input[type="radio"] {
 -          display: none;
 -        }
 -      }
 -
 -      &.active { border-color: darken($green, 10%); }
 -      &:hover {
 -        border-color: $grey;
 -        &.active { border-color: darken($green, 20%); }
 -      }
 +    > .btn {
 +      --bs-btn-border-color: var(--bs-body-bg);
 +    }
 +    > .btn:hover {
 +      --bs-btn-border-color: var(--bs-primary-border-subtle);
      }
    }
  
@@@ -656,6 -686,8 +656,6 @@@ tr.turn:hover 
    }
  
    .export_boxy {
 -    background: $lightgrey;
 -
      > * {
          margin: -1px;
      }
@@@ -869,12 -901,12 +869,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;
  
@@@ -885,17 -917,17 +885,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);
    }
  }
  
@@@ -952,8 -984,6 +952,6 @@@
  }
  
  .site-about #content {
-   background-color: $lightgrey;
- 
    .content-inner {
      max-width: 760px;
    }