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

Merge branch 'fix/themes-2.1-transparency-pink' into 'develop'

Browse source 
fix trasparency problems in some cases (purple headers)

See merge request pleroma/pleroma-fe!1079
This commit is contained in:
Shpuld Shpludson 2020-03-04 06:20:28 +00:00
commit f58f294ee8
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/modules/config.js
View file

@ -102,6 +102,7 @@ const config = {
setPreset(value) setPreset(value)
break break
case 'customTheme': case 'customTheme':
case 'customThemeSource':
applyTheme(value) applyTheme(value)
} }
} }

3
src/services/theme_data/theme_data.service.js
View file

@ -352,7 +352,8 @@ export const getColors = (sourceColors, sourceOpacity) => SLOT_ORDERED.reduce(({
} }
const opacitySlot = getOpacitySlot(key) const opacitySlot = getOpacitySlot(key)
const ownOpacitySlot = value.opacity const ownOpacitySlot = value.opacity
if (opacitySlot && (outputColor.a === undefined || ownOpacitySlot)) { const opacityOverriden = ownOpacitySlot && sourceOpacity[opacitySlot] !== undefined
if (opacitySlot && (outputColor.a === undefined || opacityOverriden)) {
const dependencySlot = deps[0] const dependencySlot = deps[0]
if (dependencySlot && colors[dependencySlot] === 'transparent') { if (dependencySlot && colors[dependencySlot] === 'transparent') {
outputColor.a = 0 outputColor.a = 0