fix(): merge themes correctly

A-l-y-l-e · Dec 14, 2019 · e950c68 · e950c68
1 parent 54dbc97
commit e950c68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -95,7 +95,7 @@ export class GlobalVariables implements RecursivePartial<MinimaLight & MinimaDar
     default: '#ffc107',
     contrast: 'rgba(0, 0, 0, 0.87)'
   };
-  transparent = 'rgba(0, 0, 0, 0)';
+  transparent = new Color(0, 0, 0, 0);
   typography: LyTypographyTheme = {
     lyTyp: {
       subTitle: () => lyl `{

diff --git a/src/lib/src/parse.ts b/src/lib/src/parse.ts
@@ -353,7 +353,7 @@ export function mergeThemes(target: any, ...sources: any[]): any {
         if (targetKey instanceof StyleCollection && typeof sourceKey === 'function') {
           target[key] = (target[key] as StyleCollection).add(sourceKey);
         } else {
-          target[key] = source[key];
+          Object.assign(target, { [key]: source[key] });
         }
       }
     }