aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2020-03-06 21:20:42 +0200
committerHenry Jameson <me@hjkos.com>2020-03-06 21:20:42 +0200
commit7aa5bf0896c045d5d4a4e19fe7eff2c61fd2acf9 (patch)
treef738f280404837409e74749aff83af89febd3166
parent9f2c1b4008ef7bb77c98e80f75b41eaa9e92b90a (diff)
prioritize disabled opacity over transparent keyword
-rw-r--r--src/services/theme_data/theme_data.service.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js
index c3fdbd87..44fb575c 100644
--- a/src/services/theme_data/theme_data.service.js
+++ b/src/services/theme_data/theme_data.service.js
@@ -354,10 +354,10 @@ export const getColors = (sourceColors, sourceOpacity) => SLOT_ORDERED.reduce(({
const opacitySlot = value.opacity || getOpacitySlot(key)
const ownOpacitySlot = value.opacity
- if (sourceColor === 'transparent') {
- outputColor.a = 0
- } else if (ownOpacitySlot === null) {
+ if (ownOpacitySlot === null) {
outputColor.a = 1
+ } else if (sourceColor === 'transparent') {
+ outputColor.a = 0
} else {
const opacityOverriden = ownOpacitySlot && sourceOpacity[opacitySlot] !== undefined