Merge pull request #46 from larrybotha/fix/invalid-import-order

larrybotha · Aug 15, 2022 · dfe0333 · dfe0333
2 parents 4cbcd07 + eec0a18
commit dfe0333
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/scss/custom/_index.scss b/scss/custom/_index.scss
@@ -1,16 +1,6 @@
 /*------------------------------------*\
     CUSTOM STYLES
 \*------------------------------------*/
-/**
- * Import custom variables, mixins, and functions
- */
-@import "support";
-
-/**
- * Import custom global styles
- */
-@import "global";
-
 /**
  * Import custom styles
  */

diff --git a/scss/style.scss b/scss/style.scss
@@ -4,11 +4,15 @@
   STYLES ENTRYPOINT
 \*------------------------------------*/
 /**
- * Import core support files and globals
+ * Import core files, overriding each with custom styles
  */
 @import "core/support";
+@import "custom/support";
+
 @import "reset";
+
 @import "core/global";
+@import "custom/global";
 
 /**
  * Import custom styles to override core