Add support for prefers-color-scheme media query

pull/1086/head
Simon Legner 5 years ago
parent 811c9b0204
commit 0700f2d833

@ -7,7 +7,8 @@ class app.Settings
'arrowScroll' 'arrowScroll'
'analyticsConsent' 'analyticsConsent'
'docs' 'docs'
'dark' 'dark' # legacy
'theme'
'layout' 'layout'
'size' 'size'
'tips' 'tips'
@ -43,7 +44,7 @@ class app.Settings
set: (key, value) -> set: (key, value) ->
@store.set(key, value) @store.set(key, value)
delete @cache[key] delete @cache[key]
@toggleDark(value) if key == 'dark' @setTheme(value) if key == 'theme'
return return
del: (key) -> del: (key) ->
@ -114,15 +115,20 @@ class app.Settings
return return
initLayout: -> initLayout: ->
@toggleDark(@get('dark') is 1) if @get('dark') is 1
@set('theme', 'dark')
@del 'dark'
@setTheme(@get('theme'))
@toggleLayout(layout, @hasLayout(layout)) for layout in @LAYOUTS @toggleLayout(layout, @hasLayout(layout)) for layout in @LAYOUTS
@initSidebarWidth() @initSidebarWidth()
return return
toggleDark: (enable) -> setTheme: (theme) ->
if not theme
theme = if window.matchMedia('(prefers-color-scheme: dark)').matches then 'dark' else 'default'
classList = document.documentElement.classList classList = document.documentElement.classList
classList.toggle('_theme-default', !enable) classList.remove('_theme-default', '_theme-dark')
classList.toggle('_theme-dark', enable) classList.add('_theme-' + theme)
color = getComputedStyle(document.documentElement).getPropertyValue('--headerBackground').trim() color = getComputedStyle(document.documentElement).getPropertyValue('--headerBackground').trim()
$('meta[name=theme-color]').setAttribute('content', color) $('meta[name=theme-color]').setAttribute('content', color)
return return

@ -2,12 +2,22 @@ app.templates.settingsPage = (settings) -> """
<h1 class="_lined-heading">Preferences</h1> <h1 class="_lined-heading">Preferences</h1>
<div class="_settings-fieldset"> <div class="_settings-fieldset">
<h2 class="_settings-legend">General:</h2> <h2 class="_settings-legend">Theme:</h2>
<div class="_settings-inputs"> <div class="_settings-inputs">
<label class="_settings-label"> <label class="_settings-label">
<input type="checkbox" form="settings" name="dark" value="1"#{if settings.dark then ' checked' else ''}>Enable dark theme <select form="settings" name="theme">
<option value=""#{if not settings.theme then ' selected' else ''}>automatic</option>
<option value="default"#{if settings.theme == 'default' then ' selected' else ''}>light</option>
<option value="dark"#{if settings.theme == 'dark' then ' selected' else ''}>dark</option>
</select>
</label> </label>
</div>
</div>
<div class="_settings-fieldset">
<h2 class="_settings-legend">General:</h2>
<div class="_settings-inputs">
<label class="_settings-label _setting-max-width"> <label class="_settings-label _setting-max-width">
<input type="checkbox" form="settings" name="layout" value="_max-width"#{if settings['_max-width'] then ' checked' else ''}>Enable fixed-width layout <input type="checkbox" form="settings" name="layout" value="_max-width"#{if settings['_max-width'] then ' checked' else ''}>Enable fixed-width layout
</label> </label>

@ -11,7 +11,7 @@ class app.views.SettingsPage extends app.View
currentSettings: -> currentSettings: ->
settings = {} settings = {}
settings.dark = app.settings.get('dark') settings.theme = app.settings.get('theme')
settings.smoothScroll = !app.settings.get('fastScroll') settings.smoothScroll = !app.settings.get('fastScroll')
settings.arrowScroll = app.settings.get('arrowScroll') settings.arrowScroll = app.settings.get('arrowScroll')
settings.autoInstall = app.settings.get('autoInstall') settings.autoInstall = app.settings.get('autoInstall')
@ -22,8 +22,8 @@ class app.views.SettingsPage extends app.View
getTitle: -> getTitle: ->
'Preferences' 'Preferences'
toggleDark: (enable) -> setTheme: (value) ->
app.settings.set('dark', !!enable) app.settings.set('theme', value)
return return
toggleLayout: (layout, enable) -> toggleLayout: (layout, enable) ->
@ -74,8 +74,8 @@ class app.views.SettingsPage extends app.View
onChange: (event) => onChange: (event) =>
input = event.target input = event.target
switch input.name switch input.name
when 'dark' when 'theme'
@toggleDark input.checked @setTheme input.value
when 'layout' when 'layout'
@toggleLayout input.value, input.checked @toggleLayout input.value, input.checked
when 'smoothScroll' when 'smoothScroll'

Loading…
Cancel
Save