From b584bb2d4ebc1b838007396f5e771bd6d5141502 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Thu, 15 Aug 2024 14:26:05 +0200
Subject: [PATCH] chore: Update Zen theme CSS to use CSS variables for element
 separation

---
 src/browser/app/profile/zen-browser.js               | 2 ++
 src/browser/base/content/zen-assets.jar.inc.mn       | 6 +++---
 src/browser/base/content/zen-components              | 2 +-
 src/toolkit/modules/ActorManagerParent-sys-mjs.patch | 5 +++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index a856594d0..f163d2af2 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -76,6 +76,7 @@ pref('zen.keyboard.shortcuts.enabled', true);
 pref('zen.keyboard.shortcuts', ""); // Empty string means default shortcuts
 pref('zen.keyboard.shortcuts.disable-firefox', false);
 pref('zen.tabs.dim-pending', true);
+pref('zen.themes.data', "{}");
 
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
@@ -147,3 +148,4 @@ pref("devtools.chrome.enabled", true);
 pref("sidebar.revamp", false, locked);
 pref("sidebar.verticalTabs", false, locked);
 
+
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index c85880bd3..a901b557e 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -9,7 +9,6 @@
         content/browser/zen-components/ZenProfileDialogUI.mjs   (content/zen-components/src/ZenProfileDialogUI.mjs)
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (content/zen-components/src/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemeBuilder.mjs      (content/zen-components/src/ZenThemeBuilder.mjs)
-        content/browser/zen-components/ZenThemeMarketplace.mjs  (content/zen-components/src/ZenThemeMarketplace.mjs)
 
         content/browser/zen-styles/zen-theme.css                (content/zen-styles/zen-theme.css)
         content/browser/zen-styles/zen-buttons.css              (content/zen-styles/zen-buttons.css)
@@ -37,5 +36,6 @@
 
         content/browser/zen-styles/zen-compact-mode.css         (content/zen-styles/zen-compact-mode.css)
 
-        # Other
-        content/browser/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs (content/zen-components/src/actors/ZenThemeMarketplaceChild.sys.mjs)
+        # Actors
+        content/browser/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs (content/zen-components/src/actors/ZenThemeMarketplaceParent.sys.mjs)
+        content/browser/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs  (content/zen-components/src/actors/ZenThemeMarketplaceChild.sys.mjs)
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index 52b4b2b7e..2e098ebf1 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit 52b4b2b7e46a5a883200137bc11103c3e3502281
+Subproject commit 2e098ebf17aefdcd374ecf6f17a0a220ce556653
diff --git a/src/toolkit/modules/ActorManagerParent-sys-mjs.patch b/src/toolkit/modules/ActorManagerParent-sys-mjs.patch
index a0de60d9b..0a343f061 100644
--- a/src/toolkit/modules/ActorManagerParent-sys-mjs.patch
+++ b/src/toolkit/modules/ActorManagerParent-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/modules/ActorManagerParent.sys.mjs b/toolkit/modules/ActorManagerParent.sys.mjs
-index 71409e58271802fc506999712519df63eff3b1a6..72b51d849bcbf7f1c0a7418da545bbbfb2b55d15 100644
+index 71409e58271802fc506999712519df63eff3b1a6..a136eb21a8abf1697b820ae4ab85224c56b725ec 100644
 --- a/toolkit/modules/ActorManagerParent.sys.mjs
 +++ b/toolkit/modules/ActorManagerParent.sys.mjs
-@@ -666,6 +666,19 @@ if (!Services.prefs.getBoolPref("browser.pagedata.enabled", false)) {
+@@ -666,6 +666,20 @@ if (!Services.prefs.getBoolPref("browser.pagedata.enabled", false)) {
    };
  }
  
@@ -17,6 +17,7 @@ index 71409e58271802fc506999712519df63eff3b1a6..72b51d849bcbf7f1c0a7418da545bbbf
 +    },
 +  },
 +  matches: ["https://*.zen-browser.app/*"],
++  allFrames: true,
 +};
 +
  if (AppConstants.platform != "android") {