diff --git a/README.md b/README.md index fd27c9be..8655a6a0 100644 --- a/README.md +++ b/README.md @@ -276,7 +276,6 @@ paige: yandex: # See https://metrica.yandex.com account_id: "" color: "#0d6efd" # Bootstrap primary color; theme color for Safari and Windows - color_scheme: "" # Always use this color scheme without automatic switching; must be "", "light", or "dark" comments: cactus: # See https://cactus.chat account_id: "" diff --git a/assets/paige/bootstrap/custom.scss b/assets/paige/bootstrap/paige.scss similarity index 76% rename from assets/paige/bootstrap/custom.scss rename to assets/paige/bootstrap/paige.scss index 117a0164..c55b9c48 100644 --- a/assets/paige/bootstrap/custom.scss +++ b/assets/paige/bootstrap/paige.scss @@ -1,4 +1,6 @@ {{ $page := . }} +$color-mode-type: media-query; $primary: {{ $page.Param "paige.color" | default "#0d6efd" }}; + @import "bootstrap"; diff --git a/layouts/partials/paige/html.html b/layouts/partials/paige/html.html index c137fcda..121967ef 100644 --- a/layouts/partials/paige/html.html +++ b/layouts/partials/paige/html.html @@ -1,7 +1,6 @@ {{ $page := . }} -{{ $dark := eq ($page.Param "paige.color_scheme") "dark" }} {{ $lang := site.LanguageCode | default site.Language.Lang }} {{ $rtl := eq $page.Language.LanguageDirection "rtl" }} - + diff --git a/layouts/partials/paige/links.html b/layouts/partials/paige/links.html index f0c657ef..f2527831 100644 --- a/layouts/partials/paige/links.html +++ b/layouts/partials/paige/links.html @@ -13,14 +13,9 @@ +{{ partial "paige/link.html" (dict "href" "paige/bootstrap/paige.scss" "page" $page "sass" true) }} {{ partial "paige/link.html" (dict "href" "paige/bootstrap-icons/bootstrap-icons.css") }} -{{ if $page.Param "paige.color" }} - {{ partial "paige/link.html" (dict "href" "paige/bootstrap/custom.scss" "page" $page "sass" true) }} -{{ else }} - {{ partial "paige/link.html" (dict "href" "paige/bootstrap/bootstrap.css") }} -{{ end }} - {{ if or ($page.Param "paige.math") (and ($page.Param "paige.section_pages.full_pages") (where $page.Pages "Params.paige.math" "eq" true)) }} {{ partial "paige/link.html" (dict "href" "paige/katex/katex.css") }} {{ end }} diff --git a/layouts/partials/paige/scripts.html b/layouts/partials/paige/scripts.html index 867d34db..b9c79b09 100644 --- a/layouts/partials/paige/scripts.html +++ b/layouts/partials/paige/scripts.html @@ -30,19 +30,6 @@ function paigeResize() { } paigeResize(); addEventListener("resize", paigeResize); -{{ if $page.Param "paige.color_scheme" | not }} - var paigeQuery = matchMedia("(prefers-color-scheme: dark)"); - if (paigeQuery.matches) { - document.documentElement.setAttribute("data-bs-theme", "dark") - } - paigeQuery.addEventListener("change", function (e) { - if (e.matches) { - document.documentElement.setAttribute("data-bs-theme", "dark"); - } else { - document.documentElement.removeAttribute("data-bs-theme"); - } - }); -{{ end }} {{ partial "paige/script.html" (dict "src" "paige/bootstrap/bootstrap.bundle.js") }}