aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Déramond <[email protected]>2023-03-27 17:34:14 +0200
committerGitHub <[email protected]>2023-03-27 17:34:14 +0200
commit92f9dda263e4a80a8b9a60574af20f610b6c6fa8 (patch)
tree3f2d8aed41e8d7b942508ec5342c771b221b6f3c
parentcad38efcaee09c209b13842dbccbdb4a4c933852 (diff)
downloadbootstrap-92f9dda263e4a80a8b9a60574af20f610b6c6fa8.tar.xz
bootstrap-92f9dda263e4a80a8b9a60574af20f610b6c6fa8.zip
Add a check for interpolation variables to node-sass workflow (#38283)
Co-authored-by: XhmikosR <[email protected]>
-rw-r--r--.github/workflows/node-sass.yml12
-rw-r--r--scss/_button-group.scss4
-rw-r--r--scss/_pagination.scss2
-rw-r--r--scss/_tables.scss2
-rw-r--r--scss/_variables.scss8
-rw-r--r--scss/forms/_input-group.scss2
6 files changed, 21 insertions, 9 deletions
diff --git a/.github/workflows/node-sass.yml b/.github/workflows/node-sass.yml
index fb4d4944c..d83e3e70f 100644
--- a/.github/workflows/node-sass.yml
+++ b/.github/workflows/node-sass.yml
@@ -34,3 +34,15 @@ jobs:
npx --package node-sass@latest node-sass --version
npx --package node-sass@latest node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/ -o dist-sass/css/
ls -Al dist-sass/css
+
+ # Check that there are no Sass variables (`$`)
+ - name: Check built CSS files
+ shell: bash
+ run: |
+ if [[ $(find dist-sass/css/ -name "*.css" | xargs grep -F "\$" | wc -l | bc) -eq 0 ]]; then
+ echo "All good, no Sass variables found"
+ exit 0
+ else
+ echo "Found Sass variables!"
+ exit 1
+ fi
diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index eb7969a2d..55ae3f65d 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -39,7 +39,7 @@
// Prevent double borders when buttons are next to each other
> :not(.btn-check:first-child) + .btn,
> .btn-group:not(:first-child) {
- margin-left: calc($btn-border-width * -1); // stylelint-disable-line function-disallowed-list
+ margin-left: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
}
// Reset rounded corners
@@ -126,7 +126,7 @@
> .btn:not(:first-child),
> .btn-group:not(:first-child) {
- margin-top: calc($btn-border-width * -1); // stylelint-disable-line function-disallowed-list
+ margin-top: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
}
// Reset rounded corners
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index ba83d3578..f275a62eb 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -75,7 +75,7 @@
margin-left: $pagination-margin-start;
}
- @if $pagination-margin-start == calc($pagination-border-width * -1) {
+ @if $pagination-margin-start == calc(#{$pagination-border-width} * -1) {
&:first-child {
.page-link {
@include border-start-radius(var(--#{$prefix}pagination-border-radius));
diff --git a/scss/_tables.scss b/scss/_tables.scss
index 6c981f6c2..23de7c31b 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -42,7 +42,7 @@
}
.table-group-divider {
- border-top: calc($table-border-width * 2) solid $table-group-separator-color; // stylelint-disable-line function-disallowed-list
+ border-top: calc(#{$table-border-width} * 2) solid $table-group-separator-color; // stylelint-disable-line function-disallowed-list
}
//
diff --git a/scss/_variables.scss b/scss/_variables.scss
index abd7a7305..eed9a1353 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -914,7 +914,7 @@ $input-focus-box-shadow: $input-btn-focus-box-shadow !default;
$input-placeholder-color: var(--#{$prefix}secondary-color) !default;
$input-plaintext-color: var(--#{$prefix}body-color) !default;
-$input-height-border: calc($input-border-width * 2) !default; // stylelint-disable-line function-disallowed-list
+$input-height-border: calc(#{$input-border-width} * 2) !default; // stylelint-disable-line function-disallowed-list
$input-height-inner: add($input-line-height * 1em, $input-padding-y * 2) !default;
$input-height-inner-half: add($input-line-height * .5em, $input-padding-y) !default;
@@ -1238,7 +1238,7 @@ $dropdown-bg: var(--#{$prefix}body-bg) !default;
$dropdown-border-color: var(--#{$prefix}border-color-translucent) !default;
$dropdown-border-radius: var(--#{$prefix}border-radius) !default;
$dropdown-border-width: var(--#{$prefix}border-width) !default;
-$dropdown-inner-border-radius: calc($dropdown-border-radius - $dropdown-border-width) !default; // stylelint-disable-line function-disallowed-list
+$dropdown-inner-border-radius: calc(#{$dropdown-border-radius} - #{$dropdown-border-width}) !default; // stylelint-disable-line function-disallowed-list
$dropdown-divider-bg: $dropdown-border-color !default;
$dropdown-divider-margin-y: $spacer * .5 !default;
$dropdown-box-shadow: $box-shadow !default;
@@ -1295,7 +1295,7 @@ $pagination-color: var(--#{$prefix}link-color) !default;
$pagination-bg: var(--#{$prefix}body-bg) !default;
$pagination-border-radius: var(--#{$prefix}border-radius) !default;
$pagination-border-width: var(--#{$prefix}border-width) !default;
-$pagination-margin-start: calc($pagination-border-width * -1) !default; // stylelint-disable-line function-disallowed-list
+$pagination-margin-start: calc(#{$pagination-border-width} * -1) !default; // stylelint-disable-line function-disallowed-list
$pagination-border-color: var(--#{$prefix}border-color) !default;
$pagination-focus-color: var(--#{$prefix}link-hover-color) !default;
@@ -1429,7 +1429,7 @@ $popover-max-width: 276px !default;
$popover-border-width: var(--#{$prefix}border-width) !default;
$popover-border-color: var(--#{$prefix}border-color-translucent) !default;
$popover-border-radius: var(--#{$prefix}border-radius-lg) !default;
-$popover-inner-border-radius: calc($popover-border-radius - $popover-border-width) !default; // stylelint-disable-line function-disallowed-list
+$popover-inner-border-radius: calc(#{$popover-border-radius} - #{$popover-border-width}) !default; // stylelint-disable-line function-disallowed-list
$popover-box-shadow: $box-shadow !default;
$popover-header-font-size: $font-size-base !default;
diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss
index d6370ed7f..58e4d409c 100644
--- a/scss/forms/_input-group.scss
+++ b/scss/forms/_input-group.scss
@@ -121,7 +121,7 @@
}
> :not(:first-child):not(.dropdown-menu)#{$validation-messages} {
- margin-left: calc($input-border-width * -1); // stylelint-disable-line function-disallowed-list
+ margin-left: calc(#{$input-border-width} * -1); // stylelint-disable-line function-disallowed-list
@include border-start-radius(0);
}