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

prioritize disabled opacity over transparent keyword

Browse source
This commit is contained in:
Henry Jameson 2020-03-06 21:20:42 +02:00
parent 9f2c1b4008
commit 7aa5bf0896
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -354,10 +354,10 @@ export const getColors = (sourceColors, sourceOpacity) => SLOT_ORDERED.reduce(({
const opacitySlot = value.opacity || getOpacitySlot(key) const opacitySlot = value.opacity || getOpacitySlot(key)
const ownOpacitySlot = value.opacity const ownOpacitySlot = value.opacity
if (sourceColor === 'transparent') { if (ownOpacitySlot === null) {
outputColor.a = 0
} else if (ownOpacitySlot === null) {
outputColor.a = 1 outputColor.a = 1
} else if (sourceColor === 'transparent') {
outputColor.a = 0
} else { } else {
const opacityOverriden = ownOpacitySlot && sourceOpacity[opacitySlot] !== undefined const opacityOverriden = ownOpacitySlot && sourceOpacity[opacitySlot] !== undefined