Update submodule commit in l10n

Update zen-components submodule commit
2025-09-05 19:08:18 +00:00 · 2024-09-30 00:41:40 +02:00 · 2024-09-30 00:41:16 +02:00 · 2024-09-29 22:27:03 +03:00 · 2024-09-29 21:54:43 +03:00 · 2024-09-29 21:13:31 +02:00
39 changed files with 351 additions and 100 deletions
--- a/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml
+++ b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205830">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows-generic.mar" hashFunction="sha512" hashValue="ca66dda03aa051564c52c0e324e4f3d0246a0274f50f40c351e074bd905f8d21f5fc4e21abcb7e58544c1589b1e0d85923324e4e04491aec0e56ac55e27b1cd8" size="72276852"/>
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220503">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows-generic.mar" hashFunction="sha512" hashValue="a3cb65d8286bbfe126091d426f80521869ac34b35ed2b3e408abb2beed2211caf66e14bcec4cc7608c24533691427c3bed272338cded84952a3f474945f1d422" size="72356444"/>
  </update>
 </updates>
--- a/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml
+++ b/.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205830">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows-generic.mar" hashFunction="sha512" hashValue="ca66dda03aa051564c52c0e324e4f3d0246a0274f50f40c351e074bd905f8d21f5fc4e21abcb7e58544c1589b1e0d85923324e4e04491aec0e56ac55e27b1cd8" size="72276852"/>
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220503">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows-generic.mar" hashFunction="sha512" hashValue="a3cb65d8286bbfe126091d426f80521869ac34b35ed2b3e408abb2beed2211caf66e14bcec4cc7608c24533691427c3bed272338cded84952a3f474945f1d422" size="72356444"/>
  </update>
 </updates>
--- a/.github/workflows/object/windows-x64-signed-generic/windows-generic.mar
+++ b/.github/workflows/object/windows-x64-signed-generic/windows-generic.mar
--- a/.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
+++ b/.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
--- a/.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
+++ b/.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
--- a/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml
+++ b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205720">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows.mar" hashFunction="sha512" hashValue="f6db2c947f718e6bd91af7f7ba0b88117a1c08410819b4ae37a19f22cd3d7a0b3aec123271a41c8ac19bedebb2e5927286eb5a5d76e4bf5ba1e3b07db985c099" size="72375516"/>
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220342">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows.mar" hashFunction="sha512" hashValue="ca7f2506ea94095b0146820263e95f17888c06bf3eeda9728425e073c24a8f754143c3cd92b834a7583144eb2fb9a6a0618b1a961452e15a341cb5fd93d9af9d" size="72318312"/>
  </update>
 </updates>
--- a/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml
+++ b/.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205720">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows.mar" hashFunction="sha512" hashValue="f6db2c947f718e6bd91af7f7ba0b88117a1c08410819b4ae37a19f22cd3d7a0b3aec123271a41c8ac19bedebb2e5927286eb5a5d76e4bf5ba1e3b07db985c099" size="72375516"/>
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220342">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows.mar" hashFunction="sha512" hashValue="ca7f2506ea94095b0146820263e95f17888c06bf3eeda9728425e073c24a8f754143c3cd92b834a7583144eb2fb9a6a0618b1a961452e15a341cb5fd93d9af9d" size="72318312"/>
  </update>
 </updates>
--- a/.github/workflows/object/windows-x64-signed-specific/windows.mar
+++ b/.github/workflows/object/windows-x64-signed-specific/windows.mar
--- a/.github/workflows/object/windows-x64-signed-specific/zen.installer.exe
+++ b/.github/workflows/object/windows-x64-signed-specific/zen.installer.exe
--- a/.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
+++ b/.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ winget install --id Zen-Team.Zen-Browser
 winget install --id Zen-Team.Zen-Browser.Optimized
 ```

-#### 
+####

 ### macOS

@@ -111,6 +111,11 @@ Download and bootstrap the browser
 npm run init
 ```

