From a95e78f80d5bf1833a52c7bdccbf0c80f9058ba8 Mon Sep 17 00:00:00 2001 From: Matt Wang Date: Tue, 28 Mar 2023 18:12:53 -0700 Subject: [PATCH] Revert "Fix import order for `setup.scss` (#1184)" (#1209) * Revert "Fix import order for `setup.scss` (#1184)" This reverts commit 765954233a4f2b63c7c7cf6f3f698923dcfd8e7f. * Update docs --- _includes/css/just-the-docs.scss.liquid | 2 +- docs/customization.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/css/just-the-docs.scss.liquid b/_includes/css/just-the-docs.scss.liquid index a6c3cbf..2eb480d 100644 --- a/_includes/css/just-the-docs.scss.liquid +++ b/_includes/css/just-the-docs.scss.liquid @@ -2,11 +2,11 @@ $logo: "{{ site.logo | relative_url }}"; {% endif %} @import "./support/support"; +@import "./custom/setup"; @import "./color_schemes/light"; {% unless include.color_scheme == "light" %} @import "./color_schemes/{{ include.color_scheme }}"; {% endunless %} -@import "./custom/setup"; @import "./modules"; {% include css/callouts.scss.liquid color_scheme = include.color_scheme %} {% include css/custom.scss.liquid %} diff --git a/docs/customization.md b/docs/customization.md index 7b15e5d..c560aaa 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -122,7 +122,7 @@ jtd.setTheme("foo") New (v0.4.0) {: .label .label-green } -To define new SCSS variables, functions, or override existing theme variables, place SCSS code in `_sass/custom/setup.scss`. This should *not* be used for defining custom styles (see the next section). +To define new SCSS variables or functions, place SCSS code in `_sass/custom/setup.scss`. This should *not* be used for defining custom styles (see the next section) or overriding color scheme variables (in this case, you should create a new color scheme). This is most commonly-used to define [custom callout colors]({% link docs/configuration.md %}#callouts). For example,