fix scss imports

This commit is contained in:
axolotle
2021-05-18 15:13:28 +02:00
parent bec9177d1b
commit e04a27ffa7
5 changed files with 16 additions and 10 deletions
+1 -1
View File
@@ -59,5 +59,5 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
@import '@/assets/scss/main.scss'; @import '@/assets/scss/app.scss';
</style> </style>
+4 -3
View File
@@ -16,8 +16,9 @@
// Custom variables must be imported first. // Custom variables must be imported first.
@import 'bootstrap-overrides/variables'; @import 'functions';
@import 'variables'; @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. // mixins and functions overides must be imported after bootstrap's definitions.
@import 'bootstrap-overrides/mixins'; // @import 'bootstrap-overrides/mixins';
+10
View File
@@ -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';
-5
View File
@@ -1,8 +1,3 @@
@import 'globals';
@import 'bootstrap';
html, html,
body, body,
#app { #app {
+1 -1
View File
@@ -11,7 +11,7 @@ module.exports = {
css: { css: {
loaderOptions: { loaderOptions: {
sass: { sass: {
prependData: '@import "@/assets/scss/globals.scss";' prependData: '@import "@/assets/scss/abstracts/_abstracts.scss";'
} }
} }
}, },