+Copy a language pack
+```
+sh scripts/update-en-US-packs.sh
+```
+
 Start building the browser

 ```
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -5,6 +5,7 @@ param(
 $ErrorActionPreference = "Stop"

 echo "Preparing environment"
+git pull --recurse-submodules
 mkdir windsign-temp -ErrorAction SilentlyContinue

 echo "Please UNZIP the generic and specific artifacts into windsign-temp"
@@ -93,6 +94,12 @@ function SignAndPackage($name) {
 SignAndPackage specific
 SignAndPackage generic

+echo "All artifacts signed and packaged, ready for release!"
+echo "Commiting the changes to the repository"
+git add .\.github\workflows\object
+git commit -m "Sign and package windows artifacts"
+git push
+
 # Cleaning up

 echo "All done!"
--- a/2
+++ b/2
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -30,6 +30,9 @@ pref('browser.newtabpage.activity-stream.newtabWallpapers.enabled', true);
 pref('browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled', true);
 pref('browser.translations.newSettingsUI.enable', true);

+pref('privacy.userContext.enabled', true);
+pref('privacy.userContext.ui.enabled', true);
+
 pref("browser.urlbar.trimHttps", true);
 pref("browser.urlbar.untrimOnUserInteraction.featureGate", true);

@@ -96,11 +99,15 @@ pref('zen.view.sidebar-expanded.max-width', 400);

 pref('zen.view.sidebar-collapsed.hide-mute-button', true);

-pref('zen.keyboard.shortcuts.enabled', true);
-pref('zen.keyboard.shortcuts', ""); // Empty string means default shortcuts
+pref('zen.keyboard.shortcuts.enabled', true, locked);
+pref('zen.keyboard.shortcuts.version', 0); // Empty string means default shortcuts
 pref('zen.tabs.dim-pending', true);
 pref('zen.themes.updated-value-observer', false);

+pref('zen.tab-unloader.enabled', true);
+pref('zen.tab-unloader.timeout-minutes', 20);
+pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
+
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);

@@ -112,13 +119,14 @@ pref('zen.sidebar.close-on-blur', true);
 // Zen Split View
 pref('zen.splitView.working', false);
 pref('zen.splitView.min-resize-width', 7);
+pref('zen.splitView.change-on-hover', false);

 // Zen Workspaces
 pref('zen.workspaces.enabled', true);
 pref('zen.workspaces.hide-default-container-indicator', true);
 pref('zen.workspaces.individual-pinned-tabs', true);
 pref('zen.workspaces.show-icon-strip', true);
-pref('zen.workspaces.icons', '["🌐", "📁", "📎", "📝", "📅", "📊"]');
+pref('zen.workspaces.icons', '["🌐", "📁", "💼", "📝", "📅", "📊","🧠"]');

 // Zen Watermark
 pref('zen.watermark.enabled', true, sticky);
--- a/src/browser/base/content/ZenCustomizableUI.sys.mjs
+++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs
@@ -18,7 +18,8 @@ export var ZenCustomizableUI = new class {
          "preferences-button", "zen-expand-sidebar-button", "zen-profile-button"
        ],
        defaultCollapsed: null,
-      }
+      },
+      true
    );
    CustomizableUIInternal.registerArea(
      "zen-sidebar-icons-wrapper",
@@ -26,7 +27,8 @@ export var ZenCustomizableUI = new class {
        type: this.TYPE_TOOLBAR,
        defaultPlacements: this.defaultSidebarIcons,
        defaultCollapsed: null,
-      }
+      },
+      true
    );
  }

@@ -44,7 +46,6 @@ export var ZenCustomizableUI = new class {
        brighttext="true"
        data-l10n-id="tabs-toolbar"
        customizable="true"
-        toolbarname="Zen Sidebar Top Buttons"
        context="toolbar-context-menu"
        flex="1"
        skipintoolbarset="true"
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -8,7 +8,7 @@
      window.SessionStore.promiseInitialized.then(async () => {
        this._changeSidebarLocation();
        this._zenInitBrowserLayout();
-        this._focusSearchBar();
+        this._initSearchBar();
      });
    },

@@ -125,8 +125,13 @@
      toolbox.insertAdjacentElement('afterend', splitter);
    },

-    _focusSearchBar() {
+    _initSearchBar() {
+      // Only focus the url bar 
      gURLBar.focus();
+
+      gURLBar._initCopyCutController();
+      gURLBar._initPasteAndGo();
+      gURLBar._initStripOnShare();
    },

    logHeader() {
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..e1d1cf3bb925b8efb1411d1dc77a56f086858b5a 100644
+index a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..bc22e55a66686fbae95047686f845f71a0c3aae9 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
@@ -32,6 +32,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -26,17 +26,18 @@ index a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..e1d1cf3bb925b8efb1411d1dc77a56f0
 customElements.setElementCreationCallback("screenshots-buttons", () => {
   Services.scriptloader.loadSubScript(
     "chrome://browser/content/screenshots/screenshots-buttons.js",
-@@ -3435,6 +3445,9 @@ var XULBrowserWindow = {
+@@ -3435,6 +3445,10 @@ var XULBrowserWindow = {
     AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
     TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
 
 +    gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
 +    ZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
+    gZenTabUnloader.onLocationChange(gBrowser.selectedBrowser);
 +
     PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
 
     if (!gMultiProcessBrowser) {
-@@ -4769,7 +4782,7 @@ function setToolbarVisibility(
+@@ -4769,7 +4783,7 @@ function setToolbarVisibility(
       );
     }
 
@@ -45,7 +46,7 @@ index a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..e1d1cf3bb925b8efb1411d1dc77a56f0
     switch (isVisible) {
       case true:
       case "always":
-@@ -7609,6 +7622,12 @@ var gDialogBox = {
+@@ -7609,6 +7623,12 @@ var gDialogBox = {
     parentElement.showModal();
     this._didOpenHTMLDialog = true;
 
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -31,6 +31,7 @@ window.addEventListener("DOMContentLoaded", async () => {
  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCompactMode.mjs");
  Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs");
  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenSidebarManager.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenTabUnloader.mjs");
  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs");
  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs");
  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenProfileDialogUI.mjs");
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -13,6 +13,7 @@
        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/ZenThemesImporter.mjs    (content/zen-components/src/ZenThemesImporter.mjs)
+        content/browser/zen-components/ZenTabUnloader.mjs       (content/zen-components/src/ZenTabUnloader.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)
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
--- a/src/browser/base/content/zen-sidebar-icons.inc.xhtml
+++ b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
@@ -4,7 +4,7 @@
  class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
  data-l10n-id="tabs-toolbar"
  customizable="true"
-  toolbarname="Zen Sidebar Icons"
+  skipintoolbarset="true"
  context="toolbar-context-menu"
  mode="icons">
  <toolbarbutton removeable="true" class="toolbarbutton-1 zen-sidebar-action-button" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>
--- a/src/browser/base/content/zen-sidebar-panel.inc.xhtml
+++ b/src/browser/base/content/zen-sidebar-panel.inc.xhtml
@@ -1,6 +1,6 @@
 <hbox id="zen-sidebar-web-panel-wrapper">
  <box id="zen-sidebar-web-panel" class="chromeclass-extrachrome" hidden="true" persist="pinned style hidden">
-    <toolbar mode="icons" flex="1" id="zen-sidebar-web-header">
+    <toolbar mode="icons" flex="1" id="zen-sidebar-web-header" fullscreentoolbar="true">
      <hbox>
        <toolbarbutton id="zen-sidebar-web-panel-back" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.back();"/>
        <toolbarbutton id="zen-sidebar-web-panel-forward" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.forward();"/>
@@ -20,13 +20,15 @@
        <html:p data-l10n-id="zen-sidebar-introduction-description"/>
      </vbox>
    </vbox>
-    <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" class="zen-dont-hide-on-fullscreen">
-      <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" class="zen-dont-hide-on-fullscreen">
+    <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" fullscreentoolbar="true">
+      <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" fullscreentoolbar="true">
        
      </toolbar>
      <toolbarbutton id="zen-sidebar-add-panel-button" class="zen-sidebar-panel-button toolbarbutton-1 chromeclass-toolbar-additional" onclick="gZenBrowserManagerSidebar._openAddPanelDialog();"/>
    </toolbar>
-    <html:span id="zen-sidebar-web-panel-splitter"></html:span>
-    <html:span id="zen-sidebar-web-panel-hsplitter"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" side="left"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" side="right"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" orient="horizontal" side="top"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" orient="horizontal" side="bottom"></html:span>
  </box>
 </hbox>
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -33,10 +33,6 @@
  width: 100%;
 }

-:root:not([inDOMFullscreen='true']) #appcontent {
-  overflow: hidden;
-}
-
 :root:not([inDOMFullscreen='true']) #appcontent,
 #sidebar-box {
  /** Sidebar is already hidden in full screen mode */
@@ -57,5 +53,5 @@
 }

 :root:not([inDOMFullscreen='true']) #tabbrowser-tabbox {
-  padding: 1px; /* To allow the web view's shadow to be visible */
+  padding: 2px; /* To allow the web view's shadow to be visible */
 }
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -33,8 +33,9 @@
      }

      #navigator-toolbox {
+        --zen-toolbox-max-width: 54px !important;
        position: absolute;
-        height: 98%;
+        height: calc(98% - var(--zen-element-separation));
        z-index: 9;
        background: var(--zen-themed-toolbar-bg) !important;
        box-shadow: 0 0 2px 2px rgba(0,0,0,.1);
@@ -45,11 +46,9 @@
        padding: var(--zen-toolbox-padding) !important;
        transition: all 0.2s ease-in-out;
        right: calc(100% - var(--zen-element-separation) + 1px);
-        top: 50%;
+        top: 1%;
        opacity: 0;

-        transform: translate3d(0, -50%, 0);
-
        #browser:has(#navigator-toolbox[zen-right-side='true']) & {
          border-left-width: 1px;
          border-right-width: 0;
@@ -77,9 +76,9 @@
      #navigator-toolbox:has(*[open='true']:not(tab):not(#zen-sidepanel-button)) {
        opacity: 1;
        
-        transform: translate3d(calc(100% - var(--zen-element-separation)), -50%, 0);
+        transform: translateX(calc(100% - var(--zen-element-separation)));
        #browser:has(#navigator-toolbox[zen-right-side='true']) & {
-          transform: translate3d(calc(-100% + var(--zen-element-separation)), -50%, 0);
+          transform: translateX(calc(-100% + var(--zen-element-separation)));
        }
      }
    }
@@ -110,8 +109,12 @@
        width: 100%;
        opacity: 0;

-        border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
-        border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
+        :root[tabsintitlebar][sizemode="normal"]:not([gtktiledwindow="true"]) & {
+          border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
+          border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
+          border-left-width: 0;
+          border-right-width: 0;
+        }
      }

      #zen-appcontent-navbar-container:hover,
--- a/src/browser/base/content/zen-styles/zen-sidebar-panels.css
+++ b/src/browser/base/content/zen-styles/zen-sidebar-panels.css
@@ -70,7 +70,7 @@
 #zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel[pinned='true']) {
  position: absolute;
  z-index: 1;
-  width: -moz-available;
+  width: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3);
  margin: var(--zen-sidebar-web-panel-spacing);
  /* Why times 3? 
   *  + 1 for the top margin, making the element overflow the view.
@@ -83,7 +83,8 @@
 #zen-sidebar-web-panel {
  border-radius: var(--zen-panel-radius);
  overflow: hidden;
-  box-shadow: 0 0 0 1px var(--zen-colors-border);
+  box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--zen-colors-border);
  background: var(--zen-colors-tertiary);
  opacity: 0;
  animation-delay: 0.1s;
@@ -101,10 +102,10 @@
  height: unset !important;
 }

-#zen-sidebar-web-panel-splitter {
+.zen-sidebar-web-panel-splitter {
  position: absolute;
  top: 0;
-  right: 0;
+  left: 0;
  height: 100%;
  width: 4px;
  background: transparent;
@@ -112,21 +113,26 @@
  cursor: ew-resize;
 }

-#zen-sidebar-web-panel-hsplitter {
-  position: absolute;
-  bottom: -2px;
-  left: 0;
+.zen-sidebar-web-panel-splitter[side='right'] {
+  left: initial;
+  right: 0;
+}
+
+.zen-sidebar-web-panel-splitter[orient='horizontal'] {
  width: 100%;
  height: 7px;
-  background: transparent;
-  border: none;
  cursor: ns-resize;
 }

-#zen-sidebar-web-panel[hidden='true'] #zen-sidebar-web-panel-hsplitter,
-#zen-sidebar-web-panel-wrapper[hidden='true'] + #zen-sidebar-web-panel-splitter,
-#zen-sidebar-web-panel-wrapper[hidden='true'] + #zen-sidebar-web-panel-hsplitter,
-#zen-sidebar-web-panel:not([pinned='true']) #zen-sidebar-web-panel-hsplitter {
+.zen-sidebar-web-panel-splitter[side='bottom'] {
+  top: initial;
+  bottom: -2px;
+}
+
+#zen-sidebar-web-panel[hidden='true'] .zen-sidebar-web-panel-splitter,
+#zen-sidebar-web-panel-wrapper[hidden='true'] + .zen-sidebar-web-panel-splitter,
+#zen-sidebar-web-panel:not([pinned='true']) .zen-sidebar-web-panel-splitter[orient='horizontal'],
+#zen-sidebar-web-panel:not([pinned='true']) .zen-sidebar-web-panel-splitter[side='left'] {
  display: none;
  margin: 0;
 }
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -31,10 +31,11 @@
    min-width: var(--zen-toolbox-min-width);
    margin-top: 0 !important; /* Fix full screen mode */

-    padding: var(--zen-toolbox-padding);
    padding-top: var(--zen-toolbox-top-align);
    padding-bottom: var(--zen-element-separation);

+    order: 0 !important;
+
    display: flex;
  }

@@ -162,6 +163,10 @@
    #navigator-toolbox[zen-expanded='true']:not([zen-user-hover='true'])) {
    --zen-toolbox-min-width: fit-content;

+    & {
+      padding: var(--zen-toolbox-padding);
+    }
+
    & #titlebar {
      min-width: 150px;
    }
@@ -276,8 +281,8 @@
    #navigator-toolbox[zen-user-hover='true']:has(*[open='true']:not(tab):not(#zen-sidepanel-button)),
    #navigator-toolbox[zen-expanded='true']:not([zen-user-hover='true']))) {
    --zen-toolbox-max-width: 45px;
+    --zen-toolbox-padding: 8px;
    max-width: var(--zen-toolbox-max-width) !important;
-    min-width: calc(var(--zen-toolbox-max-width) + var(--zen-toolbox-padding) / 2 + 2px) !important;

    & #vertical-tabs-newtab-button {
      padding: 0 !important;
@@ -460,6 +465,11 @@
      height: 100%;

      border-top-right-radius: var(--zen-border-radius);
+      width: var(--zen-toolbox-max-width);
+
+      & .tabbrowser-tab {
+        transition: 0s !important;
+      }
    }

    #navigator-toolbox[zen-has-hover],
@@ -469,10 +479,9 @@
    #navigator-toolbox[has-popup-menu],
    #navigator-toolbox:has(.tabbrowser-tab:active),
    #navigator-toolbox:has(*[open='true']:not(tab):not(#zen-sidepanel-button)) {
-      --zen-navigation-toolbar-min-width: 55.5px !important; /* + the width of the splitter */
-
-      max-width: var(--zen-navigation-toolbar-min-width) !important;
-      min-width: var(--zen-navigation-toolbar-min-width) !important;
+      --zen-toolbox-max-width: 41px;
+      max-width: var(--zen-toolbox-max-width) !important;
+      min-width: calc(var(--zen-toolbox-max-width) + var(--zen-toolbox-padding) / 2 + 3px) !important;
      padding: 0 !important;

      & #TabsToolbar {
@@ -484,8 +493,69 @@
        position: absolute;
        padding: var(--zen-toolbox-padding);
        transition: 0 !important;
-        animation: zen-vtabs-animation 0.3s ease-in-out;
+        /*animation: zen-vtabs-animation 0.3s ease-in-out;*/
        -moz-window-dragging: no-drag;
+        overflow: hidden;
+        transition: width .2s !important;
+
+        & .tab-throbber,
+        & .tab-icon-pending,
+        & .tab-icon-image,
+        & .tab-sharing-icon-overlay,
+        & .tab-icon-overlay {
+          transition: 0.1s !important;
+        }
+
+      }
+
+      /* Make pinned tabs stay in a single line */
+      #vertical-pinned-tabs-container {
+        display: flex;
+        flex-direction: column;
+        gap: 0 !important;
+
+        margin-bottom: 8px;
+        position: relative;
+  
+        &::after {
+          bottom: -4px;
+          content: '';
+          display: block;
+          height: 1px;
+          background: color-mix(in srgb, var(--zen-colors-border) 80%, transparent 20%);
+          width: 99%;
+          left: 50%;
+          transform: translateX(-50%);
+          position: absolute;
+        }
+
+        & .tabbrowser-tab {
+          & .tab-label-container {
+            display: flex;
+          }
+
+          & .tab-throbber,
+          & .tab-icon-pending,
+          & .tab-icon-image,
+          & .tab-sharing-icon-overlay,
+          & .tab-icon-overlay {
+            margin-inline-end: var(--toolbarbutton-inner-padding) !important;
+          }
+
+          &:hover .tab-close-button {
+            display: block !important;
+          }
+
+          & .tab-background {
+            box-shadow: none;
+
+            background: transparent !important;
+          }
+
+          &:hover .tab-background {
+            background-color: var(--tab-hover-background-color) !important;
+          }
+        }
      }

      &[zen-right-side='true'] #TabsToolbar {
@@ -513,11 +583,11 @@
  /* Mark: Move sidebar to the right */
  #browser:has(#navigator-toolbox[zen-right-side='true']) {
    & #navigator-toolbox {
-      order: 3;
+      order: 3 !important;
    }

    & #zen-sidebar-splitter {
-      order: 2;
+      order: 2 !important;
    }
  }

@@ -561,7 +631,7 @@
      align-items: center;

      #nav-bar:has(&) & {
-        padding-inline-start: calc(var(--zen-toolbox-padding) + var(--toolbarbutton-outer-padding));
+        padding-inline-start: var(--toolbarbutton-outer-padding);
      }

      #browser:has(#navigator-toolbox[zen-right-side='true']) & {
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -68,6 +68,8 @@
  --button-primary-active-bgcolor: var(--in-content-primary-button-background-active) !important;
  --button-primary-color: var(--in-content-primary-button-text-color) !important;

+  --color-accent-primary-hover: var(--zen-primary-color) !important;
+
  --in-content-page-background: var(--zen-colors-tertiary) !important;
  --zen-in-content-dialog-background: var(--zen-colors-tertiary);

@@ -112,7 +114,7 @@

  --input-bgcolor: var(--zen-colors-tertiary) !important;
  --input-border-color: var(--zen-input-border-color) !important;
-  --zen-themed-toolbar-bg: var(--zen-colors-tertiary);
+  --zen-themed-toolbar-bg: light-dark(#eeeded, var(--zen-colors-tertiary)) !important;

  --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
  --arrowpanel-background: var(--zen-dialog-background) !important;
@@ -172,7 +174,7 @@

@media not (-moz-bool-pref: 'zen.theme.toolbar-themed') {
  :root {
-    --toolbar-bgcolor: light-dark(white, #1b1b1b) !important;
+    --toolbar-bgcolor: light-dark(#E6E6E6, #1b1b1b) !important;
    --zen-themed-toolbar-bg: var(--toolbar-bgcolor);
  }
 }
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..56b42e2d025e4a47ea0983cf33ae69ffafa0d576 100644
+index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..39637cc8aea988c77e5a6c66a85ec66acd4ca4bc 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
@@ -196,6 +196,10 @@ function init_all() {
@@ -7,7 +7,7 @@ index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..56b42e2d025e4a47ea0983cf33ae69ff
   Preferences.queueUpdateOfAllElements();
   Services.telemetry.setEventRecordingEnabled("aboutpreferences", true);
 +  register_module("paneZenLooks", gZenLooksAndFeel);
-+  register_module("paneZenWorkspaces", gZenWorkspacesSettings);
+  register_module("paneZenTabManagement", gZenWorkspacesSettings);
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
 
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050a8415bab 100644
+index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6cb0b49ae 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
@@ -43,6 +43,8 @@
@@ -39,15 +39,15 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050
 +          <label class="category-name" flex="1" data-l10n-id="pane-zen-looks-title"></label>
 +        </richlistitem>
 +
-+        <richlistitem id="category-zen-workspaces"
+        <richlistitem id="category-zen-tabs-management"
 +                      class="category"
-+                      value="paneZenWorkspaces"
+                      value="paneZenTabManagement"
 +                      helpTopic="prefs-main"
 +                      data-l10n-id="category-zen-workspaces"
 +                      data-l10n-attrs="tooltiptext"
 +                      align="center">
 +          <image class="category-icon"/>
-+          <label class="category-name" flex="1" data-l10n-id="pane-zen-workspaces-title"></label>
+          <label class="category-name" flex="1" data-l10n-id="pane-zen-tabs-title"></label>
 +        </richlistitem>
 +
 +        <richlistitem id="category-zen-CKS"
@@ -95,7 +95,7 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050
 #include moreFromMozilla.inc.xhtml
 +#include zenLooksAndFeel.inc.xhtml
 +#include zenKeyboardShortcuts.inc.xhtml
-+#include zenWorkspaces.inc.xhtml
+#include zenTabsManagement.inc.xhtml
 +#include zenMarketplace.inc.xhtml
         </vbox>
       </vbox>
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -185,6 +185,7 @@ var gZenMarketplaceManager = {
          .closest('.zenThemeMarketplaceItem')
          .querySelector('.zenThemeMarketplaceItemUninstallButton')
          .getAttribute('zen-theme-id');
+        event.target.setAttribute('disabled', true);

        if (!event.target.hasAttribute('pressed')) {
          await this.disableTheme(themeId);
@@ -203,6 +204,10 @@ var gZenMarketplaceManager = {
            document.getElementById(`zenThemeMarketplaceItemConfigureButton-${sanitizedName}`).removeAttribute('hidden');
          }
        }
+        setTimeout(() => {
+          // We use a timeout to make sure the theme list has been updated before re-enabling the button.
+          event.target.removeAttribute('disabled');
+        }, 400);
      });

      fragment.querySelector('.zenThemeMarketplaceItemTitle').textContent = themeName;
@@ -665,15 +670,16 @@ var zenMissingKeyboardShortcutL10n = {
  key_gotoHistory: "zen-key-goto-history",

  goHome: "zen-key-go-home",
+  key_redo: "zen-key-redo",
 }  

 var gZenCKSSettings = {
  async init() {
+    await this._initializeCKS();
    if (this.__hasInitialized) return;
    this.__hasInitialized = true;
    this._currentActionID = null;
    this._initializeEvents();
-    await this._initializeCKS();
  },

  _initializeEvents() {
@@ -698,6 +704,7 @@ var gZenCKSSettings = {

  async _initializeCKS() {
    let wrapper = document.getElementById(ZEN_CKS_WRAPPER_ID);
+    wrapper.innerHTML = '';

    let shortcuts = await gZenKeyboardShortcutsManager.getModifiableShortcuts();

@@ -727,9 +734,9 @@ var gZenCKSSettings = {
      
      let fragment = window.MozXULElement.parseXULToFragment(`
        <hbox class="${ZEN_CKS_CLASS_BASE}">
