From d19c64314ff08391a2649681e6b64d052e600059 Mon Sep 17 00:00:00 2001
From: Henry Jameson <spam@hjkos.com>
Date: Thu, 20 Feb 2020 18:13:40 +0200
Subject: stop using customTheme in user card, instead use color slots. fix for
 opacity inheritance polluting inheritors

---
 src/services/theme_data/theme_data.service.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/services/theme_data/theme_data.service.js')

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
-- 
cgit v1.2.3-70-g09d2