Force left auto margin to be applied for modal and offcanvas header close buttons

diff --git a/scss/_modal.scss b/scss/_modal.scss
index 494db94e7eb9b1e80fd0489f81dc382ea25cdffa..ce5da482c32c332d697a0caf5b7d5f1d28a2f270 100644 (file)
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -132,7 +132,12 @@
 
   .btn-close {
     padding: calc(var(--#{$prefix}modal-header-padding-y) * .5) calc(var(--#{$prefix}modal-header-padding-x) * .5);
-    margin: calc(-.5 * var(--#{$prefix}modal-header-padding-y)) calc(-.5 * var(--#{$prefix}modal-header-padding-x)) calc(-.5 * var(--#{$prefix}modal-header-padding-y)) auto;
+
+    // An equivalent `margin` shorthand is not used to ensure that the `auto` left margin is applied correctly
+    margin-top: calc(-.5 * var(--#{$prefix}modal-header-padding-y));
+    margin-right: calc(-.5 * var(--#{$prefix}modal-header-padding-x));
+    margin-bottom: calc(-.5 * var(--#{$prefix}modal-header-padding-y));
+    margin-left: auto;
   }
 }
 

diff --git a/scss/_offcanvas.scss b/scss/_offcanvas.scss
index eb2c97ab77a3b89c14f4e654d8b389c275960ea9..1769f73d86531b201313c4c0e051dcbcdf887c13 100644 (file)
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -127,7 +127,12 @@
 
   .btn-close {
     padding: calc(var(--#{$prefix}offcanvas-padding-y) * .5) calc(var(--#{$prefix}offcanvas-padding-x) * .5);
-    margin: calc(-.5 * var(--#{$prefix}offcanvas-padding-y)) calc(-.5 * var(--#{$prefix}offcanvas-padding-x)) calc(-.5 * var(--#{$prefix}offcanvas-padding-y)) auto;
+
+    // An equivalent `margin` shorthand is not used to ensure that the `auto` left margin is applied correctly
+    margin-top: calc(-.5 * var(--#{$prefix}offcanvas-padding-y));
+    margin-right: calc(-.5 * var(--#{$prefix}offcanvas-padding-x));
+    margin-bottom: calc(-.5 * var(--#{$prefix}offcanvas-padding-y));
+    margin-left: auto;
   }
 }