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

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index fdf35d615d0e106981421e3d85e1701130337db9..4bedf42b6ac2b6571a7b09d27f2bf11973c6d222 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,4 +1,6 @@
+@use "sass:map";

 @import "parameters";
 @import "parameters";

+@import "browse";

 @import "bootstrap";
 @import "rails_bootstrap_forms";
 
 @import "bootstrap";
 @import "rails_bootstrap_forms";
 


@@ -10,26 +12,10 @@ body {
   font-size: $typeheight;
 }
 
   font-size: $typeheight;
 }
 

-p > img {
-  width: auto;
-  max-width: 100%;
+time[title] {
+  text-decoration: underline dotted;

 }
 
 }
 

-small, aside {
-  font-size: 12px;
-}
-
-#container { position: relative; }
-
-.small_icon {
-  vertical-align: middle;
-  margin-right: $lineheight/4;
-}
-
-[dir=rtl] { /* no-r2 */ text-align: right; }
-
-[dir=ltr] { /* no-r2 */ text-align: left; }
-

 /* Rules for icons */
 
 .icon {
 /* Rules for icons */
 
 .icon {


@@ -37,115 +23,126 @@ small, aside {
   vertical-align: top;
   width: 20px;
   height: 20px;
   vertical-align: top;
   width: 20px;
   height: 20px;

-  background: transparent image-url("sprite.png") no-repeat 0 0;
-  background-image: image-url("sprite.svg");
+  background: transparent image-url("sprite.svg") no-repeat 0 0;

   text-indent: -9999px;
   overflow: hidden;
 }
 
   text-indent: -9999px;
   overflow: hidden;
 }
 

-.icon.search      { /* no-r2 */ background-position: 0 0; }
-.icon.donate      { /* no-r2 */ background-position: -20px 0; }
-.icon.zoomin      { /* no-r2 */ background-position: -40px 0; }
-.icon.zoomout     { /* no-r2 */ background-position: -60px 0; }
-.icon.geolocate   { /* no-r2 */ background-position: -80px 0; }
-.active .icon.geolocate   { /* no-r2 */ background-position: -80px -20px; }
-.icon.layers      { /* no-r2 */ background-position: -100px 0; }
-.icon.key         { /* no-r2 */ background-position: -120px 0; }
-.icon.share       { /* no-r2 */ background-position: -140px 0; }
-.icon.clipboard   { /* no-r2 */ background-position: -160px 0; }
-.icon.link        { /* no-r2 */ background-position: -180px 0; }
-.icon.close       { /* no-r2 */ background-position: -200px 0; }
-.icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
-.icon.check       { /* no-r2 */ background-position: -220px 0; }
-.icon.note        { /* no-r2 */ background-position: -240px 0; }
-.icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
-.icon.query       { /* no-r2 */ background-position: -260px 0; }
+.icon.search      { /*rtl:ignore*/ background-position: 0 0; }
+.icon.donate      { /*rtl:ignore*/ background-position: -20px 0; }
+.icon.zoomin      { /*rtl:ignore*/ background-position: -40px 0; }
+.icon.zoomout     { /*rtl:ignore*/ background-position: -60px 0; }
+.icon.geolocate   { /*rtl:ignore*/ background-position: -80px 0; }
+.active .icon.geolocate   { /*rtl:ignore*/ background-position: -80px -20px; }
+.icon.layers      { /*rtl:ignore*/ background-position: -100px 0; }
+.icon.key         { /*rtl:ignore*/ background-position: -120px 0; }
+.icon.share       { /*rtl:ignore*/ background-position: -140px 0; }
+.icon.clipboard   { /*rtl:ignore*/ background-position: -160px 0; }
+.icon.link        { /*rtl:ignore*/ background-position: -180px 0; }
+.icon.close       { /*rtl:ignore*/ background-position: -200px 0; }
+.icon.close:hover { /*rtl:ignore*/ background-position: -200px -20px; }
+.icon.check       { /*rtl:ignore*/ background-position: -220px 0; }
+.icon.note        { /*rtl:ignore*/ background-position: -240px 0; }
+.icon.note.grey   { /*rtl:ignore*/ background-position: -240px -20px; }
+.icon.query       { /*rtl:ignore*/ background-position: -260px 0; }

 
 /* Utility for de-emphasizing content */
 
 
 /* Utility for de-emphasizing content */
 

-.text-muted a {
+.text-body-secondary a {

   color: $blue;
 }
 
   color: $blue;
 }
 

-/* Rules for borders */
-/* These add additional colours to those provided by bootstrap */
-.border-grey {
-  border-color: $grey !important;
+/* 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-success {
+    --bs-table-bg: rgb(var(--bs-success-rgb), .25);
+  }
+  .table-primary, .table-secondary, .table-success {
+    --bs-table-color: initial;
+    border-color: inherit;
+  }
+}
+
+/* Utility for delayed loading spinner */
+
+.delayed-fade-in {
+  animation: 300ms linear forwards delayed-fade-in;
+}
+
+@keyframes delayed-fade-in {
+  0%   { opacity: 0 }
+  66%  { opacity: 0 }
+  100% { opacity: 1 }
+}
+
+/* Bootstrap close button overrides for nested light/dark themes */
+
+[data-bs-theme="dark"] .btn-close {
+  filter: var(--bs-btn-close-white-filter);

 }
 
 }
 

-.border-lightgrey {
-  border-color: $lightgrey !important;
+[data-bs-theme="light"] .btn-close {
+  filter: none;

 }
 
 /* Rules for the header */
 
 #menu-icon {
 }
 
 /* Rules for the header */
 
 #menu-icon {

-  display: none !important;
-  float: right;
-  background: image-url("menu-icon.png") no-repeat;
+  display: none;
+  position: absolute;
+  top: 0;
+  right: 0;
+  background: image-url("menu-icon.svg") no-repeat;

   background-size: 30px 30px;
   background-size: 30px 30px;

-  display: block;

   width: 30px;
   height: 30px;
   margin: 14px 10px 0 0;
   opacity: 0.6;
 }
 
   width: 30px;
   height: 30px;
   margin: 14px 10px 0 0;
   opacity: 0.6;
 }
 

