diff --git a/src/App.vue b/src/App.vue index eaa3506..6c8baba 100644 --- a/src/App.vue +++ b/src/App.vue @@ -59,5 +59,5 @@ export default { diff --git a/src/assets/scss/abstracts/_abstracts.scss b/src/assets/scss/abstracts/_abstracts.scss index 3fad532..4f48724 100644 --- a/src/assets/scss/abstracts/_abstracts.scss +++ b/src/assets/scss/abstracts/_abstracts.scss @@ -16,8 +16,9 @@ // Custom variables must be imported first. -@import 'bootstrap-overrides/variables'; +@import 'functions'; @import 'variables'; +@import 'mixins'; // ┌─╮╭─╮╭─╮╶┬╴╭─╴╶┬╴┌─╮╭─┐┌─╮ @@ -33,8 +34,8 @@ // │╶┤│ ││ │ │ ╰─╮ │ ├┬╯├─┤├─╯╶─╴│╭╯│ │├─╴ // └─╯╰─╯╰─╯ ╵ ╶─╯ ╵ ╵ ╰╵ ╵╵ ╰╯ ╰─╯╰─╴ -@import "~bootstrap-vue/src/variables"; +@import '~bootstrap-vue/src/variables'; // mixins and functions overides must be imported after bootstrap's definitions. -@import 'bootstrap-overrides/mixins'; +// @import 'bootstrap-overrides/mixins'; diff --git a/src/assets/scss/app.scss b/src/assets/scss/app.scss index e69de29..f506fbf 100644 --- a/src/assets/scss/app.scss +++ b/src/assets/scss/app.scss @@ -0,0 +1,10 @@ +@import 'abstracts/functions'; +@import 'abstracts/variables'; +@import 'abstracts/mixins'; + +@import 'vendors/bootstrap'; + +@import 'base/root'; + +@import 'fonts/noto-sans'; +@import 'fonts/redaction'; diff --git a/src/assets/scss/base/_root.scss b/src/assets/scss/base/_root.scss index 8fb139d..4252dca 100644 --- a/src/assets/scss/base/_root.scss +++ b/src/assets/scss/base/_root.scss @@ -1,8 +1,3 @@ -@import 'globals'; - -@import 'bootstrap'; - - html, body, #app { diff --git a/vue.config.js b/vue.config.js index 8577aaf..280235f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -11,7 +11,7 @@ module.exports = { css: { loaderOptions: { sass: { - prependData: '@import "@/assets/scss/globals.scss";' + prependData: '@import "@/assets/scss/abstracts/_abstracts.scss";' } } },