Skip to content

Fix dark mode switcher flash bug #4174

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
SEWeiTung merged 4 commits into from
Oct 15, 2021
Merged

Fix dark mode switcher flash bug #4174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d22a9f7
Fix dark mode switcher flash bug (#4167)
NriotHrreion Oct 12, 2021
e655156
Merge branch 'main' into main
Trott Oct 12, 2021
7a8df0c
Merge branch 'main' into main
NriotHrreion Oct 13, 2021
941cb92
Merge branch 'main' into main
Oct 14, 2021
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
2 changes: 2 additions & 0 deletions layouts/partials/html-head.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
{{#each site.feeds}}
<link rel="alternate" href="/{{ ../site.locale }}/{{ link }}" title="{{ text }}" type="application/rss+xml">
{{/each}}

<script src="/static/js/themeSwitcher.js"></script>
</head>
7 changes: 0 additions & 7 deletions static/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@
;(function () {
const themeAttr = 'data-theme'
var darkThemeSwitcherElement = document.querySelector('.dark-theme-switcher')
var isInDarkMode = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches

if (getTheme() == null) {
setTheme(isInDarkMode ? 'dark' : 'light')
} else {
setTheme(getTheme())
}

darkThemeSwitcherElement.addEventListener('click', function () {
var currentTheme = getTheme()
Expand Down
19 changes: 19 additions & 0 deletions static/js/themeSwitcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
;(function () {
const themeAttr = 'data-theme'
const isInDarkMode = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches

if (getTheme() == null) {
setTheme(isInDarkMode ? 'dark' : 'light')
} else {
setTheme(getTheme())
}

function setTheme (theme) {
document.querySelector('html').setAttribute(themeAttr, theme)
window.localStorage.setItem('theme', theme)
}

function getTheme () {
return window.localStorage.getItem('theme')
}
})()