+@include color-mode(dark) {
+  #menu-icon {
+    filter: invert(1);
+  }
+}
+

 header {
   height: $headerHeight;
   position: relative;
 header {
   height: $headerHeight;
   position: relative;

-  z-index: 1001;

   font-size: 14px;
 
   font-size: 14px;
 

-  h1, nav, nav > ul, nav > ul > li {
-    display: inline-block;
-  }
-

   > * {
   > * {

-    height: 100%;
-    padding: $lineheight/2;
-  }
-
-  h1, nav.primary {
-    float: left;
-  }
-
-  a, a:hover {
-    text-decoration: none;
-  }
-
-  img.logo {
-    width: 30px;
-    height: 30px;
-    margin-top: -2px;
-    vertical-align: middle;
+    padding: $lineheight * 0.5;

   }
 
   h1 {
   }
 
   h1 {

+    height: $headerHeight;

     font-size: 18px;
     font-size: 18px;

-    font-weight: 600;
-    line-height: 1.2;
-    margin: 0;
-    padding-top: 15px;
-
-    a {
-      color: #000;
-    }
-
-    a:hover {
-      color: #000;
-    }

   }
 
   .btn {
     font-size: 14px;
   }
   }
 
   .btn {
     font-size: 14px;
   }

-}

 
 

+  nav.primary {
+    margin-right: auto;
+  }
+
+  .username {
+    max-width: 12em;
+  }
+}

 
 nav.primary {
 
 nav.primary {

-  .btn-outline-primary {
-    @include button-outline-variant($green, $white);
+  #edit_tab .btn-outline-primary {
+    @include button-outline-variant($green, $color-hover: $white, $active-color: $white);

   }
 
   .disabled {
   }
 
   .disabled {


@@ -176,57 +173,8 @@ nav.primary {
 }
 
 nav.secondary {
 }
 
 nav.secondary {

-  position: absolute;
-  right: 0;
-

   .nav-link {
   .nav-link {

-    padding: 0.2rem;
-    color: $darkgrey;
-  }
-
-  > ul li.current a {
-    color: darken($darkgrey, 25%);
-  }
-
-  .login-menu {
-    .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $white, null, null, $white);
-    }
-  }
-
-  .user-menu {
-    .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey);
-      border-color: $grey;
-      &:hover {
-        border-color: $grey;
-      }
-      &:focus {
-        background-color: white;
-        box-shadow: none;
-      }
-    }
-    &.show .btn-outline-secondary {
-      background-color: white;
-      &:focus {
-        box-shadow: none;
-      }
-    }
-  }
-
-  #inboxanchor {
-    display: inline-block;
-    height: 25px;
-    margin: 3px 0 3px 3px;
-    background-color: lighten($grey, 10%);
-    line-height: 20px;
-    border-radius: 3;
-  }
-
-  .dropdown-menu {
-    .count-number {
-      font-size: 14px;
-    }
+    padding: 0.3rem;

   }
 }
 
   }
 }
 


@@ -252,35 +200,89 @@ body.compact-nav {
   }
 }
 
   }
 }
 

-/* Utility for styling notification numbers */
+body.small-nav {
+  #menu-icon {
+    display: block;
+  }

 
 

-.count-number {
-  padding: 2px $lineheight/4;
-  border-radius: 2px;
-  background: lighten($green, 30%);
-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
+  header {
+    flex-direction: column;
+    height: auto;
+    min-height: $headerHeight;
+
+    &.closed nav {
+      display: none !important;
+    }
+
+    .search_forms {
+      display: block;
+    }
+  }
+
+  #sidebar .search_forms {
+    display: none;
+  }
+
+  nav.primary {
+    margin-right: 0;
+    padding: 0;
+
+    #edit_tab {
+      width: 100%;
+      padding: 10px;
+    }
+  }
+
+  nav.secondary {
+    flex-direction: column;
+
+    .user-menu, .login-menu {
+      width: 100%;
+    }
+  }
+
+  #compact-secondary-nav {
+    display: none;
+  }
+
+  .compact-hide {
+    display: inline-block;
+  }
+
+  .overlay-sidebar #sidebar .welcome {
+    display: none;
+  }
+
+  .overlay-sidebar #sidebar #banner {
+    display: none;
+  }

 }
 
 }
 

-/* Rules for the message shown in place of the map when javascript is disabled */
+/* Utility for styling notification numbers */

 
 

-#noscript {
-  z-index: 20000000;
-  margin-left: 400px;
-  margin-top: 50px;
+.count-number {
+  background: transparentize(lighten($green, 25%), .25);
+  color: $gray-800;
+  font-weight: $font-weight-normal;

 }
 
 /* Rules for Leaflet maps */
 
 }
 
 /* Rules for Leaflet maps */
 

+.leaflet-top.leaflet-right,
+.leaflet-top.leaflet-left {
+  height: 100%;
+  column-gap: 10px;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap-reverse;
+}
+

 .leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
   background-color: #333;
   background-color: rgba(0,0,0,.6);
 .leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
   background-color: #333;
   background-color: rgba(0,0,0,.6);

-  border-radius: 4px 0 0 4px;
-  margin-bottom: 10px;

   outline: none;
 
   &:hover,
   outline: none;
 
   &:hover,