-          <label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${action}"></label>
+          <label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${keyID}"></label>
          <vbox flex="1">
-            <html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${action}" />
+            <html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${keyID}" />
          </vbox>
        </hbox>
      `);
@@ -756,18 +763,32 @@ var gZenCKSSettings = {
        const value = event.target.getAttribute(KEYBIND_ATTRIBUTE_KEY);
        this._currentActionID = event.target.getAttribute('data-id');
        event.target.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
+        this._hasSafed = true;
      });

      input.addEventListener('editDone', (event) => {
        const target = event.target;
        target.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
-        this._editDone(target);
      });

      input.addEventListener('blur', (event) => {
        const target = event.target;
        target.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
-        this._editDone(target);
+        if (!this._hasSafed) {
+          target.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
+          if (!target.nextElementSibling) {
+            target.after(window.MozXULElement.parseXULToFragment(`
+              <label class="${ZEN_CKS_CLASS_BASE}-unsafed" data-l10n-id="zen-key-unsafed"></label>
+            `));
+            target.value = 'Not set';
+          }
+        } else {
+          target.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
+          const sibling = target.nextElementSibling;
+          if (sibling && sibling.classList.contains(`${ZEN_CKS_CLASS_BASE}-unsafed`)) {
+            sibling.remove();
+          }
+        }
      });

      const groupElem = wrapper.querySelector(`[data-group="${ZEN_CKS_GROUP_PREFIX}-${group}"]`);
@@ -798,23 +819,18 @@ var gZenCKSSettings = {

  //TODO Check for duplicates
  async _handleKeyDown(event) {
-    if (!this._currentActionID) {
+    if (!this._currentActionID || document.hidden) {
      return;
    }

    event.preventDefault();

    let input = document.querySelector(`.${ZEN_CKS_INPUT_FIELD_CLASS}[${KEYBIND_ATTRIBUTE_KEY}="${this._currentActionID}"]`);
-    let accelKey = false;
-    let controlKey = false;
-    if (AppConstants.platform === 'macosx') {
-      accelKey = event.ctrlKey;
-    } else {
-      accelKey = event.ctrlKey;
-    }
-    const modifiers = new KeyShortcutModifiers(controlKey, event.altKey, event.shiftKey, event.metaKey, accelKey);
+    const modifiers = new KeyShortcutModifiers(event.ctrlKey, event.altKey, event.shiftKey, event.metaKey, false);
    const modifiersActive = modifiers.areAnyActive();

+    input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
+
    let shortcut = event.key;

    shortcut = shortcut.replace(/Ctrl|Control|Shift|Alt|Option|Cmd|Meta/, ''); // Remove all modifiers
@@ -833,14 +849,14 @@ var gZenCKSSettings = {
        if (!input.classList.contains(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`)) {
          input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
        }
