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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 18eab1316222ec54a180fb38c839c32e1fa511eb..aa8b9d65b64c62931c2a372fd91c0ab06d11851c 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,12 @@ body {
   font-size: $typeheight;
 }
 
   font-size: $typeheight;
 }
 

-p > img {
-  width: auto;
-  max-width: 100%;
-}
-
-small, aside {
-  font-size: 12px;
-}
-

 time[title] {
   text-decoration: underline dotted;
 }
 
 #container { position: relative; }
 
 time[title] {
   text-decoration: underline dotted;
 }
 
 #container { position: relative; }
 

-.small_icon {
-  vertical-align: middle;
-  margin-right: $lineheight * 0.25;
-}
-

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


@@ -66,14 +54,22 @@ time[title] {
   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 */

 
 

-.border-lightgrey {
-  border-color: $lightgrey !important;
+@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;
+  }

 }
 
 /* Rules for the header */
 }
 
 /* Rules for the header */


@@ -83,7 +79,7 @@ time[title] {
   position: absolute;
   top: 0;
   right: 0;
   position: absolute;
   top: 0;
   right: 0;

-  background: image-url("menu-icon.png") no-repeat;
+  background: image-url("menu-icon.svg") no-repeat;

   background-size: 30px 30px;
   width: 30px;
   height: 30px;
   background-size: 30px 30px;
   width: 30px;
   height: 30px;


@@ -91,10 +87,15 @@ 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;

-  z-index: 1001;

   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {
   font-size: 14px;
 
   h1, nav, nav > ul, nav > ul > li {


@@ -160,15 +161,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 {
-    background-color: lighten($grey, 10%);

   }
 }
 
   }
 }
 


@@ -203,7 +195,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;


@@ -256,7 +247,7 @@ body.small-nav {
 /* Utility for styling notification numbers */
 
 .count-number {
 /* Utility for styling notification numbers */
 
 .count-number {

-  background: lighten($green, 30%);
+  background: transparentize(lighten($green, 25%), .25);

   color: $gray-800;
   font-weight: $font-weight-normal;
 }
   color: $gray-800;
   font-weight: $font-weight-normal;
 }


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

-    background: #fff;

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


@@ -340,7 +330,6 @@ body.small-nav {
 
   .overlay-sidebar #sidebar {
     position: absolute;
 
   .overlay-sidebar #sidebar {
     position: absolute;

-    z-index: 1000;

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


@@ -393,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: $spacer;
-    }

   }
 }
 
   }
 }
 


@@ -413,7 +396,6 @@ body.small-nav {
     }
 
     #map-ui {
     }
 
     #map-ui {

-      z-index: 9999;

       width: 100%;
       height: 50%;
       overflow-y: scroll;
       width: 100%;
       height: 50%;
       overflow-y: scroll;


@@ -435,43 +417,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;
+  .base-layers > * {
+    height: 56px;

 
 

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

     }
   }
 
     }
   }
 


@@ -504,8 +457,42 @@ body.small-nav {
   border-top: 0px !important;
 }
 
   border-top: 0px !important;
 }
 

+.leaflet-popup-content-wrapper, .leaflet-popup-tip,
+.leaflet-contextmenu, .leaflet-contextmenu-item,
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-body, .text-body;
+}
+
+.leaflet-control-attribution, .leaflet-control-scale-line {
+  @extend .bg-opacity-75;
+  text-shadow: none !important;
+}
+
+.leaflet-contextmenu-item.over {
+  @extend .bg-body-secondary, .border-secondary, .border-opacity-10;
+}
+

 .leaflet-popup-content-wrapper {
 .leaflet-popup-content-wrapper {

-  border-radius: 4px !important;
+  @extend .rounded-1;
+
+  a {
+    color: var(--bs-link-color) !important;
+  }
+}
+
+@include color-mode(dark) {
+  .leaflet-tile-container,
+  .mapkey-table-entry td:first-child > * {
+    filter: brightness(.8);
+  }
+
+  .leaflet-control-attribution a {
+    color: var(--bs-link-color);
+  }
+
+  .leaflet-control-scale-line {
+    @extend .border-light, .border-opacity-75;
+  }

 }
 
 /* Rules for attribution text under the main map shown on printouts */
 }
 
 /* Rules for attribution text under the main map shown on printouts */


@@ -562,13 +549,15 @@ header .search_forms,
   display: none;
 }
 
   display: none;
 }
 

+.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.selected {
-    background: $list-highlight;
-  }
-

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


