diff --git a/src/main.js b/src/main.js index a0c3911..913be14 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ import {terminal} from "./terminal.js"; import './styles/style.scss'; import './module/post.js' -import './module/toggle.js' +import './module/header.js' import './module/effect.js' terminal.refresh(); diff --git a/src/module/toggle.js b/src/module/header.js similarity index 63% rename from src/module/toggle.js rename to src/module/header.js index d6dbd10..11097b7 100644 --- a/src/module/toggle.js +++ b/src/module/header.js @@ -2,16 +2,15 @@ function register_themeToggle() { const toggle = document.getElementById("theme-toggle"); toggle.addEventListener("click", function () { - let storedMode = localStorage.getItem("theme-mode"); + const currentScheme = document.documentElement.getAttribute("data-color-scheme"); + const nextMode = currentScheme === "dark" ? "light" : "dark"; - window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { - if (localStorage.getItem("theme-mode") === "system") { - applyTheme("system"); - } - }); - const nextMode = storedMode === "dark" ? "light" : "dark"; applyTheme(nextMode); - localStorage.setItem("theme-mode", nextMode); + + const isSystemMode = currentScheme === "system"; + if (!isSystemMode) { + localStorage.setItem("theme-mode", nextMode); + } }); } diff --git a/templates/modules/layout.html b/templates/modules/layout.html index 39a226e..4bf1142 100644 --- a/templates/modules/layout.html +++ b/templates/modules/layout.html @@ -23,11 +23,19 @@ document.documentElement.setAttribute("data-color-scheme", actualMode); document.documentElement.setAttribute("theme-color-scheme", targetTheme); } - if (!storedMode) { + + + if (default_mode === 'system' || !storedMode) { localStorage.setItem("theme-mode", default_mode); storedMode = default_mode; } + applyTheme(storedMode); + window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => { + if (localStorage.getItem("theme-mode") === "system") { + applyTheme("system"); + } + });