@@ -299,26 +301,18 @@ body.compact-nav {
     background-color: $vibrant-green;
   }
 
     background-color: $vibrant-green;
   }
 

-  .icon {
-    margin: 10px;
+  &-first {
+    border-start-start-radius: 4px;

   }
   }

-}
-
-.leaflet-control .zoomin,
-.control-layers .control-button {
-  margin-bottom: 0px;
-  border-radius: 4px 0 0 0;
-}

 
 

-.leaflet-control .zoomout,
-.control-key .control-button {
-  margin-bottom: 0;
-  border-radius: 0;
-}
+  &-last {
+    border-end-start-radius: 4px;
+    margin-bottom: 10px;
+  }

 
 

-.control-locate .control-button,
-.control-share .control-button {
-  border-radius: 0 0 0 4px;
+  .icon {
+    margin: 10px;
+  }

 }
 
 /* Rules for the sidebar and main map area */
 }
 
 /* Rules for the sidebar and main map area */


@@ -342,27 +336,14 @@ body.compact-nav {
   #sidebar {
     float: left;
     width: $sidebarWidth;
   #sidebar {
     float: left;
     width: $sidebarWidth;

-    background: #fff;

 
     #sidebar_loader {
       display: none;
     }
 
     #sidebar_loader {
       display: none;
     }

-
-    #sidebar_content {
-      padding: $spacer;
-    }
-
-    > div {
-      position: relative;
-      float: left;
-      clear: both;
-      width: 100%;
-    }

   }
 
   .overlay-sidebar #sidebar {
     position: absolute;
   }
 
   .overlay-sidebar #sidebar {
     position: absolute;

-    z-index: 1000;

     height: auto;
     overflow: hidden;
 
     height: auto;
     overflow: hidden;
 


@@ -371,11 +352,7 @@ body.compact-nav {
     }
 
     .welcome {
     }
 
     .welcome {

-      display: none;
-
-      &.visible {
-        display: block;
-      }
+      display: block;

     }
 
     #sidebar_content {
     }
 
     #sidebar_content {


@@ -385,11 +362,6 @@ body.compact-nav {
 
   .welcome {
     display: none;
 
   .welcome {
     display: none;

-
-    p {
-      font-size: 110%;
-      font-weight: 300;
-    }

   }
 
   #banner {
   }
 
   #banner {


@@ -416,6 +388,14 @@ body.compact-nav {
     .leaflet-marker-draggable {
       cursor: move;
     }
     .leaflet-marker-draggable {
       cursor: move;
     }

+
+    .query-marker {
+      animation: 1500ms forwards query-marker-fade;
+
+      @keyframes query-marker-fade {
+        to { opacity: 0 }
+      }
+    }

   }
 
   #map-ui {
   }
 
   #map-ui {


@@ -424,147 +404,68 @@ body.compact-nav {
     float: right;
     width: 250px;
     height: 100%;
     float: right;
     width: 250px;
     height: 100%;

-    background: white;

     overflow: auto;
     overflow: auto;

-
-    .section {
-      border-bottom: 1px solid $grey;
-      padding: 10px 20px;
-    }
-
-    a.close-button {
-      float: right;
-      padding:5px;
-      font-size:20px;
-      line-height:10px;
-      color:#222;
-      border:1px solid $grey;
-    }
-
-    .tooltip {
-      opacity: 1;
-      border: 1px solid $grey;
-      .tooltip-arrow {
-        border-top-color: $grey;
-      }
-    }

   }
 }
 
   }
 }
 

-.layers-ui,
-.share-ui {
-  li:last-child {
-    margin-bottom: 0;
-  }
-}
-
-.layers-ui {
-  .base-layers {
-    .leaflet-container {
+@include media-breakpoint-down(md) {
+  body.map-layout {
+    #sidebar, #map {
+      position: relative;
+      overflow-x: hidden;

       width: 100%;
       width: 100%;

-      height: 50px;
-      cursor: pointer;
+      height: 50%;

     }
 
     }
 

-    li  {
-      overflow: hidden;
-      border-radius: 3px;
-      border: 2px solid #fff;
-      margin-bottom: 8px;
-      position: relative;
-      transition: border-color 0.08s ease-in;
+    #map-ui {
+      width: 100%;
+      height: 50%;
+      overflow-y: scroll;
+    }

 
 

-      label {
+    .overlay-sidebar.overlay-right-sidebar {
+      #sidebar {

         position: absolute;
         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;
-        }
+        width: 350px;
+        height: auto;
+        overflow: hidden;

       }
 
       }
 

-      &.active { border-color: darken($green, 10%); }
-      &:hover {
-        border-color: $grey;
-        &.active { border-color: darken($green, 20%); }
+      #map {
+        height: 100%;

       }
     }
   }
       }
     }
   }

-
-  .overlay-layers {
-    p {
-      font-size: 13px;
-      margin-bottom: 8px;
-    }
-    li.disabled { color: $darkgrey; }
-  }

 }
 
 }
 

