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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 301709fe109a0754065acf9ab8321efe79d7d686..1ccdc7871454547b94623c1f393e469a1c222e1f 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -19,17 +19,17 @@ small, aside {
   font-size: 12px;
 }
 
   font-size: 12px;
 }
 

+time[title] {
+  text-decoration: underline dotted;
+}
+

 #container { position: relative; }
 
 .small_icon {
   vertical-align: middle;
 #container { position: relative; }
 
 .small_icon {
   vertical-align: middle;

-  margin-right: $lineheight/4;
+  margin-right: $lineheight * 0.25;

 }
 
 }
 

-[dir=rtl] { /* no-r2 */ text-align: right; }
-
-[dir=ltr] { /* no-r2 */ text-align: left; }
-

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


@@ -37,29 +37,28 @@ 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 */
 


@@ -67,21 +66,13 @@ small, aside {
   color: $blue;
 }
 
   color: $blue;
 }
 

-/* Rules for borders */
-/* These add additional colours to those provided by bootstrap */
-.border-grey {
-  border-color: $grey !important;
-}
-
-.border-lightgrey {
-  border-color: $lightgrey !important;
-}
-

 /* Rules for the header */
 
 #menu-icon {
   display: none;
 /* Rules for the header */
 
 #menu-icon {
   display: none;

-  float: right;
+  position: absolute;
+  top: 0;
+  right: 0;

   background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
   width: 30px;
   background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
   width: 30px;


@@ -90,6 +81,12 @@ small, aside {
   opacity: 0.6;
 }
 
   opacity: 0.6;
 }
 

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

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


@@ -102,48 +99,30 @@ header {
 
   > * {
     height: 100%;
 
   > * {
     height: 100%;

-    padding: $lineheight/2;
-  }
-
-  h1, nav.primary {
-    float: left;
-  }
-
-  a, a:hover {
-    text-decoration: none;
+    padding: $lineheight * 0.5;

   }
 
   img.logo {
   }
 
   img.logo {

-    width: 30px;
-    height: 30px;

     margin-top: -2px;
     margin-top: -2px;

-    vertical-align: middle;

   }
 
   h1 {
     font-size: 18px;
   }
 
   h1 {
     font-size: 18px;

-    font-weight: 600;

     line-height: 1.2;
     line-height: 1.2;

-    margin: 0;

     padding-top: 15px;
     padding-top: 15px;

-
-    a {
-      color: #000;
-    }
-
-    a:hover {
-      color: #000;
-    }

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

-}

 
 

+  nav.primary {
+    margin-right: auto;
+  }
+}

 
 nav.primary {
 
 nav.primary {

-  .btn-outline-primary {
+  & > .btn-group .btn-outline-primary {

     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 


@@ -175,47 +154,12 @@ nav.primary {
 }
 
 nav.secondary {
 }
 
 nav.secondary {

-  position: absolute;
-  right: 0;
-

   .nav-link {
     padding: 0.2rem;
   .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, $color-hover: $white, $active-color: $white);
-    }
-  }
-
-  .user-menu {
-    .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);
-      border-color: $grey;
-      &:hover {
-        border-color: $grey;
-      }
-    }

   }
 
   #inboxanchor {
   }
 
   #inboxanchor {

-    display: inline-block;
-    height: 25px;
-    margin: 3px 0 3px 3px;

     background-color: lighten($grey, 10%);
     background-color: lighten($grey, 10%);

-    line-height: 20px;
-    border-radius: 3;
-  }
-
-  .dropdown-menu {
-    .count-number {
-      font-size: 14px;
-    }

   }
 }
 
   }
 }
 


@@ -246,18 +190,10 @@ body.small-nav {
     display: block;
   }
 
     display: block;
   }
 

