Skip to content

Smooth theme switching #2160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jzimdars merged 5 commits into from
Dec 22, 2025
+21 −17
Merged

Smooth theme switching #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
876eb54
Use View Transitions for smooth theme switching
nqst Dec 16, 2025
3216f1c
Fix `.nav__trigger` background flashing
nqst Dec 16, 2025
7cf0e57
Rename `isInitialLoad` to `hasChanged`
nqst Dec 16, 2025
9520d34
Merge branch 'main' into smooth-theme-change
nqst Dec 16, 2025
72ffc2b
Merge branch 'main' into smooth-theme-change
jzimdars Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions app/assets/stylesheets/nav.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* ------------------------------------------------------------------------ */

.nav__trigger {
--input-background: var(--color-canvas);
--input-background: transparent;
--input-border-color: transparent;
--input-padding: 0.3em 2em 0.3em 0.75em;

Expand All @@ -17,21 +17,11 @@

@media (any-hover: hover) {
&:hover {
filter: brightness(0.9);
--input-background: var(--color-ink-lighter);

span {
background: var(--color-ink-lighter);
}

html[data-theme="dark"] & {
--input-background: var(--color-ink-lighter);
}

@media (prefers-color-scheme: dark) {
html:not([data-theme]) & {
--input-background: var(--color-ink-lighter);
}
}
}
}

Expand Down
24 changes: 19 additions & 5 deletions app/javascript/controllers/theme_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,27 @@ export default class extends Controller {
set #theme(theme) {
localStorage.setItem("theme", theme)

if (theme === "auto") {
document.documentElement.removeAttribute("data-theme")
} else {
document.documentElement.setAttribute("data-theme", theme)
const currentTheme = document.documentElement.getAttribute("data-theme") || "auto"
const hasChanged = currentTheme !== theme

const prefersReducedMotion = window.matchMedia?.("(prefers-reduced-motion: reduce)")?.matches
const animate = hasChanged && !prefersReducedMotion

const applyTheme = () => {
if (theme === "auto") {
document.documentElement.removeAttribute("data-theme")
} else {
document.documentElement.setAttribute("data-theme", theme)
}

this.#updateButtons()
}

this.#updateButtons()
if (animate && document.startViewTransition) {
document.startViewTransition(applyTheme)
} else {
applyTheme()
}
}

#applyStoredTheme() {
Expand Down