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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index f0746117d7b53dcd29010e509c1d2225b363835c..a1cae7a36825663c69e829b07ce49c6d887c3f07 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -66,16 +66,6 @@ time[title] {
   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 {
 /* Rules for the header */
 
 #menu-icon {


@@ -91,6 +81,12 @@ time[title] {
   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;


@@ -160,11 +156,6 @@ nav.primary {
 nav.secondary {
   .nav-link {
     padding: 0.2rem;
 nav.secondary {
   .nav-link {
     padding: 0.2rem;

-    color: $darkgrey;
-  }
-
-  > ul li.current a {
-    color: darken($darkgrey, 25%);

   }
 
   #inboxanchor {
   }
 
   #inboxanchor {


@@ -203,7 +194,6 @@ body.small-nav {
     flex-direction: column;
     height: auto;
     min-height: $headerHeight;
     flex-direction: column;
     height: auto;
     min-height: $headerHeight;

-    background: #fff;

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


@@ -331,7 +321,6 @@ body.small-nav {
   #sidebar {
     float: left;
     width: $sidebarWidth;
   #sidebar {
     float: left;
     width: $sidebarWidth;

-    background: #fff;

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


@@ -393,7 +382,6 @@ body.small-nav {
     float: right;
     width: 250px;
     height: 100%;
     float: right;
     width: 250px;
     height: 100%;

-    background: white;

     overflow: auto;
 
     .section {
     overflow: auto;
 
     .section {


@@ -435,43 +423,14 @@ body.small-nav {
 }
 
 .layers-ui {
 }
 
 .layers-ui {

-  .base-layers {
-    .leaflet-container {
-      width: 100%;
-      height: 50px;
-      cursor: pointer;
-    }
-
-    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;
-        }
-      }
+  .base-layers > * {
+    height: 56px;

 
 

-      &.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);

     }
   }
 
     }
   }
 


@@ -586,6 +545,12 @@ div.direction {
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
 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;
 }
 td.distance {
     font-size: x-small;
 }


@@ -647,11 +612,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  span.action-button:hover {
-    cursor: pointer;
-    text-decoration: underline;
-  }
-

   .note-description {
     overflow: hidden;
     margin: 0 0 10px 10px;
   .note-description {
     overflow: hidden;
     margin: 0 0 10px 10px;


@@ -707,18 +667,15 @@ tr.turn:hover {
   }
 
   .export_boxy {
   }
 
   .export_boxy {

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

     #minlon {
     #minlon {

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

     }
     #maxlon {
     }
     #maxlon {

-      float: right;
-      /*rtl:ignore*/ margin-right: -1px;
+      /*rtl:ignore*/ float: right;

     }
     }

-    #minlat { margin-bottom: -1px; }

   }
 }
 
   }
 }
 


@@ -735,10 +692,6 @@ tr.turn:hover {
 
 /* 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;


@@ -827,14 +780,11 @@ tr.turn:hover {
     height: 400px;
     display: none;
   }
     height: 400px;
     display: none;
   }

-  .comments {
-    max-width: 740px;
+  .diary-comment .col-auto {
+    width: 62px;

   }
   }

-  .diary-comment {
-    border-top: 1px dashed $grey;
-    &:first-child {
-      border-top: 1px solid $grey;
-    }
+  .diary-comment .col {
+    max-width: 690px;

   }
 }
 
   }
 }
 


@@ -870,8 +820,6 @@ tr.turn:hover {
 }
 
 .search_form {
 }
 
 .search_form {

-  background-color: $lightgrey;
-

   #query {
     z-index: 0;
   }
   #query {
     z-index: 0;
   }


@@ -881,10 +829,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

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

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


@@ -936,12 +880,12 @@ div.secondary-actions {
 .richtext,
 .prose {
   code {
 .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;
 


@@ -952,17 +896,17 @@ div.secondary-actions {
 
   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;
+    color: var(--bs-secondary-color);

   }
 }
 
   }
 }
 


@@ -1019,8 +963,6 @@ div.secondary-actions {
 }
 
 .site-about #content {
 }
 
 .site-about #content {

-  background-color: $lightgrey;
-

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


@@ -1086,4 +1028,12 @@ 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;
+}
+

 @import 'browse';
 @import 'browse';