pleroma-fe

commit: f58f294ee8d49ce0a7697fc1fa2dfaede42ec012
parent: dbcd8294e80a26fb4156de6825970f75bb6a1dfd
Author: Shpuld Shpludson <shp@cock.li>
Date:   Wed,  4 Mar 2020 06:20:28 +0000

Merge branch 'fix/themes-2.1-transparency-pink' into 'develop'

fix trasparency problems in some cases (purple headers)

See merge request pleroma/pleroma-fe!1079
Diffstat:
M
src/modules/config.js
1
+
M
src/services/theme_data/theme_data.service.js
3
++-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/config.js b/src/modules/config.js
@@ -102,6 +102,7 @@ const config = {
           setPreset(value)
           break
         case 'customTheme':
+        case 'customThemeSource':
           applyTheme(value)
       }
     }
diff --git 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