@@ -577,7 +566,7 @@ header .search_forms,
 /* 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;


@@ -586,15 +575,18 @@ 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;
 }
 tr.turn {
     cursor: pointer;
 }
 td.distance {
     font-size: x-small;
 }
 tr.turn {
     cursor: pointer;
 }

-tr.turn:hover {
-    background: $list-highlight;
-}

 
 .routing_marker { width: 15px; cursor: move; }
 
 
 .routing_marker { width: 15px; cursor: move; }
 


@@ -606,8 +598,9 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

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

 
     a.stretched-link > span, a:not(.stretched-link), [title] {
       position: relative;
 
     a.stretched-link > span, a:not(.stretched-link), [title] {
       position: relative;


@@ -641,6 +634,8 @@ tr.turn:hover {
   .browse-tag-list {
     table-layout: fixed;
     white-space: pre-wrap;
   .browse-tag-list {
     table-layout: fixed;
     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;


@@ -654,18 +649,6 @@ tr.turn:hover {
 
   .query-results {
     display: none;
 
   .query-results {
     display: none;

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

   }
 }
 
   }
 }
 


@@ -688,32 +671,22 @@ tr.turn:hover {
 /* 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;
-      /*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; }

   }
 }
 
   }
 }
 


@@ -730,10 +703,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;


@@ -754,6 +723,7 @@ tr.turn:hover {
 
   &.new-user-main {
     background-image: image-url("sign-up-illustration.png");
 
   &.new-user-main {
     background-image: image-url("sign-up-illustration.png");

+    background-position-x: 50px;

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


@@ -763,17 +733,6 @@ tr.turn:hover {
   &.new-user-terms {
     background-image: image-url("terms-illustration.png");
   }
   &.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;
-  }

 }
 
 [dir=rtl] .header-illustration {
 }
 
 [dir=rtl] .header-illustration {


@@ -782,6 +741,10 @@ tr.turn:hover {
   h1 {
     transform: scaleX(-1);
   }
   h1 {
     transform: scaleX(-1);
   }

+
+  ul {
+    transform: scaleX(-1);
+  }

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


@@ -807,7 +770,6 @@ tr.turn:hover {
 /* Rules for user popups on maps */
 
 .user_popup {
 /* Rules for user popups on maps */
 
 .user_popup {

-  min-width: 200px;

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


@@ -822,14 +784,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;

   }
 }
 
   }
 }
 


@@ -852,34 +811,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for messages pages */
-
-.messages {
-  .inbox-row {
-    background: $offwhite;
-  }
-
-  .inbox-row-unread td {
-    background: #CBEEA7;
-  }
-}
-
-.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 {
 /* Rules for user images */
 
 img.user_image {


@@ -928,15 +859,14 @@ div.secondary-actions {
 
 /* 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;
 


@@ -947,42 +877,34 @@ 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);

   }
 }
 
   }
 }
 

-/* Rules for the "Welcome" page */
+/* Rules for the "Welcome" and "Fix the map" pages */
+

 .site-welcome, .site-fixthemap {
   .sprite {
 .site-welcome, .site-fixthemap {
   .sprite {

-    background-image: image-url("welcome-sprite.png");
-    background-size: 500px 250px;
-    display: block;
-  }
-
-  .sprite.small {

     width: 50px;
     height: 50px;
     width: 50px;
     height: 50px;

+    background-image: image-url("welcome-sprite.svg");
+    background-size: 500px 250px;

   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 
   }
 
   .sprite.x {
     /*rtl:ignore*/ background-position: -50px 0;
   }
 

-  .sprite.term {
-    margin-right: 10px;
-    vertical-align: middle;
-  }
-

   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }
   .sprite.node {
     /*rtl:ignore*/ background-position: -100px 0;
   }


@@ -1006,16 +928,11 @@ div.secondary-actions {
   .sprite.rules {
     /*rtl:ignore*/ background-position: -350px 0;
   }
   .sprite.rules {
     /*rtl:ignore*/ background-position: -350px 0;
   }

-
-  .icon.note {
-    background-color: #333;
-    border-radius: 4px;
-  }

 }
 
 }
 

-.site-about #content {
-  background-color: $lightgrey;
+/* Rules for the "About" page */

 
 

+.site-about #content {

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


@@ -1081,4 +998,57 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-@import 'browse';
+.auth-container {
+  max-width: 600px;
+}
+
+/* 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;
+  }
+}
+
+/* Rules for map sidebar icons */
+
+.browse-section {
+  .node::before,
+  .way::before,
+  .relation::before {
+    display: inline-block;
+    width: 25px;
+    margin-left: -25px;
+  }
+
+  .node, .way, .relation {
+    margin-left: 25px;
+  }
+}
+
+@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);
+      }
+    }
+  }
+}