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

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 73f8521d7fbc3f2a816deaa75661c81783df846d..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 {
@@ -131,7 +141,7 @@ header {
 }
 
 nav.primary {
-  & > .btn-group .btn-outline-primary {
+  #edit_tab .btn-outline-primary {
     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
@@ -209,9 +219,7 @@ body.small-nav {
     }
   }
 
-  #sidebar .search_forms,
-  #edit_tab,
-  #export_tab {
+  #sidebar .search_forms {
     display: none;
   }
 
@@ -219,7 +227,7 @@ body.small-nav {
     margin-right: 0;
     padding: 0;
 
-    .btn-group {
+    #edit_tab {
       width: 100%;
       padding: 10px;
     }
@@ -504,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;
   }
 }