-.share-ui {
-  .share-tabs {
-    margin-bottom: 10px;
-
-    a {
-      color: #fff;
-      text-decoration: none;
-      background-color: $lightblue;
-      padding: 5px 10px;
-      border-right: 1px solid #fff;
-    }
-
-    a:first-child {
-      border-right: 1px solid #fff;
-      border-radius: 4px 0 0 4px;
-    }
-
-    a:last-child {
-      border-radius: 0 4px 4px 0;
-    }
-
-    a.active {
-      background-color: $blue;
-    }
-  }
-
-  .share-tab {
-    display: none;
-  }
+.layers-ui {
+  .base-layers > * {
+    height: 3.5rem;

 
 

-  .share-link {
-    input[type=text],
-    textarea {
-      width: 100%;
-      font-family: monospace;
-      font-size: small;
-      line-height: 1.3;
+    > .btn {
+      box-sizing: content-box;
+      top: - map.get($border-widths, 4);
+      left: - map.get($border-widths, 4);
+      --bs-btn-border-color: var(--bs-body-bg);

     }
     }

-  }
-
-  .share-image {
-    label {
-      margin-right: 10px;
+    > .btn:hover {
+      --bs-btn-border-color: var(--bs-primary-border-subtle);

     }
   }
 
     }
   }
 

-  #embed_html {
-    resize: vertical;
+  .overlay-layers {
+    li.disabled { color: $darkgrey; }

   }
   }

+}

 
 

+.share-ui {

   #mapnik_scale {
     width: 100px;
   }
 }
 
 .leaflet-top {
   #mapnik_scale {
     width: 100px;
   }
 }
 
 .leaflet-top {

-  top: $lineheight/2 !important;
+  top: 10px !important;

   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;
   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;


@@ -577,73 +478,57 @@ body.compact-nav {
   border-top: 0px !important;
 }
 
   border-top: 0px !important;
 }
 

-.leaflet-popup-content-wrapper {
-  border-radius: 4px !important;
-}
-
-/* Rules for attribution text under the main map shown on printouts */
-
-#attribution {
-  display: none;
-
-  table {
-    width: 100%
-  }
+.leaflet-popup-content-wrapper, .leaflet-popup-tip,
+.leaflet-contextmenu, .leaflet-contextmenu-item,
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-body, .text-body;

 }
 
 }
 

-.attribution_license,
-.attribution_project {
-  text-align: left;
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-opacity-75;
+  text-shadow: none !important;

 }
 
 }
 

-.attribution_notice {
-  text-align: center;
+.leaflet-contextmenu-item.over {
+  @extend .bg-body-secondary, .border-secondary, .border-opacity-10;

 }
 
 }
 

-.donate-attr { color: darken($green, 10%) !important; }
-
-/* Rules for the sidebar */
-
-.sidebar_heading {
-  position: relative;
-  padding: $lineheight/2 $lineheight;
-  // background: $offwhite;
-  // border-bottom: 1px solid $grey;
-}
+.leaflet-popup-content-wrapper {
+  @extend .rounded-1;

 
 

-#browse_status {
-  input {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
+  a {
+    color: var(--bs-link-color) !important;

   }
   }

+}

 
 

-  > div {
-   padding: $spacer;
+@include color-mode(dark) {
+  .leaflet-tile-container .leaflet-tile,
+  .mapkey-table-entry td:first-child > * {
+    filter: brightness(.8);

   }
   }

-}

 
 

-#sidebar {
-  #sidebar_loader,
-  .search_more {
-    width: 100%;
-    margin: $lineheight auto;
+  .leaflet-container .leaflet-control-attribution a {
+    color: var(--bs-link-color);

   }
 
   }
 

-  .loader {
-    text-align: center;
-    margin: auto;
-    width: 40px;
-    display: block;
+  .leaflet-control-scale-line {
+    border-color: rgba(var(--bs-light-rgb), .75) !important;

   }
 }
 
   }
 }
 

+/* Rules for attribution text under the main map shown on printouts */
+
+.donate-attr { color: darken($green, 10%) !important; }
+

 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
   label {
     font-size: 16px;
   }
 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
   label {
     font-size: 16px;
   }

+  .col-form-label {
+    font-size: 16px;
+  }

 }
 
 /* Stop bootstrap 5 from floating legends when they don't need to be */
 }
 
 /* Stop bootstrap 5 from floating legends when they don't need to be */


@@ -657,15 +542,15 @@ legend {
    reconsider our colours at some point with that in mind. */
 
 .btn-primary {
    reconsider our colours at some point with that in mind. */
 
 .btn-primary {

-  @include button-variant($primary, $primary, $white, null, null, $white, null, null, $white, null, null, $white);
+  @include button-variant($primary, $primary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);

 }
 
 .btn-secondary {
 }
 
 .btn-secondary {

-  @include button-variant($secondary, $secondary, $white, null, null, $white, null, null, $white, null, null, $white);
+  @include button-variant($secondary, $secondary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);

 }
 
 .btn-outline-secondary {
 }
 
 .btn-outline-secondary {

-  @include button-outline-variant($secondary, $white, null, null, $white);
+  @include button-outline-variant($secondary, $color-hover: $white, $active-color: $white);

 }
 
 /* Rules for the search and direction forms */
 }
 
 /* Rules for the search and direction forms */


@@ -675,39 +560,24 @@ header .search_forms,
   display: none;
 }
 
   display: none;
 }
 

-/* Rules for the map key which appears in the popout sidebar */
-
-#mapkey {
- .mapkey-table-key img {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
+.search_form {
+  .describe_location {
+    font-size: 10px;

   }
 }
 
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
   }
 }
 
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {

-  ul li {
-    cursor: pointer;
-    &.selected { background: $list-highlight; }
-  }
-

   .search_more .loader {
     display: none;
   .search_more .loader {
     display: none;

-    width: 100%;

   }
 }
 
   }
 }
 

