NoLog.cz/gancio-upstream
6
0
Fork 0
mirror of https://framagit.org/les/gancio.git synced 2025-02-01 00:52:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix/ui-color-theme-wrong-selection' into 'master'

Browse source 
Fix/ui color theme wrong selection

Closes #332

See merge request les/gancio!42
This commit is contained in:
les 2024-01-18 23:37:36 +00:00
commit 8ae09411f1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vuetify.options.js
View file

@ -4,6 +4,7 @@ import { ca, cs, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, tr, sk, ro, ru, zhH
export default ({ res, nuxtState }) => { export default ({ res, nuxtState }) => {
const settings = process.server ? (res.locals.settings || {}) : nuxtState.state.settings || {} const settings = process.server ? (res.locals.settings || {}) : nuxtState.state.settings || {}
const is_dark = nuxtState?.state?.localSettings['theme.is_dark'] ?? settings['theme.is_dark']
return { return {
lang: { locales: { ca, cs, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, sk, tr, ro, ru, zhHans } }, lang: { locales: { ca, cs, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, sk, tr, ro, ru, zhHans } },
@ -13,7 +14,7 @@ export default ({ res, nuxtState }) => {
variations: false, variations: false,
minifyTheme, minifyTheme,
}, },
dark: settings['theme.is_dark'], dark: is_dark,
themes: { themes: {
dark: settings.dark_colors, dark: settings.dark_colors,
light: settings.light_colors light: settings.light_colors