Merge pull request #4761 from AntonKhorev:dark-mode-with-close-button

Enable dark theme if user prefers dark color scheme - no javascript version

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c4391be2d1f8084b1ec63573fd8934db2becefd8..c432bd848d3e9cc907210e8443f28c05a8843b0e 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -82,6 +82,16 @@ time[title] {
   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 {
@@ -502,7 +512,7 @@ body.small-nav {
   }
 
   .leaflet-control-scale-line {
-    @extend .border-light, .border-opacity-75;
+    border-color: rgba(var(--bs-light-rgb), .75) !important;
   }
 }
 

diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss
index 07549d69bb33e939238f98e6ef6d1e44eea4a816..28bf569016a607d81b4aa01b994226ca8366845e 100644 (file)
--- a/app/assets/stylesheets/parameters.scss
+++ b/app/assets/stylesheets/parameters.scss
@@ -20,3 +20,4 @@ $table-border-factor: .1;
 $list-group-hover-bg: rgba(var(--bs-emphasis-color-rgb), .075);
 
 $enable-negative-margins: true;
+$color-mode-type: media-query;

diff --git a/app/views/layouts/_banner.html.erb b/app/views/layouts/_banner.html.erb
index 344c5ed711fb316e7e8e647fbe73db888beb3d84..3d2c7f774e1c48c3ab31e85497e7761dd1850be6 100644 (file)
--- a/app/views/layouts/_banner.html.erb
+++ b/app/views/layouts/_banner.html.erb
@@ -1,5 +1,5 @@
 <% unless (banner = next_banner()).nil? %>
-  <%= tag.div :id => "banner", :class => "position-relative", :data => { :bs_theme => token_list(:dark => banner[:dark]) } do %>
+  <%= tag.div :id => "banner", :class => "position-relative", :data => { :bs_theme => (banner[:dark] ? "dark" : "light") } do %>
     <%= link_to (image_tag banner[:img], :srcset => banner[:srcset], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %>
     <button type="button"
             class="btn-close position-absolute top-0 end-0 m-4 opacity-100 bg-white bg-opacity-50"