-  nav.primary,
-  nav.secondary {
-    float: none !important;
-    position: relative;
-    display: block;
-    clear: both;
-  }
-

   header {
   header {

+    flex-direction: column;

     height: auto;
     min-height: $headerHeight;
     height: auto;
     min-height: $headerHeight;

-    background: #fff;

 
     &.closed nav {
       display: none;
 
     &.closed nav {
       display: none;


@@ -275,28 +211,9 @@ body.small-nav {
   }
 
   nav.primary {
   }
 
   nav.primary {

+    margin-right: 0;

     padding: 0;
 
     padding: 0;
 

-    ul, li {
-      border: none;
-      border-radius: 0;
-      width: 100%;
-    }
-
-    ul {
-      border-top: 1px solid #eee;
-      li {
-        border-bottom: 1px solid #eee;
-        border-right: none;
-        > a {
-          border-radius: 0;
-          width: 100%;
-          text-align: center;
-          font-size: 15px;
-        }
-      }
-    }
-

     .btn-group {
       width: 100%;
       padding: 10px;
     .btn-group {
       width: 100%;
       padding: 10px;


@@ -304,7 +221,7 @@ body.small-nav {
   }
 
   nav.secondary {
   }
 
   nav.secondary {

-    .user-menu {
+    .user-menu, .login-menu {

       width: 100%;
     }
   }
       width: 100%;
     }
   }


@@ -324,33 +241,27 @@ body.small-nav {
   .overlay-sidebar #sidebar #banner {
     display: none;
   }
   .overlay-sidebar #sidebar #banner {
     display: none;
   }

-
-  .leaflet-top.leaflet-right {
-    top: 10px !important;
-  }

 }
 
 /* Utility for styling notification numbers */
 
 .count-number {
 }
 
 /* Utility for styling notification numbers */
 
 .count-number {

-  padding: 2px $lineheight/4;
-  border-radius: 2px;

   background: lighten($green, 30%);
   background: lighten($green, 30%);

-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
+  color: $gray-800;
+  font-weight: $font-weight-normal;

 }
 
 }
 

-/* Rules for the message shown in place of the map when javascript is disabled */
+/* Rules for Leaflet maps */

 
 

-#noscript {
-  z-index: 20000000;
-  margin-left: 400px;
-  margin-top: 50px;
+.leaflet-top.leaflet-right,
+.leaflet-top.leaflet-left {
+  height: 100%;
+  column-gap: 10px;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap-reverse;

 }
 
 }
 

-/* Rules for Leaflet maps */
-

 .leaflet-control .control-button {
   display: block;
   height: 40px;
 .leaflet-control .control-button {
   display: block;
   height: 40px;


@@ -410,19 +321,10 @@ body.small-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;
-    }

   }
 
   .overlay-sidebar #sidebar {
   }
 
   .overlay-sidebar #sidebar {


@@ -446,11 +348,6 @@ body.small-nav {
 
   .welcome {
     display: none;
 
   .welcome {
     display: none;

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

   }
 
   #banner {
   }
 
   #banner {


@@ -485,13 +382,7 @@ body.small-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;
-    }

   }
 }
 
   }
 }
 


@@ -527,43 +418,14 @@ body.small-nav {
 }
 
 .layers-ui {
 }
 
 .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);

     }
   }
 
     }
   }
 


@@ -577,29 +439,13 @@ body.small-nav {
 }
 
 .share-ui {
 }
 
 .share-ui {

-  .share-link {
-    input[type=text],
-    textarea {
-      width: 100%;
-      font-family: monospace;
-      font-size: small;
-      line-height: 1.3;
-    }
-  }
-
-  .share-image {
-    label {
-      margin-right: 10px;
-    }
-  }
-

   #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;


@@ -618,31 +464,16 @@ body.small-nav {
 
 /* Rules for attribution text under the main map shown on printouts */
 
 
 /* Rules for attribution text under the main map shown on printouts */
 

-#attribution {
-  display: none;
-}
-

 .donate-attr { color: darken($green, 10%) !important; }
 
 /* Rules for the sidebar */
 
 .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;
-}
-

 #browse_status {
   input {
     display: block;
     margin-left: auto;
     margin-right: auto;
   }
 #browse_status {
   input {
     display: block;
     margin-left: auto;
     margin-right: auto;
   }

-
-  > div {
-   padding: $spacer;
-  }

 }
 
 /* Temporary label size override until we remove site-wide font customisation */
 }
 
 /* Temporary label size override until we remove site-wide font customisation */


@@ -651,6 +482,9 @@ form {
   label {
     font-size: 16px;
   }
   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 */


@@ -682,22 +516,11 @@ 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;
-  }
-}
-

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

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

   }
 
   .search_more .loader {
   }
 
   .search_more .loader {


@@ -705,11 +528,6 @@ header .search_forms,
   }
 }
 
   }
 }
 

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

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


@@ -722,14 +540,13 @@ 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 {
     font-size: x-small;
 }
 tr.turn {


@@ -758,14 +575,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  .comments {
-    color: $darkgrey;
-  }
-
-  .comments-0 {
-    opacity: 0.5;
-  }
-

   .changeset_more .loader {
     display: none;
     width: 100%;
   .changeset_more .loader {
     display: none;
     width: 100%;


@@ -790,67 +599,12 @@ 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;

 
     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 {
   }
 
   .note-description {


@@ -885,6 +639,12 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

+/* Force LTR/RTL alignment for placeholder text */
+
+.form-control::placeholder {
+  text-align: left;
+}
+

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


@@ -902,29 +662,14 @@ tr.turn:hover {
   }
 
   .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 +683,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;


@@ -1001,15 +737,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-#content.maximised {
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 0;
-  z-index: 2000;
-}
-

 /* Rules for small maps in content areas */
 
 .content_map {
 /* Rules for small maps in content areas */
 
 .content_map {


@@ -1026,7 +753,7 @@ 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;
 }
 
   min-height: 50px;
 }
 


@@ -1041,66 +768,18 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* 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;

   }
 }
 
   }
 }
 


