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

Merge branch 'fix-p-themes' into 'develop'

Browse source 
Fix p's weird corrupt theme data crashing theme engine

See merge request pleroma/pleroma-fe!1334
This commit is contained in:
HJ 2021-01-24 10:36:03 +00:00
commit eb2975b64d
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -242,9 +242,18 @@ export const generateShadows = (input, colors) => {
panelHeader: 'panel', panelHeader: 'panel',
input: 'input' input: 'input'
} }
const inputShadows = input.shadows && !input.themeEngineVersion
? shadows2to3(input.shadows, input.opacity) const cleanInputShadows = Object.fromEntries(
: input.shadows || {} Object.entries(input.shadows)
.map(([name, shadowSlot]) => [
name,
// defaulting color to black to avoid potential problems
shadowSlot.map(shadowDef => ({ color: '#000000', ...shadowDef }))
])
)
const inputShadows = cleanInputShadows && !input.themeEngineVersion
? shadows2to3(cleanInputShadows, input.opacity)
: cleanInputShadows || {}
const shadows = Object.entries({ const shadows = Object.entries({
...DEFAULT_SHADOWS, ...DEFAULT_SHADOWS,
...inputShadows ...inputShadows