aboutsummaryrefslogtreecommitdiff
path: root/src/services/style_setter
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2024-02-27 17:03:39 +0200
committerHenry Jameson <me@hjkos.com>2024-02-27 17:03:39 +0200
commitc83ddb0b2b824fb3c0e3bb596552e98c162c78d3 (patch)
tree8b877ba3d3bcaa398b5d4050d0ff74e00f8d5932 /src/services/style_setter
parentd3b5f76486373f658a2802b5b9ab7628ebc862fb (diff)
better v1 detection, better menu-item consistency
Diffstat (limited to 'src/services/style_setter')
-rw-r--r--src/services/style_setter/style_setter.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 52cf06ed..74d745f0 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -8,11 +8,11 @@ import { chunk } from 'lodash'
export const applyTheme = async (input) => {
let extraRules
- if (input.themeType !== 1) {
+ if (input.themeFileVersion === 1) {
+ extraRules = convertTheme2To3(input)
+ } else {
const { theme } = generatePreset(input)
extraRules = convertTheme2To3(theme)
- } else {
- extraRules = convertTheme2To3(input)
}
const themes3 = init(extraRules, '#FFFFFF')
@@ -125,7 +125,7 @@ export const getPreset = (val) => {
.then((themes) => themes[val] ? themes[val] : themes['pleroma-dark'])
.then((theme) => {
const isV1 = Array.isArray(theme)
- const data = isV1 ? { themeType: 1 } : theme.theme
+ const data = isV1 ? {} : theme.theme
if (isV1) {
const bg = hex2rgb(theme[1])