Skip to content

Commit c536836

Browse files
feral-grimalkinlouismaximepitonjulien-deramond
authored
CSS: consistent approach for calc with negative values (#41004)
Co-authored-by: Louis-Maxime Piton <[email protected]> Co-authored-by: Julien Déramond <[email protected]>
1 parent b3d2e7b commit c536836

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

scss/_button-group.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
// Prevent double borders when buttons are next to each other
4040
> :not(.btn-check:first-child) + .btn,
4141
> .btn-group:not(:first-child) {
42-
margin-left: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
42+
margin-left: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
4343
}
4444

4545
// Reset rounded corners
@@ -126,7 +126,7 @@
126126

127127
> .btn:not(:first-child),
128128
> .btn-group:not(:first-child) {
129-
margin-top: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
129+
margin-top: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
130130
}
131131

132132
// Reset rounded corners

scss/_pagination.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
margin-left: $pagination-margin-start;
7676
}
7777

78-
@if $pagination-margin-start == calc(#{$pagination-border-width} * -1) {
78+
@if $pagination-margin-start == calc(-1 * #{$pagination-border-width}) {
7979
&:first-child {
8080
.page-link {
8181
@include border-start-radius(var(--#{$prefix}pagination-border-radius));

scss/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1302,7 +1302,7 @@ $pagination-color: var(--#{$prefix}link-color) !default;
13021302
$pagination-bg: var(--#{$prefix}body-bg) !default;
13031303
$pagination-border-radius: var(--#{$prefix}border-radius) !default;
13041304
$pagination-border-width: var(--#{$prefix}border-width) !default;
1305-
$pagination-margin-start: calc(#{$pagination-border-width} * -1) !default; // stylelint-disable-line function-disallowed-list
1305+
$pagination-margin-start: calc(-1 * #{$pagination-border-width}) !default; // stylelint-disable-line function-disallowed-list
13061306
$pagination-border-color: var(--#{$prefix}border-color) !default;
13071307

13081308
$pagination-focus-color: var(--#{$prefix}link-hover-color) !default;

scss/forms/_input-group.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
}
122122

123123
> :not(:first-child):not(.dropdown-menu)#{$validation-messages} {
124-
margin-left: calc(#{$input-border-width} * -1); // stylelint-disable-line function-disallowed-list
124+
margin-left: calc(-1 * #{$input-border-width}); // stylelint-disable-line function-disallowed-list
125125
@include border-start-radius(0);
126126
}
127127

site/assets/scss/_component-examples.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@
9393
.fixed-top,
9494
.sticky-top {
9595
position: static;
96-
margin: calc(var(--bd-example-padding) * -1) calc(var(--bd-example-padding) * -1) var(--bd-example-padding); // stylelint-disable-line function-disallowed-list
96+
margin: calc(-1 * var(--bd-example-padding)) calc(-1 * var(--bd-example-padding)) var(--bd-example-padding); // stylelint-disable-line function-disallowed-list
9797
}
9898

9999
.fixed-bottom,
100100
.sticky-bottom {
101101
position: static;
102-
margin: var(--bd-example-padding) calc(var(--bd-example-padding) * -1) calc(var(--bd-example-padding) * -1); // stylelint-disable-line function-disallowed-list
102+
margin: var(--bd-example-padding) calc(-1 * var(--bd-example-padding)) calc(-1 * var(--bd-example-padding)); // stylelint-disable-line function-disallowed-list
103103

104104
}
105105

0 commit comments

Comments
 (0)