-.search_results_error {
-  color: #f00;
-  padding: 10px 20px;
-}
-

 /* Rules for routing */
 
 div.direction {
 /* Rules for routing */
 
 div.direction {

-  background-image: image-url('routing-sprite.png');
+  background-image: image-url('routing-sprite.svg');

   width: 20px;
   height: 20px;
   background-repeat: no-repeat;
   width: 20px;
   height: 20px;
   background-repeat: no-repeat;


@@ -716,54 +586,39 @@ div.direction {
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 

-td.instruction, td.distance {
-    padding-top: $lineheight/5;
-    padding-bottom: $lineheight/5;
-    border-bottom: 1px solid $grey;
+@include color-mode(dark) {
+  div.direction {
+    filter: invert(1);
+  }

 }
 }

+

 td.distance {
 td.distance {

-    color: $darkgrey;
-    text-align: right;

     font-size: x-small;
 }
 tr.turn {
     cursor: pointer;
 }
     font-size: x-small;
 }
 tr.turn {
     cursor: pointer;
 }

-tr.turn:hover {
-    background: $list-highlight;
-}
-
-.routing_marker { width: 15px; cursor: move; }

 
 

-/* Rules for entity history */
+.routing_marker_column {
+  width: 15px;

 
 

-#sidebar_content {
-  .browse_details {
-    position: relative;
-    border-bottom: $keyline;
+  img {
+    cursor: move;

   }
 }
 
   }
 }
 

-.browse_status {
-  display: none;
-}
-

 /* Rules for the history sidebar */
 
 #sidebar .changesets {
   li {
 /* Rules for the history sidebar */
 
 #sidebar .changesets {
   li {

-    cursor: pointer;
-
-    &.selected { background: $list-highlight; }
-    /* color is derived from changeset bbox fillColor in history.js */
-  }
-
-  .comments {
-    color: $darkgrey;
-  }
+    &.selected {
+      @extend :hover;
+    }

 
 

-  .comments-0 {
-    opacity: 0.5;
+    a.stretched-link > span, a:not(.stretched-link), [title] {
+      position: relative;
+      z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */
+    }

   }
 
   .changeset_more .loader {
   }
 
   .changeset_more .loader {


@@ -790,141 +645,45 @@ tr.turn:hover {
   }
 
   .browse-tag-list {
   }
 
   .browse-tag-list {

-    background-color: $offwhite;

     table-layout: fixed;
     table-layout: fixed;

-    border-collapse: separate;
-    border-spacing: 0;
-    width: 100%;
-    margin-bottom: $spacer;
-
-    th, td {
-      border-bottom: 1px solid $grey;
-    }
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    word-break: break-word;

 
     tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }
 
     tr:last-child th, tr:last-child td {
       border-bottom: 0;
     }

-
-    .browse-tag-k,
-    .browse-tag-v {
-      width: 50%;
-      padding: 6px 10px;
-      word-wrap: break-word;
-      white-space: pre-wrap;
-    }
-
-    .browse-tag-k {
-      font-weight: 500;
-      background-color: $offwhite;
-    }
-
-    .browse-tag-v {
-      border-left: 1px solid $grey;
-      background-color: #fff;
-    }
-
-    .colour-preview-box {
-      float: right;
-      width: 14px;
-      height: 14px;
-      margin: 4px 0px;
-      border: 1px solid rgba(0, 0, 0, .1);
-      // add color via inline css on element: background-color: <tag value>;
-    }
-  }
-
-  .note-comments li, .changeset-comments li {
-    margin: $lineheight/2 0;
-
-    p {
-      margin: 10px 6px 0 6px;
-      line-height: 1.5;
-    }
-  }
-
-  .subscribe-buttons input {
-    font-size: 90%;
-    line-height: 15px;
-    min-height: 20px;
-  }
-
-  span.action-button:hover {
-    cursor: pointer;
-    text-decoration: underline;
-  }
-
-  .note-description {
-    overflow: hidden;
-    margin: 0 0 10px 10px;

   }
 
   .query-results {
     display: none;
   }
 
   .query-results {
     display: none;

-
-    ul {
-      li {
-        &.query-result {
-          cursor: pointer;
-        }
-
-        &.selected {
-          background: $list-highlight;
-        }
-      }
-    }

   }
 }
 
   }
 }
 

-/* Bootstrap buttons don't have any vertical margin, so
-   they touch when adjacent buttons wrap onto a new line
-   e.g. wide form buttons on a narrow sidebar */
+/* Force LTR/RTL alignment for placeholder text */

 
 

-.btn-wrapper {
-  > .btn {
-    margin-bottom: $spacer * 0.25;
-  }
+.form-control::placeholder {
+  text-align: left;

 }
 
 /* Rules for export sidebar */
 
 .export_form {
 }
 
 /* Rules for export sidebar */
 
 .export_form {

-  .export_area_inputs,
-  .export_button {
-    text-align: center;
-  }
-

   .export_area_inputs {
   .export_area_inputs {

-    margin-bottom: $spacer;

     input[type="text"] {
       width: 100px;
     input[type="text"] {
       width: 100px;

-      text-align: center;

     }
   }
 
   .export_boxy {
     }
   }
 
   .export_boxy {

-    background: $lightgrey;
-
-    #maxlat { margin-top: -1px; }
+    > * {
+        margin: -1px;
+    }

     #minlon {
     #minlon {

-      float: left;
-      /* no-r2 */ margin-left: -1px;
+      /*rtl:ignore*/ float: left;

     }
     #maxlon {
     }
     #maxlon {

-      float: right;
-      /* no-r2 */ margin-right: -1px;
-    }
-    #minlat { margin-bottom: -1px; }
-  }
-
-  .export_bound {
-    margin: $lineheight/4;
-  }
-
-  dl {
-    padding-left: $lineheight/2;
-    dd {
-      margin-left: 0;
-      margin-bottom: 10px;
+      /*rtl:ignore*/ float: right;

     }
   }
 }
     }
   }
 }


@@ -938,19 +697,10 @@ tr.turn:hover {
     bottom: 0;
     width: 100%;
   }
     bottom: 0;
     width: 100%;
   }

