diff --git a/src/boot/after_store.js b/src/boot/after_store.js index f88da23a..fec96580 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -123,6 +123,8 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { } copyInstanceOption('theme') + copyInstanceOption('style') + copyInstanceOption('palette') copyInstanceOption('nsfwCensorImage') copyInstanceOption('background') copyInstanceOption('hidePostStats') diff --git a/src/modules/instance.js b/src/modules/instance.js index 5cadc844..2ea8cf9b 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -99,6 +99,8 @@ const defaultState = { sidebarRight: false, subjectLineBehavior: 'email', theme: 'pleroma-dark', + palette: null, + style: null, emojiReactionsScale: 0.5, textSize: '14px', emojiSize: '2.2rem', diff --git a/src/modules/interface.js b/src/modules/interface.js index 8d05dea4..089e8299 100644 --- a/src/modules/interface.js +++ b/src/modules/interface.js @@ -331,7 +331,7 @@ const interfaceMod = { } else { result.nameUsed = name - if (result.nameUsed === 'stock') { + if (result.nameUsed == null) { result.dataUsed = null return result } @@ -448,8 +448,10 @@ const interfaceMod = { ) state.paletteNameUsed = palette.nameUsed state.paletteDataUsed = palette.dataUsed - state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent - state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link + if (state.paletteDataUsed) { + state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent + state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link + } if (Array.isArray(state.paletteDataUsed)) { const [ name,