Browse Source

fix scss imports

axolotle 2 years ago
parent
commit
e04a27ffa7

+ 1 - 1
src/App.vue

@@ -59,5 +59,5 @@ export default {
 </script>
 
 <style lang="scss">
-@import '@/assets/scss/main.scss';
+@import '@/assets/scss/app.scss';
 </style>

+ 4 - 3
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';

+ 10 - 0
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';

+ 0 - 5
src/assets/scss/base/_root.scss

@@ -1,8 +1,3 @@
-@import 'globals';
-
-@import 'bootstrap';
-
-
 html,
 body,
 #app {

+ 1 - 1
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";'
       }
     }
   },