-
-  #map {
-    height: 100%;
-    overflow: hidden;
-  }

 }
 
 /* Rules for non-map content pages */
 
 }
 
 /* Rules for non-map content pages */
 

-.content-heading {
-  background: $lightgrey;
-}
-

 .content-inner {
   position: relative;
   max-width: 960px;
 .content-inner {
   position: relative;
   max-width: 960px;


@@ -958,10 +708,16 @@ tr.turn:hover {
   padding: $lineheight;
 }
 
   padding: $lineheight;
 }
 

-/* Overrides for pages that use new layout conventions */
+/* Rules for login and signup pages */
+
+.sessions-new, .users-new, .users-create {
+  #content .content-inner {
+    max-width: 760px;
+  }
+}

 
 .header-illustration {
 
 .header-illustration {

-  background-position: 0 0;
+  background-position: right;

   background-repeat: no-repeat;
   position: relative;
   min-height: 200px;
   background-repeat: no-repeat;
   position: relative;
   min-height: 200px;


@@ -970,40 +726,29 @@ tr.turn:hover {
   bottom: 0;
 
   &.new-user-main {
   bottom: 0;
 
   &.new-user-main {

-    background-image: image-url("sign-up-illustration.png");
+    background-image: image-url("sign-up-illustration.svg");
+    background-position-x: 70px;

   }
 
   &.confirm-main {
   }
 
   &.confirm-main {

-    background-image: image-url("confirm-illustration.png");
+    background-image: image-url("confirm-illustration.svg");

   }
 
   &.new-user-terms {
   }
 
   &.new-user-terms {

-    background-image: image-url("terms-illustration.png");
-  }
-
-  &.new-user-arm {
-    height: 110px;
-    width: 130px;
-    left: 280px;
-    top: 180px;
-    background-image: image-url("sign-up-illustration-arm.png");
-    position: absolute;
-    z-index: 100;
-    pointer-events: none;
+    background-image: image-url("terms-illustration.svg");

   }
 }
 
 [dir=rtl] .header-illustration {
   transform: scaleX(-1);
   }
 }
 
 [dir=rtl] .header-illustration {
   transform: scaleX(-1);

-}

 
 

-#content.maximised {
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 0;
-  z-index: 2000;
+  h1 {
+    transform: scaleX(-1);
+  }
+
+  ul {
+    transform: scaleX(-1);
+  }

 }
 
 /* Rules for small maps in content areas */
 }
 
 /* Rules for small maps in content areas */


@@ -1022,81 +767,32 @@ tr.turn:hover {
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {

-  margin: $lineheight/2;
+  margin: $spacer;

   min-height: 50px;
 }
 
 /* Rules for user popups on maps */
 
 .user_popup {
   min-height: 50px;
 }
 
 /* Rules for user popups on maps */
 
 .user_popup {

-  min-width: 200px;

   p {
     padding: 0 0 5px 0;
   p {
     padding: 0 0 5px 0;

-    margin-top: 0 0 0 60px;
+    margin: 0 0 0 60px;

     font-size: 12px;
   }
 }
 
     font-size: 12px;
   }
 }
 

-/* Rules for the user list */
-
-#user_list {
-  width: 100%;
-}
-
-/* Rules for the diary list page */
-
-.diary_post {
-  position: relative;
-  padding-top: $lineheight;
-  padding-bottom: $lineheight/2;
-  border-top: 1px solid $grey;
-
-  &.deleted {
-    background-color: #fee;
-  }
-}
-

 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;

-    margin-bottom: $lineheight;

   }
   }

-  .comments {
-    max-width: 740px;
-  }
-  .diary-comment {
-    border-top: 1px dashed $grey;
-    padding-top: $lineheight/2;
-    padding-bottom: $lineheight/2;
-    &:first-child {
-      margin-top: $lineheight/2;
-      padding-top: $lineheight;
-      border-top: 1px solid $grey;
-    }
-    &.deleted {
-      background-color: #fee;
-    }
-    p {
-      margin-bottom: $lineheight/2;
-    }
-    .comment-heading {
-      margin-bottom: 0;
-      margin-top: 0;
-    }
+  .diary-comment .col-auto {
+    width: 62px;

   }
   }

-}
-
-/* Rules for the log in page */
-
-#login_auth_buttons {
-  margin-bottom: 0;
-
-  li {
-    float: left;
-    padding: $lineheight/4 $lineheight/2;
+  .diary-comment .col {
+    max-width: 690px;

   }
 }
 
   }
 }
 


