Skip to content

Commit fce5b11

Browse files
committed
Don't disallow calc()
1 parent 0f77b1c commit fce5b11

15 files changed

Lines changed: 39 additions & 44 deletions

.stylelintrc.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"outline": "none"
1414
},
1515
"function-disallowed-list": [
16-
"calc",
1716
"lighten",
1817
"darken"
1918
],

scss/_accordion.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
&:not(.collapsed) {
5656
color: var(--#{$prefix}accordion-active-color);
5757
background-color: var(--#{$prefix}accordion-active-bg);
58-
box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color); // stylelint-disable-line function-disallowed-list
58+
box-shadow: inset 0 calc(-1 * var(--#{$prefix}accordion-border-width)) 0 var(--#{$prefix}accordion-border-color);
5959

6060
&::after {
6161
background-image: var(--#{$prefix}accordion-btn-active-icon);

scss/_button-group.scss

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

5050
// Reset rounded corners
@@ -131,7 +131,7 @@
131131

132132
> .btn:not(:first-child),
133133
> .btn-group:not(:first-child) {
134-
margin-top: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
134+
margin-top: calc(-1 * #{$btn-border-width});
135135
}
136136

137137
// Reset rounded corners

scss/_card.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
}
8787

8888
.card-subtitle {
89-
margin-top: calc(-.5 * var(--#{$prefix}card-title-spacer-y)); // stylelint-disable-line function-disallowed-list
89+
margin-top: calc(-.5 * var(--#{$prefix}card-title-spacer-y));
9090
margin-bottom: 0;
9191
color: var(--#{$prefix}card-subtitle-color);
9292
}
@@ -138,9 +138,9 @@
138138
//
139139

140140
.card-header-tabs {
141-
margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
142-
margin-bottom: calc(-1 * var(--#{$prefix}card-cap-padding-y)); // stylelint-disable-line function-disallowed-list
143-
margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
141+
margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x));
142+
margin-bottom: calc(-1 * var(--#{$prefix}card-cap-padding-y));
143+
margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x));
144144
border-bottom: 0;
145145

146146
.nav-link.active {
@@ -150,8 +150,8 @@
150150
}
151151

152152
.card-header-pills {
153-
margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
154-
margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x)); // stylelint-disable-line function-disallowed-list
153+
margin-right: calc(-.5 * var(--#{$prefix}card-cap-padding-x));
154+
margin-left: calc(-.5 * var(--#{$prefix}card-cap-padding-x));
155155
}
156156

157157
// Card image

scss/_list-group.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
border-top-width: 0;
9393

9494
&.active {
95-
margin-top: calc(-1 * var(--#{$prefix}list-group-border-width)); // stylelint-disable-line function-disallowed-list
95+
margin-top: calc(-1 * var(--#{$prefix}list-group-border-width));
9696
border-top-width: var(--#{$prefix}list-group-border-width);
9797
}
9898
}
@@ -156,7 +156,7 @@
156156
border-left-width: 0;
157157

158158
&.active {
159-
margin-left: calc(-1 * var(--#{$prefix}list-group-border-width)); // stylelint-disable-line function-disallowed-list
159+
margin-left: calc(-1 * var(--#{$prefix}list-group-border-width));
160160
border-left-width: var(--#{$prefix}list-group-border-width);
161161
}
162162
}

scss/_modal.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
@use "vendor/rfs" as *;
1010
@use "layout/breakpoints" as *;
1111

12-
// stylelint-disable function-disallowed-list
13-
1412
// .modal-open - body class for killing the scroll
1513
// .modal - container to scroll within
1614
// .modal-dialog - positioning shell for the actual modal

scss/_nav.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
border-bottom: var(--#{$prefix}nav-tabs-border-width) solid var(--#{$prefix}nav-tabs-border-color);
7878

7979
.nav-link {
80-
margin-bottom: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list
80+
margin-bottom: calc(-1 * var(--#{$prefix}nav-tabs-border-width));
8181
border: var(--#{$prefix}nav-tabs-border-width) solid transparent;
8282
@include border-top-radius(var(--#{$prefix}nav-tabs-border-radius));
8383

@@ -98,7 +98,7 @@
9898

9999
.dropdown-menu {
100100
// Make dropdown border overlap tab border
101-
margin-top: calc(-1 * var(--#{$prefix}nav-tabs-border-width)); // stylelint-disable-line function-disallowed-list
101+
margin-top: calc(-1 * var(--#{$prefix}nav-tabs-border-width));
102102
// Remove the top rounded corners here since there is a hard edge above the menu
103103
@include border-top-radius(0);
104104
}

scss/_offcanvas.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
@use "mixins/backdrop" as *;
77
@use "layout/breakpoints" as *;
88

9-
// stylelint-disable function-disallowed-list
10-
119
%offcanvas-css-vars {
1210
// scss-docs-start offcanvas-css-vars
1311
--#{$prefix}offcanvas-zindex: #{$zindex-offcanvas};

scss/_popover.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@
6363

6464
.bs-popover-top {
6565
> .popover-arrow {
66-
bottom: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list
66+
bottom: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width));
6767

6868
&::before,
6969
&::after {
70-
border-width: var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0; // stylelint-disable-line function-disallowed-list
70+
border-width: var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0;
7171
}
7272

7373
&::before {
@@ -85,13 +85,13 @@
8585
/* rtl:begin:ignore */
8686
.bs-popover-end {
8787
> .popover-arrow {
88-
left: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list
88+
left: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width));
8989
width: var(--#{$prefix}popover-arrow-height);
9090
height: var(--#{$prefix}popover-arrow-width);
9191

9292
&::before,
9393
&::after {
94-
border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0; // stylelint-disable-line function-disallowed-list
94+
border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height) calc(var(--#{$prefix}popover-arrow-width) * .5) 0;
9595
}
9696

9797
&::before {
@@ -110,11 +110,11 @@
110110

111111
.bs-popover-bottom {
112112
> .popover-arrow {
113-
top: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list
113+
top: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width));
114114

115115
&::before,
116116
&::after {
117-
border-width: 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height); // stylelint-disable-line function-disallowed-list
117+
border-width: 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height);
118118
}
119119

120120
&::before {
@@ -135,7 +135,7 @@
135135
left: 50%;
136136
display: block;
137137
width: var(--#{$prefix}popover-arrow-width);
138-
margin-left: calc(-.5 * var(--#{$prefix}popover-arrow-width)); // stylelint-disable-line function-disallowed-list
138+
margin-left: calc(-.5 * var(--#{$prefix}popover-arrow-width));
139139
content: "";
140140
border-bottom: var(--#{$prefix}popover-border-width) solid var(--#{$prefix}popover-header-bg);
141141
}
@@ -144,13 +144,13 @@
144144
/* rtl:begin:ignore */
145145
.bs-popover-start {
146146
> .popover-arrow {
147-
right: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width)); // stylelint-disable-line function-disallowed-list
147+
right: calc(-1 * (var(--#{$prefix}popover-arrow-height)) - var(--#{$prefix}popover-border-width));
148148
width: var(--#{$prefix}popover-arrow-height);
149149
height: var(--#{$prefix}popover-arrow-width);
150150

151151
&::before,
152152
&::after {
153-
border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height); // stylelint-disable-line function-disallowed-list
153+
border-width: calc(var(--#{$prefix}popover-arrow-width) * .5) 0 calc(var(--#{$prefix}popover-arrow-width) * .5) var(--#{$prefix}popover-arrow-height);
154154
}
155155

156156
&::before {

scss/_toasts.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
@include border-top-radius(calc(var(--#{$prefix}toast-border-radius) - var(--#{$prefix}toast-border-width)));
6868

6969
.btn-close {
70-
margin-right: calc(-.5 * var(--#{$prefix}toast-padding-x)); // stylelint-disable-line function-disallowed-list
70+
margin-right: calc(-.5 * var(--#{$prefix}toast-padding-x));
7171
margin-left: var(--#{$prefix}toast-padding-x);
7272
}
7373
}

0 commit comments

Comments
 (0)