mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 21:40:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix some instances of lazy Sass math when multiplying new CSS var based border-width

Browse Source
This commit is contained in:
Mark Otto 2022-03-10 12:38:07 -08:00 committed by Mark Otto
parent 05c6e7dd66
commit 63145c8bc6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_list-group.scss
View File

@ -63,7 +63,7 @@
border-top-width: 0; border-top-width: 0;
&.active { &.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; border-top-width: $list-group-border-width;
} }
} }
@ -125,7 +125,7 @@
border-left-width: 0; border-left-width: 0;
&.active { &.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; border-left-width: $list-group-border-width;
} }
} }

4
scss/_nav.scss
View File

@ -42,7 +42,7 @@
border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color; border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color;
.nav-link { .nav-link {
margin-bottom: -$nav-tabs-border-width; margin-bottom: calc($nav-tabs-border-width * -1); // stylelint-disable-line function-disallowed-list
background: none; background: none;
border: $nav-tabs-border-width solid transparent; border: $nav-tabs-border-width solid transparent;
@include border-top-radius($nav-tabs-border-radius); @include border-top-radius($nav-tabs-border-radius);
@ -70,7 +70,7 @@
.dropdown-menu { .dropdown-menu {
// Make dropdown border overlap tab border // 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 // Remove the top rounded corners here since there is a hard edge above the menu
@include border-top-radius(0); @include border-top-radius(0);
} }

2
scss/_variables.scss
View File

@ -1187,7 +1187,7 @@ $pagination-color: $link-color !default;
$pagination-bg: $white !default; $pagination-bg: $white !default;
$pagination-border-radius: $border-radius !default; $pagination-border-radius: $border-radius !default;
$pagination-border-width: var(--#{$variable-prefix}border-width) !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-border-color: $gray-300 !default;
$pagination-focus-color: $link-hover-color !default; $pagination-focus-color: $link-hover-color !default;