Merge pull request #5362 from AntonKhorev/color-mode-preference-map

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 73f8521d7fbc3f2a816deaa75661c81783df846d..cabdfff493bac420e9daa5b1fe0b3cc3bc6570b9 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,6 +1,5 @@
 @use "sass:map";
 @import "parameters";
 @use "sass:map";
 @import "parameters";

-@import "browse";

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


@@ -82,6 +81,16 @@ time[title] {
   100% { opacity: 1 }
 }
 
   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);
+}
+
+[data-bs-theme="light"] .btn-close {
+  filter: none;
+}
+

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


@@ -131,7 +140,7 @@ header {
 }
 
 nav.primary {
 }
 
 nav.primary {

-  & > .btn-group .btn-outline-primary {
+  #edit_tab .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);
   }
 


@@ -207,11 +216,13 @@ body.small-nav {
     .search_forms {
       display: block;
     }
     .search_forms {
       display: block;
     }

+
+    .username {
+      max-width: unset;
+    }

   }
 
   }
 

-  #sidebar .search_forms,
-  #edit_tab,
-  #export_tab {
+  #sidebar .search_forms {

     display: none;
   }
 
     display: none;
   }
 


@@ -219,7 +230,7 @@ body.small-nav {
     margin-right: 0;
     padding: 0;
 
     margin-right: 0;
     padding: 0;
 

-    .btn-group {
+    #edit_tab {

       width: 100%;
       padding: 10px;
     }
       width: 100%;
       padding: 10px;
     }


@@ -494,17 +505,29 @@ body.small-nav {
 }
 
 @include color-mode(dark) {
 }
 
 @include color-mode(dark) {

-  .leaflet-tile-container,
+  .leaflet-container .leaflet-control-attribution a {
+    color: var(--bs-link-color);
+  }
+
+  .leaflet-control-scale-line {
+    border-color: rgba(var(--bs-light-rgb), .75) !important;
+  }
+}
+
+@mixin dark-map-color-scheme {
+  .leaflet-tile-container .leaflet-tile,

   .mapkey-table-entry td:first-child > * {
     filter: brightness(.8);
   }
   .mapkey-table-entry td:first-child > * {
     filter: brightness(.8);
   }

+}

 
 

-  .leaflet-control-attribution a {
-    color: var(--bs-link-color);
-  }
+body[data-map-theme="dark"] {
+  @include dark-map-color-scheme;
+}

 
 

-  .leaflet-control-scale-line {
-    @extend .border-light, .border-opacity-75;
+@include color-mode(dark) {
+  body:not([data-map-theme]) {
+    @include dark-map-color-scheme;

   }
 }
 
   }
 }
 


@@ -924,13 +947,18 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Rules for block pages */
+/* Rules for tables with usernames */

 
 

+.messages-table .username,

 #block_list .username {
   max-width: 20em;
 }
 
 #block_list .username {
   max-width: 20em;
 }
 

-/* Rules for tabs inside secondary background sections */
+/* Rules for navigation tabs */
+
+.nav-tabs .username {
+  max-width: 20em;
+}

 
 .bg-body-secondary .nav-tabs {
   --bs-border-color: var(--bs-secondary-border-subtle);
 
 .bg-body-secondary .nav-tabs {
   --bs-border-color: var(--bs-secondary-border-subtle);


@@ -953,30 +981,20 @@ img.trace_image {
 
 /* Rules for map sidebar icons */
 
 
 /* Rules for map sidebar icons */
 

-.browse-section {
-  .node::before,
-  .way::before,
-  .relation::before {
-    display: inline-block;
-    width: 25px;
-    margin-left: -25px;
-  }
+.browse-section .browse-element-list {
+  line-height: 1.25rem;

 
 

-  .node, .way, .relation {
-    margin-left: 25px;
+  .browse-icon {
+    height: 1.25rem;

   }
   }

-}

 
 

-@each $class, $item in $map-sidebar-icons {
-  .browse-section #{$class}::before {
-    content: image-url('browse/#{map.get($item, "filename")}');
+  .d-flex > .browse-icon {
+    height: max(20px, 1.25rem);

   }
 
   }
 

-  @if map.get($item, "invert") {
-    @include color-mode(dark) {
-      .browse-section #{$class}::before {
-        filter: invert(.8) hue-rotate(180deg);
-      }
+  @include color-mode(dark) {
+    .browse-icon-invertible {
+      filter: invert(.8) hue-rotate(180deg);

     }
   }
 }
     }
   }
 }