From 63145c8bc6bb26f7651fbd6cfe626068704cdf76 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 10 Mar 2022 12:38:07 -0800 Subject: [PATCH] Fix some instances of lazy Sass math when multiplying new CSS var based border-width --- scss/_list-group.scss | 4 ++-- scss/_nav.scss | 4 ++-- scss/_variables.scss | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scss/_list-group.scss b/scss/_list-group.scss index 2c484ea236..70506c8c6c 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -63,7 +63,7 @@ border-top-width: 0; &.active { - margin-top: -$list-group-border-width; + margin-top: calc($list-group-border-width * -1); // stylelint-disable-line function-disallowed-list border-top-width: $list-group-border-width; } } @@ -125,7 +125,7 @@ border-left-width: 0; &.active { - margin-left: -$list-group-border-width; + margin-left: calc($list-group-border-width * -1); // stylelint-disable-line function-disallowed-list border-left-width: $list-group-border-width; } } diff --git a/scss/_nav.scss b/scss/_nav.scss index 8660a4dbc9..62a2fa6828 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -42,7 +42,7 @@ border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color; .nav-link { - margin-bottom: -$nav-tabs-border-width; + margin-bottom: calc($nav-tabs-border-width * -1); // stylelint-disable-line function-disallowed-list background: none; border: $nav-tabs-border-width solid transparent; @include border-top-radius($nav-tabs-border-radius); @@ -70,7 +70,7 @@ .dropdown-menu { // Make dropdown border overlap tab border - margin-top: -$nav-tabs-border-width; + margin-top: calc($nav-tabs-border-width * -1); // stylelint-disable-line function-disallowed-list // Remove the top rounded corners here since there is a hard edge above the menu @include border-top-radius(0); } diff --git a/scss/_variables.scss b/scss/_variables.scss index ad2c959c5e..26707e775e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1187,7 +1187,7 @@ $pagination-color: $link-color !default; $pagination-bg: $white !default; $pagination-border-radius: $border-radius !default; $pagination-border-width: var(--#{$variable-prefix}border-width) !default; -$pagination-margin-start: -$pagination-border-width !default; +$pagination-margin-start: calc($pagination-border-width * -1) !default; // stylelint-disable-line function-disallowed-list $pagination-border-color: $gray-300 !default; $pagination-focus-color: $link-hover-color !default;