+        input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
        if (hasConflicts && !input.nextElementSibling) {
          input.after(window.MozXULElement.parseXULToFragment(`
-            <label class="${ZEN_CKS_CLASS_BASE}-conflict">Conflict with another shortcut</label>
+            <label class="${ZEN_CKS_CLASS_BASE}-conflict" data-l10n-id="zen-key-conflict"></label>
          `));
        }
      } else {
        input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
-        input.blur();

        this._editDone(this._latestValidKey, this._latestModifier);
        this._latestValidKey = null;
@@ -855,6 +871,7 @@ var gZenCKSSettings = {
          sibling.remove();
        }
      }
+      this._hasSafed = true;
      input.blur();
      this._currentActionID = null;
      return;
@@ -862,10 +879,12 @@ var gZenCKSSettings = {
      this._resetShortcut(input);
      this._latestValidKey = null;
      this._latestModifier = null;
+      this._hasSafed = true;
      return;
    }

    this._latestModifier = modifiers;
+    this._hasSafed = false;
    input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
    input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
    input.value = modifiers.toUserString() + shortcut;
@@ -939,4 +958,19 @@ Preferences.addAll([
    type: 'bool',
    default: true,
  },
+  {
+    id: 'zen.tab-unloader.enabled',
+    type: 'bool',
+    default: true,
+  },
+  {
+    id: 'zen.view.split-view.change-on-hover',
+    type: 'bool',
+    default: true,
+  },
+  {
+    id: 'zen.tab-unloader.timeout-minutes',
+    type: 'int',
+    default: 10,
+  }
 ]);
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -255,6 +255,22 @@
      </hbox>
 </groupbox>

