From: Mark Otto <markdotto@gmail.com>
Date: Thu, 3 Apr 2025 05:32:44 +0000 (-0700)
Subject: Split CSS properties here to avoid a bug where 0-ing the padding values causes invali... 
X-Git-Tag: v5.3.4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f6085a3a08f8d36cca20f9be0c825d7a53352ec;p=thirdparty%2Fbootstrap.git

Split CSS properties here to avoid a bug where 0-ing the padding values causes invalid calc() functions

Fixes #39798, fixes #39370, closes #39873, undoes changes in #39373
---

diff --git a/scss/_modal.scss b/scss/_modal.scss
index ee58032ee8..a3492c1723 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -132,7 +132,11 @@
 
   .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;
+    // Split properties to avoid invalid calc() function if value is 0
+    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 eb2c97ab77..b40b2cd9b7 100644
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -127,7 +127,11 @@
 
   .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;
+    // Split properties to avoid invalid calc() function if value is 0
+    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;
   }
 }