From eec0a183f6264335ca31b6bd84c998ff0da1c42e Mon Sep 17 00:00:00 2001 From: Larry Botha Date: Mon, 15 Aug 2022 16:21:21 -0500 Subject: [PATCH] fix(entrypoint): custom support and globals should immediately override core --- scss/custom/_index.scss | 10 ---------- scss/style.scss | 6 +++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/scss/custom/_index.scss b/scss/custom/_index.scss index 2fcbf9f..00d14ae 100644 --- 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 index 1aa48c4..a932436 100644 --- 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