From 86900e69372d8d182367665e3e0b10dcb28a3427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Sat, 6 Apr 2024 09:07:19 +0200 Subject: [PATCH] Force left auto margin to be applied for modal and offcanvas header close buttons --- scss/_modal.scss | 7 ++++++- scss/_offcanvas.scss | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scss/_modal.scss b/scss/_modal.scss index 494db94e7eb9..ce5da482c32c 100644 --- 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 eb2c97ab77a3..1769f73d8653 100644 --- 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; } }