diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-03-04 15:42:37 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-03-04 15:42:37 +0000 |
| commit | 83d8343777050f6ee5fad09832b3878885eda4dd (patch) | |
| tree | a19ad2a67136fc21d7794848e811f092eb0e0706 /src/services | |
| parent | 1b9805b550444403792db2304b5a6d5681e8f30d (diff) | |
| parent | 147364b80cae7a0fac1ccf00b5669a20de1b7e67 (diff) | |
Merge branch 'develop' into 'master'
Update master with 2.0.0
See merge request pleroma/pleroma-fe!1080
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/theme_data/theme_data.service.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index e6ff82e6..de6561cd 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -352,7 +352,8 @@ export const getColors = (sourceColors, sourceOpacity) => SLOT_ORDERED.reduce(({ } const opacitySlot = getOpacitySlot(key) 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] if (dependencySlot && colors[dependencySlot] === 'transparent') { outputColor.a = 0 |