diff options
| author | Henry Jameson <spam@hjkos.com> | 2020-02-20 18:13:40 +0200 |
|---|---|---|
| committer | Henry Jameson <spam@hjkos.com> | 2020-02-20 18:13:40 +0200 |
| commit | d19c64314ff08391a2649681e6b64d052e600059 (patch) | |
| tree | 5ed98646e9d7a8b74c77dd90b6976f42a797f1b2 /src/services/theme_data/theme_data.service.js | |
| parent | 0abc3f9b85f8a671a07d9a43b16d92c4b5568fab (diff) | |
stop using customTheme in user card, instead use color slots. fix for opacity
inheritance polluting inheritors
Diffstat (limited to 'src/services/theme_data/theme_data.service.js')
| -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 75768795..e6ff82e6 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -351,7 +351,8 @@ export const getColors = (sourceColors, sourceOpacity) => SLOT_ORDERED.reduce(({ throw new Error('Couldn\'t generate color for ' + key) } const opacitySlot = getOpacitySlot(key) - if (opacitySlot && outputColor.a === undefined) { + const ownOpacitySlot = value.opacity + if (opacitySlot && (outputColor.a === undefined || ownOpacitySlot)) { const dependencySlot = deps[0] if (dependencySlot && colors[dependencySlot] === 'transparent') { outputColor.a = 0 |