From 12b6b132e4c24c80813b726bd7191c83a5aead05 Mon Sep 17 00:00:00 2001
From: Aditya Telange <21258296+adityatelange@users.noreply.github.com>
Date: Tue, 3 Nov 2020 20:21:10 +0530
Subject: [PATCH] Revert "theme-switch-button: improve logic"
This reverts commit 0eed773e6dcf999cb052b6f781bfbe7ad74e63c7.
---
layouts/partials/footer.html | 2 +-
layouts/partials/header.html | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index dbc4989..f3baf82 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -50,7 +50,7 @@
localStorage.setItem("menu-scroll-position", document.getElementById('menu').scrollLeft);
}
</script>
-{{- if (and (not .Site.Params.disableThemeToggle) (not (eq .Site.Params.defaultTheme "auto"))) }}
+{{- if (and (not .Site.Params.disableThemeToggle) (not (or (eq .Site.Params.defaultTheme "light") (eq .Site.Params.defaultTheme "dark")))) }}
<script>
document.getElementById("theme-toggle").addEventListener("click", () => {
if (document.body.className.includes("dark")) {
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 2dc56a6..233587b 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,4 +1,4 @@
-{{- if (and (not .Site.Params.disableThemeToggle) (not (eq .Site.Params.defaultTheme "auto"))) }}
+{{- if (and (not .Site.Params.disableThemeToggle) (not (or (eq .Site.Params.defaultTheme "light") (eq .Site.Params.defaultTheme "dark")))) }}
<script>
// load memory
if (localStorage.getItem("pref-theme") === "dark") {
@@ -13,7 +13,7 @@
</script>
{{- end }}
-{{- if (eq .Site.Params.defaultTheme "auto") }}
+{{- if (and (.Site.Params.disableThemeToggle) (eq .Site.Params.defaultTheme "auto")) }}
<script>
if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
document.body.classList.add('dark');
@@ -41,7 +41,7 @@
{{- .Site.Params.label.text | default .Site.Title -}}
</a>
<span class="logo-switches">
- {{- if (not .Site.Params.disableThemeToggle) }}
+ {{- if (and (not .Site.Params.disableThemeToggle) (not (or (eq .Site.Params.defaultTheme "light") (eq .Site.Params.defaultTheme "dark")))) }}
<span class="theme-toggle">
<a id="theme-toggle" accesskey="t">
<svg id="moon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"