@@ -1119,178 +815,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the account settings page */
-
-#accountForm .user_image {
-  margin-bottom: 0;
-}
-
-#accountForm #user_image {
-  margin-left: 20px;
-}
-
-#accountForm ul.accountImage-options {
-  margin-left: 120px;
-}
-
-.nohome .location {
-  display: none;
-}
-
-#homerow .message {
-  display: none;
-}
-
-.nohome .message {
-  display: inline !important;
-}
-
-/* Rules for the oauth settings page */
-
-.oauth_clients .buttons .oauth-edit {
-  border-radius: 2px 0 0 2px;
-}
-
-.oauth_clients .buttons .oauth-delete {
-  border-radius: 0 2px 2px 0;
-}
-
-/* Rules for the oauth authorization page */
-
-.oauth-authorize ul {
-  list-style: none;
-}
-
-/* Rules for messages pages */
-
-.messages {
-  button[type="submit"] {
-    margin: auto;
-    white-space: nowrap;
-  }
-
-  .inbox-row {
-    background: $offwhite;
-  }
-
-  .inbox-row-unread {
-    background: #CBEEA7;
-  }
-
-  .right {
-    float: right;
-  }
-}
-
-.inbox-row .inbox-mark-read {
-  display: none;
-}
-
-.info-line {
-  margin-bottom: $lineheight;
-  padding: $lineheight/4 0px 4px 0px;
-  border-bottom: 1px solid $grey;
-
-  form, form div {
-    display: inline;
-  }
-}
-
-.info-line .user_thumbnail_tiny {
-  vertical-align: middle;
-}
-
-.inbox-sent {
-  white-space: nowrap;
-}
-
-.inbox-mark-unread,
-.inbox-mark-read,
-.inbox-delete {
-  width: 1%;
-}
-
-.inbox-row-unread .inbox-mark-unread {
-  display: none;
-}
-
-/* Rules for "flash" notice boxes shown at the top of the content area */
-
-.flash {
-  &.error {
-    background-color: #ff7070;
-  }
-
-  &.warning {
-    background-color: #ffe0cc;
-  }
-
-  &.notice {
-    background-color: #CBEEA7;
-  }
-}
-
-/* Rules for highlighting fields with rails validation errors */
-
-.formError {
-  display: inline-block;
-  padding: 5px 10px;
-  margin-top: 5px;
-  border-radius: 4px;
-  font-size: 12px;
-  color: #fff;
-  background-color: #ff7070;
-}
-
-/* Rules for rails validation error boxes */
-
-#errorExplanation {
-  width: 400px;
-  border: 2px solid #ff7070;
-  padding: 0 $lineheight/2;
-  margin-bottom: $lineheight;
-  background-color: #f0f0f0;
-
-  h2 {
-    margin: 0 -10px 10px -10px;
-    padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
-    font-weight: bold;
-    font-size: 12px;
-    background-color: #c00;
-    color: #fff;
-    text-align: left;
-  }
-
-  p {
-    color: #333;
-    margin-bottom: 0px;
-    padding: $lineheight/4;
-  }
-}
-
-.search_form {
-  background-color: $lightgrey;
-
-  .describe_location {
-    top: 6px;
-    right: 6px;
-    font-size: 10px;
-    color: $blue;
-  }
-}
-
-.directions_form {
-  background-color: $lightgrey;
-
-  .loader_copy {
-    display: none;
-
-    img {
-      vertical-align: middle;
-    }
-  }
-}
-

 /* Rules for user images */
 
 img.user_image {
 /* Rules for user images */
 
 img.user_image {


@@ -1304,20 +828,12 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {

-  width: auto;
-  height: auto;
-  max-width: 25px;
-  max-height: 25px;
-}
-
-/* Rules for geo microformats */
-
-abbr.geo {
-  border-bottom: none;
+  width: 25px;
+  height: 25px;
+  object-fit: contain;

 }
 
 }
 

-/* General styles for action lists / subnavs / pager navs */
-
+/* General styles for action lists / subnavs */

 
 nav.secondary-actions {
   margin-left: -11px;
 
 nav.secondary-actions {
   margin-left: -11px;


@@ -1329,17 +845,13 @@ nav.secondary-actions {
     margin-bottom: 0;
     margin-left: -1px;
     padding: 0;
     margin-bottom: 0;
     margin-left: -1px;
     padding: 0;

-    &.pager {
-      display: inline-block;
-      margin-right: 60px;
-    }

     > li {
       flex-basis: auto;
       list-style: none;
       border-left: 1px solid $grey;
     > li {
       flex-basis: auto;
       list-style: none;
       border-left: 1px solid $grey;

-      padding-left: $lineheight/2;
-      margin-right: $lineheight/2;
-      margin-bottom: $lineheight/8;
+      padding-left: $lineheight * 0.5;
+      margin-right: $lineheight * 0.5;
+      margin-bottom: $lineheight * 0.125;

     }
   }
 }
     }
   }
 }


@@ -1349,89 +861,16 @@ div.secondary-actions {
   text-align: center;
 }
 
   text-align: center;
 }
 

