mirror of
https://framagit.org/les/gancio.git
synced 2025-01-31 16:42:22 +01:00
Merge branch 'fix/ui-color-theme-wrong-selection' into 'master'
Fix/ui color theme wrong selection Closes #332 See merge request les/gancio!42
This commit is contained in:
commit
8ae09411f1
1 changed files with 3 additions and 2 deletions
|
@ -4,7 +4,8 @@ import { ca, cs, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, tr, sk, ro, ru, zhH
|
|||
export default ({ res, nuxtState }) => {
|
||||
|
||||
const settings = process.server ? (res.locals.settings || {}) : nuxtState.state.settings || {}
|
||||
|
||||
const is_dark = nuxtState?.state?.localSettings['theme.is_dark'] ?? settings['theme.is_dark']
|
||||
|
||||
return {
|
||||
lang: { locales: { ca, cs, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, sk, tr, ro, ru, zhHans } },
|
||||
theme: {
|
||||
|
@ -13,7 +14,7 @@ export default ({ res, nuxtState }) => {
|
|||
variations: false,
|
||||
minifyTheme,
|
||||
},
|
||||
dark: settings['theme.is_dark'],
|
||||
dark: is_dark,
|
||||
themes: {
|
||||
dark: settings.dark_colors,
|
||||
light: settings.light_colors
|
||||
|
|
Loading…
Reference in a new issue