+<hbox id="zenSplitViewCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenLooks">
+<html:h1 data-l10n-id="zen-split-view-title"/>
+</hbox>
+
+<groupbox id="zenSplitViewGroup" data-category="paneZenLooks" hidden="true" class="highlighting-group">
+      <label><html:h2 data-l10n-id="zen-split-view-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-split-view-description" />
+
+      <checkbox id="zenLooksAndFeelSplitViewChangeOnHover"
+            data-l10n-id="zen-split-view-change-on-hover"
+            preference="zen.view.split-view.change-on-hover"/>
+</groupbox>
+
 <hbox id="zenVerticalTabsCategory"
      class="subcategory"
      hidden="true"
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -1,19 +1,19 @@
-<html:template id="template-paneZenWorkspaces">
+<html:template id="template-paneZenTabManagement">
 <hbox id="ZenWorkspacesCategory"
      class="subcategory"
      hidden="true"
-      data-category="paneZenWorkspaces">
+      data-category="paneZenTabManagement">
 <html:h1 data-l10n-id="pane-workspaces-title"/>
 </hbox>

 <hbox id="zenSidePanelsCategory"
      class="subcategory"
      hidden="true"
-      data-category="paneZenWorkspaces">
+      data-category="paneZenTabManagement">
 <html:h1 data-l10n-id="pane-settings-workspaces-title"/>
 </hbox>

