diff --git a/quartz/plugins/emitters/componentResources.ts b/quartz/plugins/emitters/componentResources.ts index 8ceaa04..c44e4d2 100644 --- a/quartz/plugins/emitters/componentResources.ts +++ b/quartz/plugins/emitters/componentResources.ts @@ -5,7 +5,8 @@ import { QuartzEmitterPlugin } from "../types" import spaRouterScript from "../../components/scripts/spa.inline" // @ts-ignore import popoverScript from "../../components/scripts/popover.inline" -import styles from "../../styles/custom.scss" +import baseStyles from "../../styles/base.scss" +import customStyles from "../../styles/custom.scss" import popoverStyle from "../../components/styles/popover.scss" import { BuildCtx } from "../../util/ctx" import { QuartzComponent } from "../../components/types" @@ -329,12 +330,13 @@ export const ComponentResources: QuartzEmitterPlugin = () => { // that everyone else had the chance to register a listener for it addGlobalPageResources(ctx, componentResources) - const stylesheet = joinStyles( + const quartzBase = joinStyles( ctx.cfg.configuration.theme, googleFontsStyleSheet, ...componentResources.css, - styles, + baseStyles, ) + const stylesheet = `@layer quartz-base {\n${quartzBase}\n}\n${customStyles}` const [prescript, postscript] = await Promise.all([ joinScripts(componentResources.beforeDOMLoaded), diff --git a/quartz/styles/custom.scss b/quartz/styles/custom.scss index b0c09dc..cdec534 100644 --- a/quartz/styles/custom.scss +++ b/quartz/styles/custom.scss @@ -1,3 +1,3 @@ -@use "./base.scss"; +@use "./variables.scss" as *; // put your custom CSS here!