From e950c681c4f3160ea6284396e87bf28f80f40701 Mon Sep 17 00:00:00 2001
From: Enlcxx <Enlcxx.es@gmail.com>
Date: Sat, 14 Dec 2019 13:43:43 -0500
Subject: [PATCH] fix(): merge themes correctly

---
 src/app/app.module.ts | 2 +-
 src/lib/src/parse.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 293f5911a..4da96b530 100644
--- 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
index 2f7e56c13..95c705c11 100644
--- 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] });
         }
       }
     }