diff --git a/src/App.vue b/src/App.vue index a44ab87b7..3d665312e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,3 +1,11 @@ + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 9d9b2401b..316656ed1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,17 +8,13 @@ module.exports = { loaderOptions: { sass: { // Load Order Matters!!! + // Note: only include functions, variables and mixins here prependData: ` @import "./node_modules/bootstrap/scss/functions"; @import "@/styles/ux-variables.scss"; @import "./node_modules/bootstrap/scss/variables"; @import "./node_modules/bootstrap/scss/mixins"; @import "@/styles/mixins/customMixins"; - @import "./node_modules/bootstrap/scss/bootstrap"; - @import "@/styles/common-styles.scss"; - @import "@/styles/common-button-styles.scss"; - @import "@/styles/common-list-styles.scss"; - @import "@/styles/common-typography-styles.scss"; `, }, }, diff --git a/vue.release.config.js b/vue.release.config.js index c4b18d5dd..43fffb47f 100644 --- a/vue.release.config.js +++ b/vue.release.config.js @@ -7,17 +7,13 @@ module.exports = { loaderOptions: { sass: { // Load Order Matters!!! + // Note: only include functions, variables and mixins here prependData: ` @import "./node_modules/bootstrap/scss/functions"; @import "@/styles/ux-variables.scss"; @import "./node_modules/bootstrap/scss/variables"; @import "./node_modules/bootstrap/scss/mixins"; - @import "@/styles/mixins/customMixins"; - @import "./node_modules/bootstrap/scss/bootstrap"; - @import "@/styles/common-styles.scss"; - @import "@/styles/common-button-styles.scss"; - @import "@/styles/common-list-styles.scss"; - @import "@/styles/common-typography-styles.scss"; + @import "@/styles/mixins/customMixins"; `, }, },