mirror of
https://github.com/reonokiy/blog.nokiy.net.git
synced 2025-06-16 19:51:07 +02:00
fix: theme toggle error and improve global styles
- Refactored theme toggle logic to synchronize theme state with user preferences and system settings. - Introduced a new method to set the theme based on saved preferences or system color scheme. - Updated global CSS to support dark mode by default when the system prefers it, and added functional styles for better user experience. - Improved theme toggle animation and ensured compatibility with view transitions API. - Enhanced accessibility by updating aria attributes for the theme toggle button.
This commit is contained in:
parent
1af92d92c8
commit
77f94f646f
2 changed files with 48 additions and 14 deletions
|
@ -1,25 +1,39 @@
|
||||||
<script>
|
<script>
|
||||||
// Initialize theme toggle button
|
// Initialize theme toggle button
|
||||||
const themeToggle = document.querySelector('button[aria-pressed]') as HTMLButtonElement
|
const themeToggle = document.querySelector('button[aria-pressed]') as HTMLButtonElement
|
||||||
themeToggle.setAttribute('aria-pressed', String(document.documentElement.classList.contains('dark')))
|
|
||||||
|
|
||||||
// Core theme switching logic
|
// Set theme and sync all states
|
||||||
function switchTheme() {
|
function setTheme(isDark: boolean) {
|
||||||
const isDark = document.documentElement.classList.toggle('dark')
|
const theme = isDark ? 'dark' : 'light'
|
||||||
|
document.documentElement.setAttribute('data-theme', theme)
|
||||||
|
document.documentElement.classList.toggle('dark', isDark)
|
||||||
themeToggle.setAttribute('aria-pressed', String(isDark))
|
themeToggle.setAttribute('aria-pressed', String(isDark))
|
||||||
localStorage.setItem('theme', isDark ? 'dark' : 'light')
|
localStorage.setItem('theme', theme)
|
||||||
document.dispatchEvent(new Event('theme-changed'))
|
document.dispatchEvent(new Event('theme-changed'))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle theme toggle with view transitions API
|
// Initialize theme: use saved preference or fallback to system preference
|
||||||
|
const savedTheme = localStorage.getItem('theme')
|
||||||
|
const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches
|
||||||
|
setTheme(savedTheme ? savedTheme === 'dark' : prefersDark)
|
||||||
|
|
||||||
|
// Toggle theme with view transitions API support
|
||||||
function toggleTheme() {
|
function toggleTheme() {
|
||||||
|
const isDark = document.documentElement.getAttribute('data-theme') !== 'dark'
|
||||||
if (!document.startViewTransition) {
|
if (!document.startViewTransition) {
|
||||||
switchTheme()
|
setTheme(isDark)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
document.startViewTransition(switchTheme)
|
document.startViewTransition(() => setTheme(isDark))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Sync with system theme changes only if user hasn't set a preference
|
||||||
|
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => {
|
||||||
|
if (!localStorage.getItem('theme')) {
|
||||||
|
setTheme(e.matches)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
themeToggle.addEventListener('click', toggleTheme)
|
themeToggle.addEventListener('click', toggleTheme)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* Base settings */
|
||||||
:root {
|
:root {
|
||||||
--uno-colors-primary: theme('colors.primary');
|
--uno-colors-primary: theme('colors.primary');
|
||||||
--uno-colors-secondary: theme('colors.secondary');
|
--uno-colors-secondary: theme('colors.secondary');
|
||||||
|
@ -9,11 +10,6 @@ html {
|
||||||
body {
|
body {
|
||||||
--at-apply: 'bg-background c-secondary text-1.6rem';
|
--at-apply: 'bg-background c-secondary text-1.6rem';
|
||||||
}
|
}
|
||||||
@supports not (view-transition-name: none) {
|
|
||||||
body {
|
|
||||||
--at-apply: 'transition-all duration-500 ease-in-out';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
* {
|
* {
|
||||||
scrollbar-width: none;
|
scrollbar-width: none;
|
||||||
-ms-overflow-style: none;
|
-ms-overflow-style: none;
|
||||||
|
@ -21,6 +17,7 @@ body {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* Typography */
|
||||||
h1, h2, h3 {
|
h1, h2, h3 {
|
||||||
text-rendering: optimizeLegibility;
|
text-rendering: optimizeLegibility;
|
||||||
}
|
}
|
||||||
|
@ -42,10 +39,27 @@ h5 {
|
||||||
h6 {
|
h6 {
|
||||||
--at-apply: 'text-1.6rem';
|
--at-apply: 'text-1.6rem';
|
||||||
}
|
}
|
||||||
|
/* Functional styles */
|
||||||
article img {
|
article img {
|
||||||
cursor: zoom-in;
|
cursor: zoom-in;
|
||||||
}
|
}
|
||||||
/* Horizontal reveal animation on theme toggle */
|
/* Default to dark theme when system prefers dark mode */
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
:root:not([data-theme='light']) {
|
||||||
|
color-scheme: dark;
|
||||||
|
}
|
||||||
|
:root:not([data-theme='light']) html {
|
||||||
|
--at-apply: 'dark';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* When user explicitly chooses dark theme */
|
||||||
|
:root[data-theme='dark'] {
|
||||||
|
color-scheme: dark;
|
||||||
|
}
|
||||||
|
:root[data-theme='dark'] html {
|
||||||
|
--at-apply: 'dark';
|
||||||
|
}
|
||||||
|
/* Theme toggle animation */
|
||||||
@keyframes reveal {
|
@keyframes reveal {
|
||||||
from {
|
from {
|
||||||
clip-path: inset(var(--from));
|
clip-path: inset(var(--from));
|
||||||
|
@ -57,6 +71,12 @@ html.dark {
|
||||||
html:not(.dark) {
|
html:not(.dark) {
|
||||||
--from: 100% 0 0 0;
|
--from: 100% 0 0 0;
|
||||||
}
|
}
|
||||||
|
@supports not (view-transition-name: none) {
|
||||||
|
body {
|
||||||
|
--at-apply: 'transition-all duration-500 ease-in-out';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* View Transitions */
|
||||||
::view-transition-new(root) {
|
::view-transition-new(root) {
|
||||||
transition: none;
|
transition: none;
|
||||||
animation: reveal 1s cubic-bezier(0.4, 0, 0.2, 1);
|
animation: reveal 1s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue