hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better v1 detection, better menu-item consistency

Browse source
This commit is contained in:
Henry Jameson 2024-02-27 17:03:39 +02:00
commit c83ddb0b2b
6 changed files with 57 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/services/style_setter/style_setter.js
View file

@ -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])