@@ -1123,118 +802,28 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the oauth authorization page */
-
-.oauth-authorize ul {
-  list-style: none;
-}
-

 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {

-  button[type="submit"] {
-    margin: auto;
-    white-space: nowrap;
-  }
-

   .inbox-row {
     background: $offwhite;
   }
 
   .inbox-row {
     background: $offwhite;
   }
 

-  .inbox-row-unread {
+  .inbox-row-unread td {

     background: #CBEEA7;
   }
     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 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 {
 }
 
 .search_form {

-  background-color: $lightgrey;
+  #query {
+    z-index: 0;
+  }

 
   .describe_location {
 
   .describe_location {

-    top: 6px;
-    right: 6px;

     font-size: 10px;
     font-size: 10px;

-    color: $blue;

   }
 }
 
   }
 }
 

-.directions_form {
-  background-color: $lightgrey;
-}
-

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


@@ -1248,21 +837,13 @@ 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 */
 
 }
 
 /* General styles for action lists / subnavs */
 

-

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


@@ -1277,9 +858,9 @@ nav.secondary-actions {
       flex-basis: auto;
       list-style: none;
       border-left: 1px solid $grey;
       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;

     }
   }
 }
     }
   }
 }


@@ -1289,35 +870,17 @@ div.secondary-actions {
   text-align: center;
 }
 
   text-align: center;
 }
 

-/* 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 */
 
 .richtext,
 .prose {
   code {
 /* Rules for rich text */
 
 .richtext,
 .prose {
   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;
 


@@ -1328,35 +891,20 @@ 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 {
 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {
   .sprite {


@@ -1371,7 +919,7 @@ dl.dl-inline {
   }
 
   .sprite.x {
   }
 
   .sprite.x {

-    /* no-r2 */ background-position: -50px 0;
+    /*rtl:ignore*/ background-position: -50px 0;

   }
 
   .sprite.term {
   }
 
   .sprite.term {


@@ -1380,27 +928,27 @@ dl.dl-inline {
   }
 
   .sprite.node {
   }
 
   .sprite.node {

-    /* no-r2 */ background-position: -100px 0;
+    /*rtl:ignore*/ background-position: -100px 0;

   }
 
   .sprite.way {
   }
 
   .sprite.way {

-    /* no-r2 */ background-position: -150px 0;
+    /*rtl:ignore*/ background-position: -150px 0;

   }
 
   .sprite.tag {
   }
 
   .sprite.tag {

-    /* no-r2 */ background-position: -200px 0;
+    /*rtl:ignore*/ background-position: -200px 0;

   }
 
   .sprite.editor {
   }
 
   .sprite.editor {

-    /* no-r2 */ background-position: -250px 0;
+    /*rtl:ignore*/ background-position: -250px 0;

   }
 
   .sprite.question {
   }
 
   .sprite.question {

-    /* no-r2 */ background-position: -300px 0;
+    /*rtl:ignore*/ background-position: -300px 0;

   }
 
   .sprite.rules {
   }
 
   .sprite.rules {

-    /* no-r2 */ background-position: -350px 0;
+    /*rtl:ignore*/ background-position: -350px 0;

   }
 
   .icon.note {
   }
 
   .icon.note {


@@ -1410,8 +958,6 @@ dl.dl-inline {
 }
 
 .site-about #content {
 }
 
 .site-about #content {

-  background-color: $lightgrey;
-

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


@@ -1451,30 +997,51 @@ dl.dl-inline {
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
     &.local {
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
     &.local {

-      /* no-r2 */
+      /*rtl:ignore*/

       background-position: 0px 0px;
     }
     &.community {
       background-position: 0px 0px;
     }
     &.community {

-      /* no-r2 */
+      /*rtl:ignore*/

       background-position: 0px -40px;
     }
     &.open {
       background-position: 0px -40px;
     }
     &.open {

-      /* no-r2 */
+      /*rtl:ignore*/

       background-position: 0px -80px;
     }
     &.partners {
       background-position: 0px -80px;
     }
     &.partners {

-      /* no-r2 */
+      /*rtl:ignore*/

       background-position: 0px -120px;
     }
     &.infringement {
       background-position: 0px -120px;
     }
     &.infringement {

-      /* no-r2 */
+      /*rtl:ignore*/

       background-position: 0px -160px;
     }
     &.legal {
       background-position: 0px -160px;
     }
     &.legal {

-      /* no-r2 */
+      /*rtl:ignore*/

       background-position: -45px -160px;
     }
   }
 }
 
       background-position: -45px -160px;
     }
   }
 }
 

+/* 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';
 @import 'browse';