-<groupbox id="zenSidePanelsGroup" data-category="paneZenWorkspaces" hidden="true" class="highlighting-group">
+<groupbox id="zenWorkspacesGroup" data-category="paneZenTabManagement" hidden="true" class="highlighting-group">
      <label><html:h2 data-l10n-id="zen-settings-workspaces-header"/></label>
      <description class="description-deemphasized" data-l10n-id="zen-settings-workspaces-description" />

@@ -33,4 +33,32 @@
      </vbox>
 </groupbox>

+<hbox id="zenTabsUnloadCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenTabManagement">
+<html:h1 data-l10n-id="pane-zen-tabs-unloader-title"/>
+</hbox>
+
+<groupbox id="zenTabsUnloadGroup" data-category="paneZenTabManagement" hidden="true" class="highlighting-group">
+      <label><html:h2 data-l10n-id="zen-tabs-unloader-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-description" />
+
+      <checkbox id="zenTabsUnloadActivate"
+            data-l10n-id="zen-tabs-unloader-enabled"
+            preference="zen.tab-unloader.enabled"/>
+
+      <label><html:h2 data-l10n-id="zen-tabs-unloader-unload-delay"/></label>
+      <hbox id="zenTabsUnloadDelayContainer">
+            <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-unload-delay-description" />
+            <html:input id="zenTabsUnloadDelay"
+                  type="number"
+                  min="1"
+                  max="1000"
+                  preference="zen.tab-unloader.timeout-minutes"/>
+      </hbox>
+</groupbox>
+
 </html:template>
+
+
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 282e7f31fe158d929130c17628f7e30f690fd666..213e6f1ea1cd454b4d0f3679a5acb414b0ef9242 100644
+index 282e7f31fe158d929130c17628f7e30f690fd666..c139830f6bbd84428310692cfb840bc390c5c6f3 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
@@ -1387,10 +1387,12 @@
@@ -18,6 +18,15 @@ index 282e7f31fe158d929130c17628f7e30f690fd666..213e6f1ea1cd454b4d0f3679a5acb414
       selectedTab._notselectedsinceload = false;
     }
 
+@@ -1449,7 +1451,7 @@
+         let tabsToReset = [];
+         for (let i = numPinned; i < tabs.length; i++) {
+           let tab = tabs[i];
+-          tab.style.setProperty("max-width", aTabWidth, "important");
+          //tab.style.setProperty("max-width", aTabWidth, "important");
+           if (!isEndTab) {
+             // keep tabs the same width
+             tab.style.transition = "none";
@@ -1629,7 +1631,7 @@
       }
 
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -305,10 +305,19 @@ groupbox h2 {

 /* Workspace */

-#category-zen-workspaces > .category-icon {
+#category-zen-tabs-management > .category-icon {
  list-style-image: url('chrome://browser/skin/window.svg');
 }

+#zenTabsUnloadDelayContainer {
+  display: flex;
+  align-items: center;
+
+  & #zenTabsUnloadDelay {
+    margin-left: auto;
+  }
+}
+
 /* CKS */

 #category-zen-CKS > .category-icon {
@@ -367,10 +376,20 @@ groupbox h2 {
  margin-top: 5px;
 }

+.zenCKSOption-unsafed {
+  color: yellow;
+  margin-left: 10px;
+  margin-top: 5px;
+}
+
 .zenCKSOption-input.zenCKSOption-input-invalid {
  border-color: red;
 }

