Fix display issues of close button in contextual light and dark modes (#41126)

diff --git a/scss/_close.scss b/scss/_close.scss
index 4d6e73c13931f3cbfd856249b4d3150547ae9bce..d53c96fbff661939cf53822c76c320da6e5e3fe1 100644 (file)
--- a/scss/_close.scss
+++ b/scss/_close.scss
@@ -12,7 +12,6 @@
   --#{$prefix}btn-close-focus-shadow: #{$btn-close-focus-shadow};
   --#{$prefix}btn-close-focus-opacity: #{$btn-close-focus-opacity};
   --#{$prefix}btn-close-disabled-opacity: #{$btn-close-disabled-opacity};
-  --#{$prefix}btn-close-white-filter: #{$btn-close-white-filter};
   // scss-docs-end close-css-vars
 
   box-sizing: content-box;
@@ -21,6 +20,7 @@
   padding: $btn-close-padding-y $btn-close-padding-x;
   color: var(--#{$prefix}btn-close-color);
   background: transparent var(--#{$prefix}btn-close-bg) center / $btn-close-width auto no-repeat; // include transparent for button elements
+  filter: var(--#{$prefix}btn-close-filter);
   border: 0; // for button elements
   @include border-radius();
   opacity: var(--#{$prefix}btn-close-opacity);
@@ -47,17 +47,20 @@
 }
 
 @mixin btn-close-white() {
-  filter: var(--#{$prefix}btn-close-white-filter);
+  --#{$prefix}btn-close-filter: #{$btn-close-filter-dark};
 }
 
 .btn-close-white {
   @include btn-close-white();
 }
 
+:root,
+[data-bs-theme="light"] {
+  --#{$prefix}btn-close-filter: #{$btn-close-filter};
+}
+
 @if $enable-dark-mode {
-  @include color-mode(dark) {
-    .btn-close {
-      @include btn-close-white();
-    }
+  @include color-mode(dark, true) {
+    @include btn-close-white();
   }
 }

diff --git a/scss/_variables-dark.scss b/scss/_variables-dark.scss
index f9bb99d9682bb50bd9c1088f1e21ebee2775cece..260f6dcc1d6e6b4223efb06cd4186350865a26cc 100644 (file)
--- a/scss/_variables-dark.scss
+++ b/scss/_variables-dark.scss
@@ -94,3 +94,9 @@ $accordion-button-active-icon-dark:  url("data:image/svg+xml,<svg xmlns='http://
 $carousel-indicator-active-bg-dark:   $carousel-dark-indicator-active-bg !default;
 $carousel-caption-color-dark:         $carousel-dark-caption-color !default;
 $carousel-control-icon-filter-dark:   $carousel-dark-control-icon-filter !default;
+
+//
+// Close button
+//
+
+$btn-close-filter-dark:             $btn-close-white-filter !default;

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2d2aae2ff7c0c12ba619dcc60fb4a91934259c4f..a55411a53ac7abe384b07af993db7c8422abdbd9 100644 (file)
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -1713,7 +1713,8 @@ $btn-close-opacity:          .5 !default;
 $btn-close-hover-opacity:    .75 !default;
 $btn-close-focus-opacity:    1 !default;
 $btn-close-disabled-opacity: .25 !default;
-$btn-close-white-filter:     invert(1) grayscale(100%) brightness(200%) !default;
+$btn-close-filter:           null !default;
+$btn-close-white-filter:     invert(1) grayscale(100%) brightness(200%) !default; // Deprecated in v5.3.4
 // scss-docs-end close-variables