From 4a8ae8f965d94debdfc91e389a68309ec7fc38ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Tue, 12 Sep 2023 18:43:13 +0200 Subject: [PATCH] Fix order of scss functions import and helpers in comments (#41) Co-authored-by: XhmikosR --- color-modes/scss/styles.scss | 4 +++- parcel/src/scss/styles.scss | 4 +++- sass-js-esm/scss/styles.scss | 4 +++- sass-js/scss/styles.scss | 4 +++- vite/src/scss/styles.scss | 4 +++- vue/src/scss/styles.scss | 4 +++- webpack/src/scss/styles.scss | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/color-modes/scss/styles.scss b/color-modes/scss/styles.scss index cf3a84e8..38334572 100644 --- a/color-modes/scss/styles.scss +++ b/color-modes/scss/styles.scss @@ -30,6 +30,9 @@ $enable-shadows: true; $offcanvas-box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); +// Include functions first +@import "bootstrap/scss/functions"; + // Customize some defaults $body-color: #333; $body-bg: #fff; @@ -37,7 +40,6 @@ $border-radius: .4rem; $success: #7952b3; // Required -@import "bootstrap/scss/functions"; @import "bootstrap/scss/variables"; @import "bootstrap/scss/variables-dark"; @import "bootstrap/scss/maps"; diff --git a/parcel/src/scss/styles.scss b/parcel/src/scss/styles.scss index cbf2ae02..f1c1ffc3 100644 --- a/parcel/src/scss/styles.scss +++ b/parcel/src/scss/styles.scss @@ -30,6 +30,9 @@ $enable-shadows: true; $offcanvas-box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); +// Include functions first +@import "bootstrap/scss/functions"; + // Customize some defaults $body-color: #333; $body-bg: #fff; @@ -37,7 +40,6 @@ $border-radius: .4rem; $success: #7952b3; // Required -@import "bootstrap/scss/functions"; @import "bootstrap/scss/variables"; @import "bootstrap/scss/variables-dark"; @import "bootstrap/scss/maps"; diff --git a/sass-js-esm/scss/styles.scss b/sass-js-esm/scss/styles.scss index cbf2ae02..f1c1ffc3 100644 --- a/sass-js-esm/scss/styles.scss +++ b/sass-js-esm/scss/styles.scss @@ -30,6 +30,9 @@ $enable-shadows: true; $offcanvas-box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); +// Include functions first +@import "bootstrap/scss/functions"; + // Customize some defaults $body-color: #333; $body-bg: #fff; @@ -37,7 +40,6 @@ $border-radius: .4rem; $success: #7952b3; // Required -@import "bootstrap/scss/functions"; @import "bootstrap/scss/variables"; @import "bootstrap/scss/variables-dark"; @import "bootstrap/scss/maps"; diff --git a/sass-js/scss/styles.scss b/sass-js/scss/styles.scss index cbf2ae02..f1c1ffc3 100644 --- a/sass-js/scss/styles.scss +++ b/sass-js/scss/styles.scss @@ -30,6 +30,9 @@ $enable-shadows: true; $offcanvas-box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); +// Include functions first +@import "bootstrap/scss/functions"; + // Customize some defaults $body-color: #333; $body-bg: #fff; @@ -37,7 +40,6 @@ $border-radius: .4rem; $success: #7952b3; // Required -@import "bootstrap/scss/functions"; @import "bootstrap/scss/variables"; @import "bootstrap/scss/variables-dark"; @import "bootstrap/scss/maps"; diff --git a/vite/src/scss/styles.scss b/vite/src/scss/styles.scss index cbf2ae02..f1c1ffc3 100644 --- a/vite/src/scss/styles.scss +++ b/vite/src/scss/styles.scss @@ -30,6 +30,9 @@ $enable-shadows: true; $offcanvas-box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); +// Include functions first +@import "bootstrap/scss/functions"; + // Customize some defaults $body-color: #333; $body-bg: #fff; @@ -37,7 +40,6 @@ $border-radius: .4rem; $success: #7952b3; // Required -@import "bootstrap/scss/functions"; @import "bootstrap/scss/variables"; @import "bootstrap/scss/variables-dark"; @import "bootstrap/scss/maps"; diff --git a/vue/src/scss/styles.scss b/vue/src/scss/styles.scss index 28e8d7a0..ef481218 100644 --- a/vue/src/scss/styles.scss +++ b/vue/src/scss/styles.scss @@ -30,6 +30,9 @@ $enable-shadows: true; $offcanvas-box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); +// Include functions first +@import "bootstrap/scss/functions"; + // Customize some defaults $body-color: #333; $body-bg: #fff; @@ -37,7 +40,6 @@ $border-radius: .4rem; $success: #7952b3; // Required -@import "bootstrap/scss/functions"; @import "bootstrap/scss/variables"; @import "bootstrap/scss/variables-dark"; @import "bootstrap/scss/maps"; diff --git a/webpack/src/scss/styles.scss b/webpack/src/scss/styles.scss index cbf2ae02..f1c1ffc3 100644 --- a/webpack/src/scss/styles.scss +++ b/webpack/src/scss/styles.scss @@ -30,6 +30,9 @@ $enable-shadows: true; $offcanvas-box-shadow: 0 1rem 3rem rgba(0, 0, 0, .175); +// Include functions first +@import "bootstrap/scss/functions"; + // Customize some defaults $body-color: #333; $body-bg: #fff; @@ -37,7 +40,6 @@ $border-radius: .4rem; $success: #7952b3; // Required -@import "bootstrap/scss/functions"; @import "bootstrap/scss/variables"; @import "bootstrap/scss/variables-dark"; @import "bootstrap/scss/maps";