X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/71cb2c50fcaf29e2b933fc981e40a00223d94d34..b91476cf0451d6289b1eda32381f543b7a2c9b6b:/app/assets/stylesheets/common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 35c5ba845..404933997 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -66,12 +66,6 @@ time[title] {
   color: $blue;
 }
 
-/* Rules for borders */
-/* These add additional colours to those provided by bootstrap */
-.border-grey {
-  border-color: $grey !important;
-}
-
 /* Rules for the header */
 
 #menu-icon {
@@ -87,10 +81,15 @@ time[title] {
   opacity: 0.6;
 }
 
+@include color-mode(dark) {
+  #menu-icon {
+    filter: invert(1);
+  }
+}
+
 header {
   height: $headerHeight;
   position: relative;
-  z-index: 1001;
   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {
@@ -156,11 +155,6 @@ nav.primary {
 nav.secondary {
   .nav-link {
     padding: 0.2rem;
-    color: $darkgrey;
-  }
-
-  > ul li.current a {
-    color: darken($darkgrey, 25%);
   }
 
   #inboxanchor {
@@ -199,7 +193,6 @@ body.small-nav {
     flex-direction: column;
     height: auto;
     min-height: $headerHeight;
-    background: #fff;
 
     &.closed nav {
       display: none;
@@ -327,7 +320,6 @@ body.small-nav {
   #sidebar {
     float: left;
     width: $sidebarWidth;
-    background: #fff;
 
     #sidebar_loader {
       display: none;
@@ -336,7 +328,6 @@ body.small-nav {
 
   .overlay-sidebar #sidebar {
     position: absolute;
-    z-index: 1000;
     height: auto;
     overflow: hidden;
 
@@ -389,13 +380,7 @@ body.small-nav {
     float: right;
     width: 250px;
     height: 100%;
-    background: white;
     overflow: auto;
-
-    .section {
-      border-bottom: 1px solid $grey;
-      padding: $spacer;
-    }
   }
 }
 
@@ -409,7 +394,6 @@ body.small-nav {
     }
 
     #map-ui {
-      z-index: 9999;
       width: 100%;
       height: 50%;
       overflow-y: scroll;
@@ -431,43 +415,14 @@ body.small-nav {
 }
 
 .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);
     }
   }
 
@@ -582,6 +537,12 @@ div.direction {
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
+@include color-mode(dark) {
+  div.direction {
+    filter: invert(1);
+  }
+}
+
 td.distance {
     font-size: x-small;
 }
@@ -684,32 +645,22 @@ tr.turn:hover {
 /* Rules for export sidebar */
 
 .export_form {
-  .export_area_inputs,
-  .export_button {
-    text-align: center;
-  }
-
   .export_area_inputs {
-    margin-bottom: $spacer;
     input[type="text"] {
       width: 100px;
-      text-align: center;
     }
   }
 
   .export_boxy {
-    background: $lightgrey;
-
-    #maxlat { margin-top: -1px; }
+    > * {
+        margin: -1px;
+    }
     #minlon {
-      float: left;
-      /*rtl:ignore*/ margin-left: -1px;
+      /*rtl:ignore*/ float: left;
     }
     #maxlon {
-      float: right;
-      /*rtl:ignore*/ margin-right: -1px;
+      /*rtl:ignore*/ float: right;
     }
-    #minlat { margin-bottom: -1px; }
   }
 }
 
@@ -726,10 +677,6 @@ tr.turn:hover {
 
 /* Rules for non-map content pages */
 
-.content-heading {
-  background: $lightgrey;
-}
-
 .content-inner {
   position: relative;
   max-width: 960px;
@@ -858,21 +805,11 @@ tr.turn:hover {
 }
 
 .search_form {
-  background-color: $lightgrey;
-
-  #query {
-    z-index: 0;
-  }
-
   .describe_location {
     font-size: 10px;
   }
 }
 
-.directions_form {
-  background-color: $lightgrey;
-}
-
 /* Rules for user images */
 
 img.user_image {
@@ -924,12 +861,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;
 
@@ -940,17 +877,17 @@ div.secondary-actions {
 
   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);
   }
 }
 
@@ -1007,8 +944,6 @@ div.secondary-actions {
 }
 
 .site-about #content {
-  background-color: $lightgrey;
-
   .content-inner {
     max-width: 760px;
   }
@@ -1074,4 +1009,25 @@ div.secondary-actions {
   }
 }
 
+/* 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';