From af9ddadc4de513f2bbaf75f70079970215ed6406 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 14 Oct 2023 13:45:56 -0700
Subject: [PATCH] fix(css): import base from custom instead of the other way
 around (#536)

---
 quartz/cli/handlers.js                        | 2 +-
 quartz/plugins/emitters/componentResources.ts | 2 +-
 quartz/styles/base.scss                       | 3 +--
 quartz/styles/custom.scss                     | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/quartz/cli/handlers.js b/quartz/cli/handlers.js
index bc3da73f3..48a44ec9f 100644
--- a/quartz/cli/handlers.js
+++ b/quartz/cli/handlers.js
@@ -1,4 +1,4 @@
-import { promises, readFileSync } from "fs"
+import { promises } from "fs"
 import path from "path"
 import esbuild from "esbuild"
 import chalk from "chalk"
diff --git a/quartz/plugins/emitters/componentResources.ts b/quartz/plugins/emitters/componentResources.ts
index 1290a3548..5cb34804f 100644
--- a/quartz/plugins/emitters/componentResources.ts
+++ b/quartz/plugins/emitters/componentResources.ts
@@ -7,7 +7,7 @@ import spaRouterScript from "../../components/scripts/spa.inline"
 import plausibleScript from "../../components/scripts/plausible.inline"
 // @ts-ignore
 import popoverScript from "../../components/scripts/popover.inline"
-import styles from "../../styles/base.scss"
+import styles from "../../styles/custom.scss"
 import popoverStyle from "../../components/styles/popover.scss"
 import { BuildCtx } from "../../util/ctx"
 import { StaticResources } from "../../util/resources"
diff --git a/quartz/styles/base.scss b/quartz/styles/base.scss
index 7645baddd..51694cb4e 100644
--- a/quartz/styles/base.scss
+++ b/quartz/styles/base.scss
@@ -1,7 +1,6 @@
-@use "./custom.scss";
+@use "./variables.scss" as *;
 @use "./syntax.scss";
 @use "./callouts.scss";
-@use "./variables.scss" as *;
 
 html {
   scroll-behavior: smooth;
diff --git a/quartz/styles/custom.scss b/quartz/styles/custom.scss
index b908314b1..b0c09dcb9 100644
--- a/quartz/styles/custom.scss
+++ b/quartz/styles/custom.scss
@@ -1 +1,3 @@
+@use "./base.scss";
+
 // put your custom CSS here!