+.zenCKSOption-input.zenCKSOption-input-unsafed {
+  border-color: yellow;
+}
+
 .zenCKSOption-input.zenCKSOption-input-valid {
  border-color: green;
 }
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -975,6 +975,11 @@ menuitem[id='placesContext_new:separator'] {
  --menu-image: url('close-all.svg');
 }

+#context_zenUnloadTab,
+#context_zenTabActions {
+  --menu-image: url('close-all.svg');
+}
+
 .customize-context-reportExtension,
 .unified-extensions-context-menu-report-extension {
  --menu-image: url('report.svg');
--- a/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
+++ b/src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch
@@ -0,0 +1,13 @@
+diff --git a/toolkit/content/widgets/moz-toggle/moz-toggle.css b/toolkit/content/widgets/moz-toggle/moz-toggle.css
+index 8509f15f02f01b3259e6b6ddf97203e7aa8e9e60..989bd48d3615210cc090a6e753d86bd23fcb46b6 100644
+--- a/toolkit/content/widgets/moz-toggle/moz-toggle.css
+++ b/toolkit/content/widgets/moz-toggle/moz-toggle.css
+@@ -34,7 +34,7 @@
+   --toggle-background-color: var(--button-background-color);
+   --toggle-background-color-hover: var(--button-background-color-hover);
+   --toggle-background-color-active: var(--button-background-color-active);
+-  --toggle-background-color-pressed: var(--color-accent-primary);
+  --toggle-background-color-pressed: var(--zen-primary-color);
+   --toggle-background-color-pressed-hover: var(--color-accent-primary-hover);
+   --toggle-background-color-pressed-active: var(--color-accent-primary-active);
+   --toggle-border-color: var(--border-color-interactive);
--- a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..911a6494812f0496ac928489244f2ac7bf0ed025 100644
+index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..de55b4c7ff7517169ac56693b4cb3c46b3c20736 100644
 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
 +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-@@ -1214,7 +1214,7 @@ var AddonManagerInternal = {
+@@ -1214,12 +1214,12 @@ var AddonManagerInternal = {
         ITEM_VERSION: aAddon.version,
         ITEM_STATUS: addonStatus,
         APP_ID: Services.appinfo.ID,
@@ -11,3 +11,9 @@ index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..911a6494812f0496ac928489244f2ac7
         REQ_VERSION: UPDATE_REQUEST_VERSION,
         APP_OS: Services.appinfo.OS,
         APP_ABI: Services.appinfo.XPCOMABI,
+         APP_LOCALE: getLocale(),
+-        CURRENT_APP_VERSION: Services.appinfo.version,
+        CURRENT_APP_VERSION: AppConstants.ZEN_FIREFOX_VERSION,
+       })
+     );
+ 
--- a/src/toolkit/mozapps/extensions/internal/AddonUpdateChecker-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/internal/AddonUpdateChecker-sys-mjs.patch
@@ -0,0 +1,13 @@
+diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
+index 5b7b10a7641c57e1f5206fb57030c8c2afb60971..a1161428e6ae4141b3d6767042edf90935694121 100644
+--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
+++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
+@@ -558,7 +558,7 @@ export var AddonUpdateChecker = {
+     aIgnoreStrictCompat
+   ) {
+     if (!aAppVersion) {
+-      aAppVersion = Services.appinfo.version;
+      aAppVersion = Services.appinfo.platformVersion;
+     }
+     if (!aPlatformVersion) {
+       aPlatformVersion = Services.appinfo.platformVersion;
--- a/surfer.json
+++ b/surfer.json
@@ -18,7 +18,7 @@
      "brandShortName": "Zen Browser",
      "brandFullName": "Zen Browser",
      "release": {
-        "displayVersion": "1.0.1-a.5",
+        "displayVersion": "1.0.1-a.6",
        "github": {
          "repo": "zen-browser/desktop"
        },
Author	SHA1	Message	Date
mauro-balades	49de0de5ca	Update submodule commit in l10n	2024-09-30 00:41:40 +02:00
mauro-balades	84f0a478b4	Update zen-components submodule commit	2024-09-30 00:41:16 +02:00
Mauro Baladés	58fcbd9dfa	Update zen-components submodule commit ``	2024-09-29 22:27:03 +03:00
Mauro Baladés	69093204b9	Update sign.ps1 script to include git pull command	2024-09-29 21:54:43 +03:00
mauro-balades	021e654202	Update submodule commit in l10n	2024-09-29 21:13:31 +02:00
mauro-balades	f7ebf48e49	Fixed not updating the theme list when spamming the disabled button	2024-09-29 20:54:18 +02:00
mauro-balades	7369490478	🔖 Update version to 1.0.1-a.6	2024-09-29 18:19:28 +00:00
mauro-balades	6117c4a877	Update zen-components submodule commit	2024-09-29 20:18:37 +02:00
mauro-balades	03fe76b14a	Fixed workspace cycling with shortcuts	2024-09-29 19:03:28 +02:00
mauro-balades	4eaf8ddaa2	Fixed workspace cycle using shortcuts	2024-09-29 19:01:56 +02:00
mauro-balades	bc03bc06c4	Fix issue with saving settings in Zen CKS preferences	2024-09-29 14:25:10 +02:00
mauro-balades	576541c4f1	Fixed addons not updating!	2024-09-29 13:59:23 +02:00
mauro-balades	c9df1d8b99	Tried to fix addon updates	2024-09-29 13:20:32 +02:00
mauro-balades	99569e4588	Fixed duplicate keys on settings page (closes #https://github.com/zen-browser/desktop/issues/1784 )	2024-09-29 12:51:40 +02:00
mauro-balades	dcd4dc5d44	Merge branch 'main' of https://github.com/zen-browser/desktop	2024-09-29 12:18:24 +02:00
mauro-balades	40890470fe	Added preferences for split views and tabs unloader	2024-09-29 12:18:21 +02:00
mauro 🤙	08c7a397bc	Merge pull request #1795 from KarimElsayad247/docs/missing-build-step Add necessary step for building to Readme	2024-09-29 11:56:07 +02:00
Karim Elsayad	469260905c	Add necessary step for building The browser would fails to launch properly without invoking this command, which I only discovered in a closed issue #960	2024-09-29 12:47:15 +03:00
mauro-balades	c29a81d710	Add warning for unsafed shortcuts	2024-09-29 11:36:23 +02:00
mauro-balades	d0b6f9489c	Prevent KBS from being registrered if the view is hidden	2024-09-28 22:12:51 +02:00
mauro-balades	4d019067ef	Refactor ZenCustomizableUI.sys.mjs and zen-sidebar-icons.inc.xhtml	2024-09-28 22:10:37 +02:00
mauro-balades	ffcf2a040c	Added tab unloader to the settings page (WIP)	2024-09-28 08:30:03 +02:00
mauro-balades	a222e866fb	Refactor CSS to update primary accent hover color	2024-09-27 23:44:27 +02:00
mauro-balades	f4b77e602f	Update subproject commit reference Refactor CSS to update primary accent hover color Update subproject commit reference Update subproject commit reference Refactor CSS to update primary accent hover color	2024-09-27 20:34:49 +02:00
mauro-balades	b0f5eb0f47	Update subproject commit reference	2024-09-27 20:09:09 +02:00
mauro-balades	922e893bbf	Refactor CSS to update primary accent hover color	2024-09-27 19:33:30 +02:00
mauro-balades	48a1ac71a3	Refactor CSS to update primary accent hover color	2024-09-27 19:28:41 +02:00
mauro-balades	5c564faf6b	Update subproject commit reference	2024-09-27 19:25:35 +02:00
mauro-balades	6c4af9bc71	Update subproject commit reference	2024-09-27 19:17:26 +02:00
mauro-balades	fc46e4ae79	Refactor vertical tabs CSS to improve layout and transitions	2024-09-27 18:56:43 +02:00
mauro-balades	78f60b866e	Refactor vertical tabs CSS for improved layout and transitions	2024-09-27 18:43:22 +02:00
mauro-balades	cb0d9b8633	Merge branch 'main' of https://github.com/zen-browser/desktop	2024-09-27 18:17:48 +02:00
mauro 🤙	cbd3a5bff6	Merge pull request #1770 from zen-browser/revert-1757-fix_layout_shifts_on_hover Revert "Fix sidebar layout shift when expand on hover is on"	2024-09-27 18:17:37 +02:00
mauro 🤙	0310187c8e	Revert "Fix sidebar layout shift when expand on hover is on"	2024-09-27 18:17:28 +02:00
mauro-balades	ba66550c2c	Merge branch 'main' of https://github.com/zen-browser/desktop	2024-09-27 18:12:56 +02:00
mauro-balades	5ff141ded3	Update tab unloader timeout to 20 minutes	2024-09-27 18:12:50 +02:00
mauro 🤙	de5619e580	Merge pull request #1757 from DanielSRS/fix_layout_shifts_on_hover Fix sidebar layout shift when expand on hover is on	2024-09-27 18:12:36 +02:00
Daniel Santa Rosa	8dfb6e7667	Fix sidebar layout shift when expand on hover is on	2024-09-26 20:30:32 -03:00
mauro-balades	e722fc6cca	Enable user context privacy settings	2024-09-26 19:00:41 +02:00
mauro-balades	c9bbc14ee2	Update subproject commit reference in zen-components	2024-09-26 18:59:01 +02:00
mauro-balades	54e787a6c5	Do not show default container context menu if disabled	2024-09-26 18:58:07 +02:00
mauro-balades	92f7d5d9f5	Update subproject commit reference in zen-components	2024-09-26 18:50:30 +02:00
mauro-balades	fed3f8623c	Update subproject commit reference in zen-components	2024-09-26 18:47:42 +02:00
mauro-balades	bd9f68e0c0	Refactor preferences for tab unloading feature	2024-09-26 18:44:33 +02:00
mauro-balades	c32c16d932	Fixed updating keyboard shortcuts on settings	2024-09-26 17:20:55 +02:00
mauro-balades	d8797fceb2	Added paste and go buttons to the URL bar	2024-09-26 17:17:16 +02:00
mauro-balades	996c292916	Refactor tab width calculation in tabs.js	2024-09-25 21:37:39 +02:00
mauro-balades	ac7bf6a007	Refactor zen-sidebar-panels.css for improved transition and box-shadow	2024-09-25 18:42:49 +02:00
mauro-balades	aaee7c44ea	Update subproject commit in zen-components	2024-09-25 17:59:15 +02:00
mauro-balades	71c20bdf98	Fixed extra width on right side compact mode and sidebar toolbar being hidden in fullscreen mode	2024-09-25 17:49:15 +02:00
mauro 🤙	e9f938fb4b	Merge pull request #1731 from BrhmDev/fix/expand-on-hover-moving-page Fix expand on hover moving page	2024-09-25 17:38:52 +02:00
mauro-balades	e180e3dbd0	Refactor zen-sidebar-panels.css for improved transition and box-shadow	2024-09-25 17:38:11 +02:00
mauro-balades	a5f6e689fa	Update subproject commit in zen-components	2024-09-25 17:17:25 +02:00
mauro 🤙	10711097a6	Merge pull request #1708 from BrhmDev/feature/make-zen-sidebar-draggable Make zen sidebar draggable	2024-09-25 17:17:00 +02:00
mauro-balades	c458363d5b	Update subproject commit in zen-components Refactor zen-compact-mode.css for normal sizemode	2024-09-25 17:16:05 +02:00
mauro-balades	bbff11bc71	Update keyboard shortcuts in zen-browser.js	2024-09-25 17:06:57 +02:00
brahim	ff67caa61d	Fix expand on hover moving page.	2024-09-25 15:18:55 +02:00
brahim	c785d4c59c	Fix zen sidebar splitters when pinned.	2024-09-25 02:21:15 +02:00
brahim	43c86ea74c	Add 2 splitters to resize Zen sidebar on all sides, rewrite handleSplitter method	2024-09-25 01:45:16 +02:00
brahim	ed4ab842a5	Add drag function for Zen Sidebar	2024-09-25 01:45:16 +02:00
Mauro Baladés	cc498fad22	Update subproject commit in l10n and zen-components	2024-09-24 23:47:06 +03:00