-.buttons {
-  min-width: 200px;
-  input[type="submit"],
-  input[type="button"],
-  input[type="reset"],
-  .button,
-  .button_to {
-    box-sizing: border-box;
-    float: left;
-    border-radius: 0;
-    margin:0;
-    min-width: 75px;
-    max-width: 180px;
-    border-right:1px solid white;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
-  input:first-child,
-  .button:first-child,
-  .button_to:first-child {
-    border-radius:2px 0 0 2px;
-  }
-  input:last-child,
-  .button:last-child,
-  .button_to:last-child {
-    border-radius:0 2px 2px 0;
-    border-right-width: 0;
-  }
-  input:only-child,
-  .button:only-child,
-  .button_to:only-child,
-  *[value="Hide"] + input:last-child,
-  *[value="Hide"] + .button:last-child,
-  *[value="Hide"] + .button_to:last-child {
-    border-radius:2px;
-    border-right-width: 0;
-  }
-    /* if a 3-button set has a hidden middle button */
-  *[value="Hide"] + input:nth-child(3),
-  *[value="Hide"] + .button:nth-child(3),
-  *[value="Hide"] + .button_to:nth-child(3) {
-    border-radius:0 2px 2px 0;
-    border-right-width: 0;
-  }
-  /* if a 3-button set starts with a hidden button */
-  *[value="Hide"] + input:nth-child(2):not(:last-child),
-  *[value="Hide"] + .button:nth-child(2):not(:last-child),
-  *[value="Hide"] + .button_to:nth-child(2):not(:last-child) {
-    border-radius:2px 0 0 2px;
-    border-right-width: 1px;
-  }
-}
-
-/* Create a single-line dl */
-
-dl.dl-inline {
-  dt, dd {
-    display: inline-block;
-  }
-  dd {
-    margin-right: 1em;
-  }
-}
-
-/* Rules for OpenID logo */
-
-.openid_logo {
-  vertical-align: text-bottom;
-  border: 0;
-}
-

 /* Rules for rich text */
 
 /* Rules for rich text */
 

-.richtext,
-.prose {
+.richtext {

   code {
   code {

-    background: $lightgrey;
+    background: var(--bs-secondary-bg);

     padding: 2px 3px;
   }
 
   pre {
     padding: 2px 3px;
   }
 
   pre {

-    background: $lightgrey;
+    background: var(--bs-secondary-bg);

     padding: 2px 3px;
     white-space: pre-wrap;
 
     padding: 2px 3px;
     white-space: pre-wrap;
 


@@ -1442,103 +881,23 @@ dl.dl-inline {
 
   img {
     padding: $lineheight;
 
   img {
     padding: $lineheight;

-    background-color: $offwhite;
+    background-color: var(--bs-tertiary-bg);

     display: block;
     max-width: 100%;
     margin: auto;
   }
 
   blockquote {
     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;
     padding-left: $lineheight;
     margin: 0;

-    color: $darkgrey;
-  }
-}
-
-/* Rules for the user notes list */
-
-.note_list {
-  tr.creator {
-    background-color: $offwhite;
+    color: var(--bs-secondary-color);

   }
 }
 
   }
 }
 

-/* Rules for the iD editor */
-
-.id-embed {
-  width: 100%;
-  height: 100%;
-}
-
-/* Rules for the "Welcome" page */
-.site-welcome, .site-fixthemap {
-  .sprite {
-    background-image: image-url("welcome-sprite.png");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .icon-list {
-    padding-bottom: 20px;
-    div {
-      margin-bottom: 10px;
-      p {
-        padding-top: 10px;
-      }
-    }
-  }
-  .sprite.small {
-    width: 50px;
-    height: 50px;
-  }
-
-  .sprite.x {
-    /* no-r2 */ background-position: -50px 0;
-  }
-
-  .sprite.term {
-    margin-right: 10px;
-    vertical-align: middle;
-  }
-
-  .sprite.node {
-    /* no-r2 */ background-position: -100px 0;
-  }
-
-  .sprite.way {
-    /* no-r2 */ background-position: -150px 0;
-  }
-
-  .sprite.tag {
-    /* no-r2 */ background-position: -200px 0;
-  }
-
-  .sprite.editor {
-    /* no-r2 */ background-position: -250px 0;
-  }
-
-  .sprite.question {
-    /* no-r2 */ background-position: -300px 0;
-  }
-
-  .sprite.rules {
-    /* no-r2 */ background-position: -350px 0;
-  }
-
-  .icon.note {
-    background-color: #333;
-    border-radius: 4px;
-  }
-}
+/* Rules for the "About" page */

 
 .site-about #content {
 
 .site-about #content {

-  background-color: $lightgrey;
-  background-position: 50% 50%;
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-attachment: fixed;
-

   .content-inner {
     max-width: 760px;
   }
   .content-inner {
     max-width: 760px;
   }


@@ -1571,45 +930,65 @@ dl.dl-inline {
       margin-left: -1em;
     }
   }
       margin-left: -1em;
     }
   }

+}

 
 

-  .icon {
-    width: 30px;
-    height: 30px;
-    margin-right: 10px;
-    vertical-align: middle;
-    background: 40px 40px image-url('about/sprite.png') no-repeat;
-
-    &.local {
-      /* no-r2 */
-      background-position: 0px 0px;
-    }
-    &.community {
-      /* no-r2 */
-      background-position: 0px -40px;
-    }
-    &.open {
-      /* no-r2 */
-      background-position: 0px -80px;
-    }
-    &.partners {
-      /* no-r2 */
-      background-position: 0px -120px;
-    }
-    &.infringement {
-      /* no-r2 */
-      background-position: 0px -160px;
-    }
-    &.legal {
-      /* no-r2 */
-      background-position: -45px -160px;
-    }
+/* Rules for block pages */
+
+#block_list .username {
+  max-width: 20em;
+}
+
+/* Rules for tabs inside secondary background sections */
+
+.bg-body-secondary .nav-tabs {
+  --bs-border-color: var(--bs-secondary-border-subtle);
+  --bs-secondary-bg: var(--bs-secondary-border-subtle);
+  margin-bottom: -1px;
+}
+
+/* Rules for traces */
+
+img.trace_image {
+  mix-blend-mode: darken;
+}
+
+@include color-mode(dark) {
+  img.trace_image {
+    filter: invert(1);
+    mix-blend-mode: lighten;

   }
 }
 
   }
 }
 

-@import 'browse';
+/* Rules for map sidebar icons */

 
 

-@media only screen and (max-width:960px) {
-  .header-illustration.new-user-arm {
-    display: none;
+.browse-section {
+  .node::before,
+  .way::before,
+  .relation::before {
+    display: inline-block;
+    width: 25px;
+    margin-left: -25px;
+  }
+
+  .node, .way, .relation {
+    margin-left: 25px;
+  }
+
+  .node::before     { content: image-url('browse/node.svg'); }
+  .way::before      { content: image-url('browse/way.svg'); }
+  .relation::before { content: image-url('browse/relation.svg'); }
+}
+
+@each $class, $item in $map-sidebar-icons {
+  .browse-section #{$class}::before {
+    content: image-url('browse/#{map.get($item, "filename")}');
+  }
+
+  @if map.get($item, "invert") {
+    @include color-mode(dark) {
+      .browse-section #{$class}::before {
+        filter: invert(.8) hue-rotate(180deg);
+      }
+    }

   }
 }
   }
 }