From a389621cf1ebfccaa2a8ed4b6cc0a0574c9e45ef Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 30 Dec 2024 23:19:11 +0100
Subject: [PATCH 1/5] Update dependencies and modify branding for stable
 release

---
 .github/workflows/build.yml                   | 26 ++++---
 .github/workflows/check-candidate-release.yml | 25 +++++++
 AppDir/zen.desktop                            |  2 +-
 build/winsign/sign.ps1                        |  2 +-
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 10 +--
 scripts/check-rc-response.py                  | 63 +++++++++++++++++
 .../content/navigator-toolbox-inc-xhtml.patch | 16 ++---
 .../CustomizableUI-sys-mjs.patch              | 32 ++++-----
 .../CustomizeMenu/_CustomizeMenu-scss.patch   | 11 ---
 .../CustomizeMenu/_zenNewTabGlobals.scss      |  5 --
 .../tabbrowser/content/tabbrowser-js.patch    | 68 +++++++++----------
 .../tabbrowser/content/tabs-js.patch          | 40 +++++------
 .../themes/BuiltInThemeConfig-sys-mjs.patch   |  4 +-
 .../themes/shared/browser-shared-css.patch    | 36 ----------
 .../shared/preferences/preferences-css.patch  | 13 ----
 .../widgets/browser-custom-element-js.patch   | 10 +--
 surfer.json                                   |  7 +-
 18 files changed, 194 insertions(+), 178 deletions(-)
 create mode 100644 .github/workflows/check-candidate-release.yml
 create mode 100644 scripts/check-rc-response.py
 delete mode 100644 src/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu-scss.patch
 delete mode 100644 src/browser/components/newtab/content-src/components/CustomizeMenu/_zenNewTabGlobals.scss
 delete mode 100644 src/browser/themes/shared/browser-shared-css.patch
 delete mode 100644 src/browser/themes/shared/preferences/preferences-css.patch

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d2088a22..ed6f484a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,10 +16,10 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'beta'
+        default: 'stable'
         type: 'choice'
         options:
-          - 'beta'
+          - 'stable'
           - 'twilight'
   workflow_call:
     inputs:
@@ -36,7 +36,7 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'beta'
+        default: 'stable'
         type: 'string'
 
 jobs:
@@ -72,9 +72,7 @@ jobs:
           git status
           git branch --show-current
           branch="${{ inputs.update_branch }}"
-          if [[ $branch == "beta" ]]; then
-            branch="stable"
-          elif [[ $branch == "twilight" ]]; then
+          if [[ $branch == "twilight" ]]; then
             branch="dev"
           fi
           if [[ $(git branch --show-current) != $branch ]]; then
@@ -124,7 +122,7 @@ jobs:
           npm i -g @zen-browser/surfer
 
       - name: Bump version
-        if: ${{ inputs.update_version && inputs.update_branch == 'beta' }}
+        if: ${{ inputs.update_version && inputs.update_branch == 'stable' }}
         run: |
           pnpm surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
 
@@ -362,7 +360,7 @@ jobs:
 
           if [ "${{ inputs.update_branch }}" = "twilight" ]; then
             sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
-            sed -i -e 's/StartupWMClass=zen-beta/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen-stable/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
           fi
 
           APPDIR=AppDir
@@ -402,7 +400,7 @@ jobs:
     needs: [build-data, linux, windows-step-3, check-release, mac, appimage, source]
     runs-on: ubuntu-latest
     environment:
-      name: ${{ inputs.update_branch == 'beta' && 'Deploy-Release' || 'Deploy-Twilight' }}
+      name: ${{ inputs.update_branch == 'stable' && 'Deploy-Release' || 'Deploy-Twilight' }}
 
     steps:
       - name: Checkout repository
@@ -441,7 +439,7 @@ jobs:
           cp -a ../linux_update_manifest_x86_64/.  updates/
           cp -a ../linux_update_manifest_aarch64/.  updates/
 
-          if [[ $RELEASE_BRANCH == 'beta' ]]; then
+          if [[ $RELEASE_BRANCH == 'stable' ]]; then
             cp -a ../.github/workflows/object/windows-x64-signed-x86_64/update_manifest/.  updates/
             cp -a ../.github/workflows/object/windows-x64-signed-arm64/update_manifest/.  updates/
           else
@@ -495,12 +493,12 @@ jobs:
 
       - name: Release
         uses: marvinpinto/action-automatic-releases@master
-        if: ${{ inputs.update_branch == 'beta' }}
+        if: ${{ inputs.update_branch == 'stable' }}
         with:
           repo_token: '${{ secrets.DEPLOY_KEY }}'
           automatic_release_tag: ${{ needs.build-data.outputs.version }}
           prerelease: false
-          title: 'Beta build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          title: 'Stable build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
             zen.source.tar.gz
             zen.linux-x86_64.tar.bz2
@@ -523,7 +521,7 @@ jobs:
             zen.macos-aarch64.dmg
 
   prepare-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'beta' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'stable' }}
     permissions: write-all
     name: Prepare Flatpak
     needs: [release, linux, build-data]
@@ -582,7 +580,7 @@ jobs:
         run: sleep 120
 
   release-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'beta' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'stable' }}
     permissions: write-all
     name: Release Flatpak
     needs: [prepare-flatpak, build-data]
diff --git a/.github/workflows/check-candidate-release.yml b/.github/workflows/check-candidate-release.yml
new file mode 100644
index 000000000..c348a30ce
--- /dev/null
+++ b/.github/workflows/check-candidate-release.yml
@@ -0,0 +1,25 @@
+name: Check Firefox Candidate Release
+
+on:
+  schedule:
+    - cron: '0 21 * * 1'
+  workflow_dispatch:
+
+jobs:
+  check_tag:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v2
+
+    - name: Fetch JSON Response
+      run: |
+        curl -s "https://hg.mozilla.org/releases/mozilla-release/json-tags" > rc-response.json
+
+    - name: Check for any updates
+      env:
+        DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+        DISCORD_PING_IDS: ${{ secrets.DISCORD_PING_IDS }}
+      run: |
+        python3 scripts/check-rc-response.py
diff --git a/AppDir/zen.desktop b/AppDir/zen.desktop
index 4a79413a9..a533fbbdb 100644
--- a/AppDir/zen.desktop
+++ b/AppDir/zen.desktop
@@ -5,7 +5,7 @@ Exec=zen %u
 Icon=zen
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
-StartupWMClass=zen-beta
+StartupWMClass=zen-stable
 Categories=Network;WebBrowser;
 StartupNotify=true
 Terminal=false
diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1
index 004a6cf03..cba28ca4c 100644
--- a/build/winsign/sign.ps1
+++ b/build/winsign/sign.ps1
@@ -29,7 +29,7 @@ echo "Downloaded x86_64 artifacts"
 
 mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
 
-pnpm surfer ci --brand beta
+pnpm surfer ci --brand stable
 
 function SignAndPackage($name) {
     echo "Executing on $name"
diff --git a/package.json b/package.json
index 3241185ec..5d096bd61 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.7.0"
+    "@zen-browser/surfer": "^1.8.2"
   },
   "devDependencies": {
     "husky": "^9.1.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d7d3390c6..da596b154 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.7.0
-        version: 1.7.0
+        specifier: ^1.8.2
+        version: 1.8.2
     devDependencies:
       husky:
         specifier: ^9.1.5
@@ -119,8 +119,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.7.0':
-    resolution: {integrity: sha512-LKpMfcXvzf9VmXHydVF9sO4srtTdgjdrNYHHwDucNmnqIdamIYmP7KWAlZViohdBLdXPWODYY0IsZPAKNf3BCg==}
+  '@zen-browser/surfer@1.8.2':
+    resolution: {integrity: sha512-6odt1j7haMFjOffz+nt4+AWXJC8X3DW+ha7+nVdvqD6/mBiTtT8LnDQ0COQbZt0FMBTNB9nRlglm1jtHCOzE6g==}
     hasBin: true
 
   ansi-escapes@7.0.0:
@@ -1003,7 +1003,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.7.0':
+  '@zen-browser/surfer@1.8.2':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2
diff --git a/scripts/check-rc-response.py b/scripts/check-rc-response.py
new file mode 100644
index 000000000..205dbf309
--- /dev/null
+++ b/scripts/check-rc-response.py
@@ -0,0 +1,63 @@
+import json
+import sys
+import os
+import requests
+
+RESPONSE = 'rc-response.json'
+METADATA = 'surfer.json'
+
+def get_current_version():
+  with open(METADATA) as f:
+    metadata = json.load(f)
+    return metadata['version']['candidate']
+
+def get_rc_response():
+  with open(RESPONSE) as f:
+    data = json.load(f)
+    for tag_dict in data['tags']:
+      tag = tag_dict['tag']
+      is_valid_tag = (tag.startswith('FIREFOX') and tag.endswith('_BUILD1')
+                        and not 'ESR' in tag and not 'b' in tag)
+      if is_valid_tag:
+        return tag.replace('FIREFOX_', '').replace('_BUILD1', '').replace('_', '.')
+  return None
+
+def get_pings():
+  pings = ""
+  for ping in os.getenv('DISCORD_PING_IDS').split(','):
+    pings += "<@%s> " % ping
+  return pings
+
+def send_webhook(rc: str):
+  text = "Sending a PR to update the current version to %s goo %s" % (rc, get_pings())
+  webhook_url = os.getenv('DISCORD_WEBHOOK_URL') #os.getenv('DISCORD_WEBHOOK_URL')
+  message = {
+    "content": text,
+    "username": "GO-WORK",
+    "avatar_url": "https://zen-browser.app/favicon.svg",
+  }
+  response = requests.post(webhook_url, json=message)
+  if response.status_code == 204:
+      print("Message sent successfully!")
+  else:
+      print(f"Failed to send message: {response.status_code}")
+
+def main():
+  current = get_current_version()
+  if not current:
+    print('Could not find current version')
+    return 1
+  rc = get_rc_response()
+  if not rc:
+    print('Could not find RC version')
+    return 1
+  if current != rc:
+    print('Current version is %s, but RC version is %s' % (current, rc))
+    # Here, we should update the current version in surfer.json
+    send_webhook(rc)
+    return 0
+  print('Current version is %s, and RC version is %s' % (current, rc))
+  return 1
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 9dfba3614..d696af063 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -5,11 +5,11 @@ index eb2d8670874bd5bcaf9253caafb98444cb8cfcd9..51e6c01c279e0105ec8ac08df0763027
 @@ -2,7 +2,7 @@
  # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--<toolbox id="navigator-toolbox">
-+<toolbox id="navigator-toolbox" persist="width style">
+
+-<toolbox id="navigator-toolbox" class="browser-toolbox-background">
++<toolbox id="navigator-toolbox" class="browser-toolbox-background" persist="width style">
    <script src="chrome://browser/content/navigator-toolbox.js" />
- 
+
    <!-- Menu -->
 @@ -19,7 +19,7 @@
      <spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
@@ -21,9 +21,9 @@ index eb2d8670874bd5bcaf9253caafb98444cb8cfcd9..51e6c01c279e0105ec8ac08df0763027
             class="browser-toolbar browser-titlebar"
             fullscreentoolbar="true"
 @@ -32,7 +32,7 @@
- 
+
      <hbox class="titlebar-spacer" type="pre-tabs"/>
- 
+
 -    <hbox flex="1" align="end" class="toolbar-items">
 +    <hbox flex="1" align="start" class="toolbar-items">
        <toolbartabstop/>
@@ -36,7 +36,7 @@ index eb2d8670874bd5bcaf9253caafb98444cb8cfcd9..51e6c01c279e0105ec8ac08df0763027
 +                       hidden="true"
                         cui-areatype="toolbar"
                         removable="true"/>
- 
+
 @@ -55,9 +56,14 @@
  # significantly, there is an optimization in
  # DisplayPortUtils::MaybeCreateDisplayPortInFirstScrollFrameEncountered based
@@ -81,5 +81,5 @@ index eb2d8670874bd5bcaf9253caafb98444cb8cfcd9..51e6c01c279e0105ec8ac08df0763027
  #include titlebar-items.inc.xhtml
 +#endif
    </toolbar>
- 
+
    <toolbar id="PersonalToolbar"
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index b56e2195c..5fb0444b6 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 45d0e0e4872eeabf87862dbadfee1dc211ed7bed..04a65485a3493fd42b2a58523123f1392ed9c3b2 100644
+index b953d7d2c8fa7fe2d320bd7cb7af9aeeef0abc86..b161c73fe690c172a9be266894f72427b1d934e3 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -19,48 +19,42 @@ index 45d0e0e4872eeabf87862dbadfee1dc211ed7bed..04a65485a3493fd42b2a58523123f139
  
  const kSpecialWidgetPfx = "customizableui-special-";
  
-@@ -307,13 +308,14 @@ var CustomizableUIInternal = {
+@@ -307,13 +308,11 @@ var CustomizableUIInternal = {
        "spring",
        "urlbar-container",
        "spring",
 -      "save-to-pocket-button",
 -      "downloads-button",
-+//      "downloads-button",
++//    "downloads-button",
        AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
 -      "fxa-toolbar-menu-button",
-+      "wrapper-sidebar-button",
        lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
      ].filter(name => name);
- 
+-
 +    lazy.ZenCustomizableUI.startup(this);
-+
      this.registerArea(
        CustomizableUI.AREA_NAVBAR,
        {
-@@ -322,7 +324,7 @@ var CustomizableUIInternal = {
+@@ -321,7 +320,6 @@ var CustomizableUIInternal = {
+         overflowable: true,
          defaultPlacements: navbarPlacements,
          verticalTabsDefaultPlacements: [
-           "firefox-view-button",
--          "new-tab-button",
-+//          "new-tab-button",
+-          "firefox-view-button",
            "alltabs-button",
          ],
          defaultCollapsed: false,
-@@ -347,10 +349,10 @@ var CustomizableUIInternal = {
+@@ -346,10 +344,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
 -          "firefox-view-button",
-+//          "firefox-view-button",
            "tabbrowser-tabs",
 -          "new-tab-button",
 -          "alltabs-button",
-+//          "new-tab-button",
-+//          "alltabs-button",
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -413,6 +415,7 @@ var CustomizableUIInternal = {
+@@ -412,6 +407,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -68,7 +62,7 @@ index 45d0e0e4872eeabf87862dbadfee1dc211ed7bed..04a65485a3493fd42b2a58523123f139
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1128,6 +1131,9 @@ var CustomizableUIInternal = {
+@@ -1127,6 +1123,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -78,7 +72,7 @@ index 45d0e0e4872eeabf87862dbadfee1dc211ed7bed..04a65485a3493fd42b2a58523123f139
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -3603,7 +3609,7 @@ var CustomizableUIInternal = {
+@@ -3609,7 +3608,7 @@ var CustomizableUIInternal = {
      }
    },
  
@@ -87,7 +81,7 @@ index 45d0e0e4872eeabf87862dbadfee1dc211ed7bed..04a65485a3493fd42b2a58523123f139
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -3614,7 +3620,7 @@ var CustomizableUIInternal = {
+@@ -3620,7 +3619,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -96,7 +90,7 @@ index 45d0e0e4872eeabf87862dbadfee1dc211ed7bed..04a65485a3493fd42b2a58523123f139
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -4572,6 +4578,7 @@ export var CustomizableUI = {
+@@ -4583,6 +4582,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
diff --git a/src/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu-scss.patch b/src/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu-scss.patch
deleted file mode 100644
index 901977bd0..000000000
--- a/src/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu-scss.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss b/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss
-index f534b8701b79fe3f0045c7b10f0db8ab5bbf5e8a..faf92fd8884b1f5d96a049ccdbd5e30ba2fca30a 100644
---- a/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss
-+++ b/browser/components/newtab/content-src/components/CustomizeMenu/_CustomizeMenu.scss
-@@ -242,3 +242,5 @@
-   outline: 0;
-   box-shadow: $shadow-focus;
- }
-+
-+@import 'zenNewTabGlobals';
-\ No newline at end of file
diff --git a/src/browser/components/newtab/content-src/components/CustomizeMenu/_zenNewTabGlobals.scss b/src/browser/components/newtab/content-src/components/CustomizeMenu/_zenNewTabGlobals.scss
deleted file mode 100644
index fe1ec2f55..000000000
--- a/src/browser/components/newtab/content-src/components/CustomizeMenu/_zenNewTabGlobals.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.customize-menu[role='dialog'] {
-  margin: 10px;
-  border-radius: 7px;
-  height: -moz-fit-content;
-}
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index ba2192a4d..ee88bbdfa 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -4,8 +4,8 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -402,11 +402,26 @@
        return count;
-     },
- 
+     }
+
 +    get _numVisiblePinTabs() {
 +      let i = 0;
 +      for (let tab of this.tabs) {
@@ -17,7 +17,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 +        }
 +      }
 +      return i;
-+    },
++    }
 +
      get pinnedTabCount() {
 -      for (var i = 0; i < this.tabs.length; i++) {
@@ -30,20 +30,20 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 +        i++;
        }
        return i;
-     },
+     }
 @@ -800,7 +815,7 @@
+       this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
-         let wasFocused = document.activeElement == this.selectedTab;
-         let oldPosition = aTab._tPos;
--        this.verticalPinnedTabsContainer.appendChild(aTab);
-+        aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab);
-         this._updateAfterMoveTabTo(aTab, oldPosition, wasFocused);
+         this._handleTabMove(aTab, () =>
+-          this.verticalPinnedTabsContainer.appendChild(aTab)
++          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab);
+        );
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount);
 @@ -1047,6 +1062,7 @@
- 
+
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
- 
+
 +      try {
        if (
          aIconURL &&
@@ -55,7 +55,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 +      } catch (e) {
 +        console.warn(e);
 +      }
- 
+
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
 @@ -1286,6 +1305,7 @@
@@ -67,13 +67,13 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
 @@ -2371,7 +2391,7 @@
- 
+
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
 -      panel.id = uniqueId;
 +      if (!panel.id?.startsWith("zen-")) panel.id = uniqueId;
        aTab.linkedPanel = uniqueId;
- 
+
        // Inject the <browser> into the DOM if necessary.
 @@ -2431,7 +2451,7 @@
        // hasSiblings=false on both the existing browser and the new browser.
@@ -87,7 +87,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 @@ -2651,6 +2671,12 @@
          );
        }
- 
+
 +      let hasZenDefaultUserContextId = false;
 +      let zenForcedWorkspaceId = undefined;
 +      if (typeof ZenWorkspaces !== "undefined") {
@@ -113,7 +113,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 @@ -2862,6 +2894,13 @@
          }
        }
- 
+
 +      requestAnimationFrame(() => {
 +        t.setAttribute("zen-initial-fadein", "true");
 +        setTimeout(() => {
@@ -150,7 +150,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
            } else {
 @@ -3355,6 +3411,9 @@
              restoreTabsLazily && !select && !tabData.pinned;
- 
+
            let url = "about:blank";
 +
 +          gZenPinnedTabManager.resetPinnedTabData(tabData);
@@ -161,7 +161,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 @@ -3391,6 +3450,21 @@
              preferredRemoteType,
            });
- 
+
 +          if (tabData.zenWorkspace) {
 +            tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
 +          }
@@ -187,22 +187,22 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 -
          tab.initialize();
        }
- 
+
 @@ -3992,6 +4065,10 @@
          return;
        }
- 
+
 +      for (tab of selectedTabs) {
 +        gZenPinnedTabManager._removePinnedAttributes(tab, true);
 +      }
 +
        this.removeTabs(selectedTabs);
-     },
- 
+     }
+
 @@ -4309,6 +4386,13 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
- 
+
 +      if (ZenWorkspaces.workspaceEnabled) {
 +        let newTab = ZenWorkspaces.handleTabBeforeClose(aTab);
 +        if (newTab) {
@@ -216,7 +216,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 @@ -4324,6 +4408,10 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
- 
+
 +      if (aTab.hasAttribute("zen-glance-tab")) {
 +        gZenGlanceManager.closeGlance();
 +        return;
@@ -225,18 +225,18 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
 @@ -4472,7 +4560,7 @@
- 
-       var closeWindow = false;
-       var newTab = false;
--      if (aTab.visible && this.visibleTabs.length == 1) {
-+      if (aTab.visible && this.visibleTabs.length == 1 && !aTab._closingGlance) {
+         !!this.tabsInCollapsedTabGroups.length;
+       if (
+         aTab.visible &&
+-        this.visibleTabs.length == 1 &&
++        this.visibleTabs.length == 1 && !aTab._closingGlance
+         !anyRemainingTabsInCollapsedTabGroups
+       ) {
          closeWindow =
-           closeWindowWithLastTab != null
-             ? closeWindowWithLastTab
 @@ -5265,10 +5353,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
-     },
- 
+     }
+
 -    hideTab(aTab, aSource) {
 +    hideTab(aTab, aSource, forZenWorkspaces = false) {
        if (
@@ -270,7 +270,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
 -      tabsToMove[0] == visibleTabs[gBrowser.pinnedTabCount];
 +      tabsToMove[0] == visibleTabs[gBrowser._numVisiblePinTabs];
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
- 
+
      document.getElementById("context_openTabInWindow").disabled =
 @@ -8376,6 +8465,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index a749c8346..b4c9e38ed 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -14,14 +14,14 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
 @@ -918,7 +918,7 @@
              let postTransitionCleanup = () => {
                tab.removeAttribute("tabdrop-samewindow");
- 
+
 -              this._finishAnimateTabMove();
 +              this._finishAnimateTabMove(true);
                if (dropIndex !== false) {
                  gBrowser.moveTabTo(tab, dropIndex);
                  if (incrementDropIndex) {
 @@ -928,7 +928,7 @@
- 
+
                gBrowser.syncThrobberAnimations(tab);
              };
 -            if (gReduceMotion) {
@@ -40,30 +40,30 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
          delete draggedTab._dragData;
          return;
 @@ -1328,7 +1329,7 @@
-         }
        }
- 
--      this.#allTabs = [...verticalPinnedTabsContainer.children, ...children];
-+      this.#allTabs = [...document.getElementById("zen-essentials-container").children, ...verticalPinnedTabsContainer.children, ...children];
+
+       this.#allTabs = [
+-      ...this.verticalPinnedTabsContainer.children,
++      ...document.getElementById("zen-essentials-container").children, ...verticalPinnedTabsContainer.children,
+         ...children,
+       ];
        return this.#allTabs;
-     }
- 
 @@ -1520,10 +1521,12 @@
- 
+
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
 -      if (this.overflowing) {
 -        this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
 -      }
 +      this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
- 
+
 +      if (!aInstant && Services.prefs.getBoolPref('zen.view.compact')
 +          && Services.prefs.getBoolPref('zen.view.compact.toolbar-flash-popup')) {
 +        gZenCompactModeManager.flashSidebar();
 +      }
        selectedTab._notselectedsinceload = false;
      }
- 
+
 @@ -1571,7 +1574,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
@@ -88,7 +88,7 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
        );
 -      let numPinned = gBrowser.pinnedTabCount;
 +      let numPinned = gBrowser._numVisiblePinTabs;
- 
+
        if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
          let tabs = this.visibleTabs;
          for (let i = 0; i < numPinned; i++) {
@@ -97,28 +97,28 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
 +          tabs[i].hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(tabs[i]) : verticalTabsContainer.appendChild(tabs[i]);
          }
        }
- 
+
 @@ -1681,7 +1684,7 @@
- 
+
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
 -      let numPinned = gBrowser.pinnedTabCount;
 +      let numPinned = gBrowser._numVisiblePinTabs;
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
- 
+
 @@ -1762,7 +1765,7 @@
          return;
        }
- 
+
 -      let tabs = this.visibleTabs.slice(0, gBrowser.pinnedTabCount);
 +      let tabs = this.visibleTabs.slice(0, gBrowser._numVisiblePinTabs);
- 
+
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
 @@ -1948,7 +1951,7 @@
        }
- 
+
        let pinned = draggedTab.pinned;
 -      let numPinned = gBrowser.pinnedTabCount;
 +      let numPinned = gBrowser._numVisiblePinTabs;
@@ -128,11 +128,11 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
 @@ -2140,8 +2143,8 @@
        );
      }
- 
+
 -    _finishAnimateTabMove() {
 -      if (!this.hasAttribute("movingtab")) {
 +    _finishAnimateTabMove(always = false) {
 +      if (!this.hasAttribute("movingtab") && !always) {
          return;
        }
- 
+
diff --git a/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch
index f01ca9cb5..7323914ec 100644
--- a/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch
+++ b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs
-index f738f7f1e37d20d9d9158f052572334714475107..f4b0e9a7077076f2fbe8ac17fa6aadf586c6b37c 100644
+index 4e5a4f1795c18241d9143d159f7d040142e728d4..f4b0e9a7077076f2fbe8ac17fa6aadf586c6b37c 100644
 --- a/browser/themes/BuiltInThemeConfig.sys.mjs
 +++ b/browser/themes/BuiltInThemeConfig.sys.mjs
 @@ -33,13 +33,6 @@ export const BuiltInThemeConfig = new Map([
@@ -9,7 +9,7 @@ index f738f7f1e37d20d9d9158f052572334714475107..f4b0e9a7077076f2fbe8ac17fa6aadf5
 -  [
 -    "firefox-alpenglow@mozilla.org",
 -    {
--      version: "1.4",
+-      version: "1.5",
 -      path: "resource://builtin-themes/alpenglow/",
 -    },
 -  ],
diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch
deleted file mode 100644
index aafc85c51..000000000
--- a/src/browser/themes/shared/browser-shared-css.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index 08bc078c2572fb218b435e580ef71be2586989c3..3d173cfcfe80e978683df760c132307f97d73ae6 100644
---- a/browser/themes/shared/browser-shared.css
-+++ b/browser/themes/shared/browser-shared.css
-@@ -163,6 +163,31 @@ body {
-     border-bottom-color: var(--chrome-content-separator-color);
-   }
- 
-+
-+  :root[customizing] & {
-+    border-bottom-style: none;
-+  }
-+
-+  :root[lwtheme] & {
-+    background-image: var(--lwt-additional-images);
-+    background-repeat: var(--lwt-background-tiling);
-+    background-position: var(--lwt-background-alignment);
-+    background-color: var(--lwt-accent-color);
-+    color: inherit;
-+
-+    &:-moz-window-inactive {
-+      background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
-+    }
-+  }
-+
-+  /* When a theme defines both theme_frame and additional_backgrounds, show
-+     the latter atop the former. */
-+  :root[lwtheme-image] & {
-+    background-image: var(--lwt-header-image), var(--lwt-additional-images);
-+    background-repeat: no-repeat, var(--lwt-background-tiling);
-+    background-position: right top, var(--lwt-background-alignment);
-+  }
-+
-   :root[customizing] & {
-     border-bottom-style: none;
-   }
diff --git a/src/browser/themes/shared/preferences/preferences-css.patch b/src/browser/themes/shared/preferences/preferences-css.patch
deleted file mode 100644
index 9be04e2ef..000000000
--- a/src/browser/themes/shared/preferences/preferences-css.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
-index 8f2652f030b9990de83bbffb891f2a52731f478b..322d7e43a516f80de5964b0e25a455c8806fef1a 100644
---- a/browser/themes/shared/preferences/preferences.css
-+++ b/browser/themes/shared/preferences/preferences.css
-@@ -33,7 +33,7 @@
-   display: flex;
-   flex-direction: column;
- 
--  --main-pane-width: 664px;
-+  --main-pane-width: 750px;
- }
- 
- /*
diff --git a/src/toolkit/content/widgets/browser-custom-element-js.patch b/src/toolkit/content/widgets/browser-custom-element-js.patch
index 18643f83d..f37128851 100644
--- a/src/toolkit/content/widgets/browser-custom-element-js.patch
+++ b/src/toolkit/content/widgets/browser-custom-element-js.patch
@@ -1,11 +1,11 @@
 diff --git a/toolkit/content/widgets/browser-custom-element.js b/toolkit/content/widgets/browser-custom-element.js
-index 887f59c742c7cb540773f18ce680e1e5b6fd5314..0431d97412b69a9f33042fcc885edb1115a79716 100644
+index a531577a29212cdb9e745b88e17fe4177be76635..ae976ecef71d0d659fa6a1d6fea60f5270073544 100644
 --- a/toolkit/content/widgets/browser-custom-element.js
 +++ b/toolkit/content/widgets/browser-custom-element.js
-@@ -411,11 +411,11 @@
-     }
- 
-     set docShellIsActive(val) {
+@@ -556,11 +556,11 @@
+       if (!this.browsingContext) {
+         return;
+       }
 -      this.browsingContext.isActive = val;
 +      this.browsingContext.isActive = val || this.zenModeActive;
        if (this.isRemoteBrowser) {
diff --git a/surfer.json b/surfer.json
index c729154b5..35b204c65 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,14 +5,15 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "133.0.3"
+    "version": "134.0",
+    "candidate": "134.0"
   },
   "buildOptions": {
     "generateBranding": true
   },
   "addons": {},
   "brands": {
-    "beta": {
+    "stable": {
       "backgroundColor": "#282A33",
       "brandShorterName": "Zen",
       "brandShortName": "Zen Browser",
@@ -52,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file

From 52f85f9452773d55b573e4ff035e5d8c4c8394ef Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 31 Dec 2024 12:51:24 +0100
Subject: [PATCH 2/5] Add stable branding assets and remove beta branding files

---
 .../branding/{beta => stable}/MacOSInstaller.svg    |   0
 .../{beta => stable}/PrivateBrowsing_150.png        | Bin
 .../{beta => stable}/PrivateBrowsing_70.png         | Bin
 .../{beta => stable}/VisualElements_150.png         | Bin
 .../branding/{beta => stable}/VisualElements_70.png | Bin
 .../{beta => stable}/content/about-logo-private.png | Bin
 .../{beta => stable}/content/about-logo-private.svg |   0
 .../content/about-logo-private@2x.png               | Bin
 .../{beta => stable}/content/about-logo.png         | Bin
 .../{beta => stable}/content/about-logo.svg         |   0
 .../{beta => stable}/content/about-logo@2x.png      | Bin
 .../{beta => stable}/content/about-wordmark.svg     |   0
 .../{beta => stable}/content/firefox-wordmark.svg   |   0
 configs/branding/{beta => stable}/document.ico      | Bin
 configs/branding/{beta => stable}/document_pdf.ico  | Bin
 configs/branding/{beta => stable}/firefox.ico       | Bin
 configs/branding/{beta => stable}/firefox64.ico     | Bin
 configs/branding/{beta => stable}/logo-mac.png      | Bin
 configs/branding/{beta => stable}/logo.png          | Bin
 configs/branding/{beta => stable}/logo1024.png      | Bin
 configs/branding/{beta => stable}/logo128.png       | Bin
 configs/branding/{beta => stable}/logo16.png        | Bin
 configs/branding/{beta => stable}/logo22.png        | Bin
 configs/branding/{beta => stable}/logo24.png        | Bin
 configs/branding/{beta => stable}/logo256.png       | Bin
 configs/branding/{beta => stable}/logo32.png        | Bin
 configs/branding/{beta => stable}/logo48.png        | Bin
 configs/branding/{beta => stable}/logo512.png       | Bin
 configs/branding/{beta => stable}/logo64.png        | Bin
 configs/branding/{beta => stable}/pbmode.ico        | Bin
 30 files changed, 0 insertions(+), 0 deletions(-)
 rename configs/branding/{beta => stable}/MacOSInstaller.svg (100%)
 rename configs/branding/{beta => stable}/PrivateBrowsing_150.png (100%)
 rename configs/branding/{beta => stable}/PrivateBrowsing_70.png (100%)
 rename configs/branding/{beta => stable}/VisualElements_150.png (100%)
 rename configs/branding/{beta => stable}/VisualElements_70.png (100%)
 rename configs/branding/{beta => stable}/content/about-logo-private.png (100%)
 rename configs/branding/{beta => stable}/content/about-logo-private.svg (100%)
 rename configs/branding/{beta => stable}/content/about-logo-private@2x.png (100%)
 rename configs/branding/{beta => stable}/content/about-logo.png (100%)
 rename configs/branding/{beta => stable}/content/about-logo.svg (100%)
 rename configs/branding/{beta => stable}/content/about-logo@2x.png (100%)
 rename configs/branding/{beta => stable}/content/about-wordmark.svg (100%)
 rename configs/branding/{beta => stable}/content/firefox-wordmark.svg (100%)
 rename configs/branding/{beta => stable}/document.ico (100%)
 rename configs/branding/{beta => stable}/document_pdf.ico (100%)
 rename configs/branding/{beta => stable}/firefox.ico (100%)
 rename configs/branding/{beta => stable}/firefox64.ico (100%)
 rename configs/branding/{beta => stable}/logo-mac.png (100%)
 rename configs/branding/{beta => stable}/logo.png (100%)
 rename configs/branding/{beta => stable}/logo1024.png (100%)
 rename configs/branding/{beta => stable}/logo128.png (100%)
 rename configs/branding/{beta => stable}/logo16.png (100%)
 rename configs/branding/{beta => stable}/logo22.png (100%)
 rename configs/branding/{beta => stable}/logo24.png (100%)
 rename configs/branding/{beta => stable}/logo256.png (100%)
 rename configs/branding/{beta => stable}/logo32.png (100%)
 rename configs/branding/{beta => stable}/logo48.png (100%)
 rename configs/branding/{beta => stable}/logo512.png (100%)
 rename configs/branding/{beta => stable}/logo64.png (100%)
 rename configs/branding/{beta => stable}/pbmode.ico (100%)

diff --git a/configs/branding/beta/MacOSInstaller.svg b/configs/branding/stable/MacOSInstaller.svg
similarity index 100%
rename from configs/branding/beta/MacOSInstaller.svg
rename to configs/branding/stable/MacOSInstaller.svg
diff --git a/configs/branding/beta/PrivateBrowsing_150.png b/configs/branding/stable/PrivateBrowsing_150.png
similarity index 100%
rename from configs/branding/beta/PrivateBrowsing_150.png
rename to configs/branding/stable/PrivateBrowsing_150.png
diff --git a/configs/branding/beta/PrivateBrowsing_70.png b/configs/branding/stable/PrivateBrowsing_70.png
similarity index 100%
rename from configs/branding/beta/PrivateBrowsing_70.png
rename to configs/branding/stable/PrivateBrowsing_70.png
diff --git a/configs/branding/beta/VisualElements_150.png b/configs/branding/stable/VisualElements_150.png
similarity index 100%
rename from configs/branding/beta/VisualElements_150.png
rename to configs/branding/stable/VisualElements_150.png
diff --git a/configs/branding/beta/VisualElements_70.png b/configs/branding/stable/VisualElements_70.png
similarity index 100%
rename from configs/branding/beta/VisualElements_70.png
rename to configs/branding/stable/VisualElements_70.png
diff --git a/configs/branding/beta/content/about-logo-private.png b/configs/branding/stable/content/about-logo-private.png
similarity index 100%
rename from configs/branding/beta/content/about-logo-private.png
rename to configs/branding/stable/content/about-logo-private.png
diff --git a/configs/branding/beta/content/about-logo-private.svg b/configs/branding/stable/content/about-logo-private.svg
similarity index 100%
rename from configs/branding/beta/content/about-logo-private.svg
rename to configs/branding/stable/content/about-logo-private.svg
diff --git a/configs/branding/beta/content/about-logo-private@2x.png b/configs/branding/stable/content/about-logo-private@2x.png
similarity index 100%
rename from configs/branding/beta/content/about-logo-private@2x.png
rename to configs/branding/stable/content/about-logo-private@2x.png
diff --git a/configs/branding/beta/content/about-logo.png b/configs/branding/stable/content/about-logo.png
similarity index 100%
rename from configs/branding/beta/content/about-logo.png
rename to configs/branding/stable/content/about-logo.png
diff --git a/configs/branding/beta/content/about-logo.svg b/configs/branding/stable/content/about-logo.svg
similarity index 100%
rename from configs/branding/beta/content/about-logo.svg
rename to configs/branding/stable/content/about-logo.svg
diff --git a/configs/branding/beta/content/about-logo@2x.png b/configs/branding/stable/content/about-logo@2x.png
similarity index 100%
rename from configs/branding/beta/content/about-logo@2x.png
rename to configs/branding/stable/content/about-logo@2x.png
diff --git a/configs/branding/beta/content/about-wordmark.svg b/configs/branding/stable/content/about-wordmark.svg
similarity index 100%
rename from configs/branding/beta/content/about-wordmark.svg
rename to configs/branding/stable/content/about-wordmark.svg
diff --git a/configs/branding/beta/content/firefox-wordmark.svg b/configs/branding/stable/content/firefox-wordmark.svg
similarity index 100%
rename from configs/branding/beta/content/firefox-wordmark.svg
rename to configs/branding/stable/content/firefox-wordmark.svg
diff --git a/configs/branding/beta/document.ico b/configs/branding/stable/document.ico
similarity index 100%
rename from configs/branding/beta/document.ico
rename to configs/branding/stable/document.ico
diff --git a/configs/branding/beta/document_pdf.ico b/configs/branding/stable/document_pdf.ico
similarity index 100%
rename from configs/branding/beta/document_pdf.ico
rename to configs/branding/stable/document_pdf.ico
diff --git a/configs/branding/beta/firefox.ico b/configs/branding/stable/firefox.ico
similarity index 100%
rename from configs/branding/beta/firefox.ico
rename to configs/branding/stable/firefox.ico
diff --git a/configs/branding/beta/firefox64.ico b/configs/branding/stable/firefox64.ico
similarity index 100%
rename from configs/branding/beta/firefox64.ico
rename to configs/branding/stable/firefox64.ico
diff --git a/configs/branding/beta/logo-mac.png b/configs/branding/stable/logo-mac.png
similarity index 100%
rename from configs/branding/beta/logo-mac.png
rename to configs/branding/stable/logo-mac.png
diff --git a/configs/branding/beta/logo.png b/configs/branding/stable/logo.png
similarity index 100%
rename from configs/branding/beta/logo.png
rename to configs/branding/stable/logo.png
diff --git a/configs/branding/beta/logo1024.png b/configs/branding/stable/logo1024.png
similarity index 100%
rename from configs/branding/beta/logo1024.png
rename to configs/branding/stable/logo1024.png
diff --git a/configs/branding/beta/logo128.png b/configs/branding/stable/logo128.png
similarity index 100%
rename from configs/branding/beta/logo128.png
rename to configs/branding/stable/logo128.png
diff --git a/configs/branding/beta/logo16.png b/configs/branding/stable/logo16.png
similarity index 100%
rename from configs/branding/beta/logo16.png
rename to configs/branding/stable/logo16.png
diff --git a/configs/branding/beta/logo22.png b/configs/branding/stable/logo22.png
similarity index 100%
rename from configs/branding/beta/logo22.png
rename to configs/branding/stable/logo22.png
diff --git a/configs/branding/beta/logo24.png b/configs/branding/stable/logo24.png
similarity index 100%
rename from configs/branding/beta/logo24.png
rename to configs/branding/stable/logo24.png
diff --git a/configs/branding/beta/logo256.png b/configs/branding/stable/logo256.png
similarity index 100%
rename from configs/branding/beta/logo256.png
rename to configs/branding/stable/logo256.png
diff --git a/configs/branding/beta/logo32.png b/configs/branding/stable/logo32.png
similarity index 100%
rename from configs/branding/beta/logo32.png
rename to configs/branding/stable/logo32.png
diff --git a/configs/branding/beta/logo48.png b/configs/branding/stable/logo48.png
similarity index 100%
rename from configs/branding/beta/logo48.png
rename to configs/branding/stable/logo48.png
diff --git a/configs/branding/beta/logo512.png b/configs/branding/stable/logo512.png
similarity index 100%
rename from configs/branding/beta/logo512.png
rename to configs/branding/stable/logo512.png
diff --git a/configs/branding/beta/logo64.png b/configs/branding/stable/logo64.png
similarity index 100%
rename from configs/branding/beta/logo64.png
rename to configs/branding/stable/logo64.png
diff --git a/configs/branding/beta/pbmode.ico b/configs/branding/stable/pbmode.ico
similarity index 100%
rename from configs/branding/beta/pbmode.ico
rename to configs/branding/stable/pbmode.ico

From 0b96093ae5a08981a02361420b753f4386f60c6d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 31 Dec 2024 12:54:12 +0100
Subject: [PATCH 3/5] Refactor popup CSS for improved styling and
 responsiveness

---
 src/toolkit/themes/shared/popup-css.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index 95d9305f7..51036a07c 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -4,18 +4,18 @@ index a86b2e0e04769e25acbc6f7d2294dae895e3392e..dce7e1a2bdf52e616c987a04c0d5c1c1
 +++ b/toolkit/themes/shared/popup.css
 @@ -30,8 +30,7 @@ panel {
    --background-color-canvas: var(--panel-background);
- 
+
    @media (-moz-platform: linux) {
 -    --panel-border-radius: 8px;
 -    --panel-padding-block: 3px;
 +
- 
+
      @media (prefers-contrast) {
        --panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
 @@ -49,18 +48,7 @@ panel {
      --panel-border-radius: 0px !important;
    }
- 
+
 -  @media (-moz-platform: macos) {
 -    appearance: auto;
 -    -moz-default-appearance: menupopup;
@@ -29,13 +29,13 @@ index a86b2e0e04769e25acbc6f7d2294dae895e3392e..dce7e1a2bdf52e616c987a04c0d5c1c1
 -    --panel-border-radius: 6px;
 -  }
 +
- 
+
    &::part(content) {
      display: flex;
 @@ -199,6 +187,5 @@ panel[type="arrow"] {
+     }
+
+     &[animating] {
+-      pointer-events: none;
+     }
    }
- 
-   &[animating] {
--    pointer-events: none;
-   }
- }

From 0f89478df6661a027b94968895812ef49e339c09 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 31 Dec 2024 16:17:29 +0100
Subject: [PATCH 4/5] Update essential-add icon SVG and improve tab handling
 logic for pinned tabs

---
 .../tabbrowser/content/tabbrowser-js.patch    | 90 +++++++++----------
 .../tabbrowser/content/tabs-js.patch          | 86 +++++++++---------
 .../themes/shared/zen-icons/essential-add.svg |  2 +-
 3 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index ee88bbdfa..6553cef6e 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,11 +1,11 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92bcb2463de 100644
+index ce68c339f35416574b7bc7ebf8c93378f653242b..083345a5eb285ba92733c5d015ab006f6b8b2508 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -402,11 +402,26 @@
+@@ -409,11 +409,26 @@
        return count;
      }
-
+ 
 +    get _numVisiblePinTabs() {
 +      let i = 0;
 +      for (let tab of this.tabs) {
@@ -31,34 +31,34 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
        }
        return i;
      }
-@@ -800,7 +815,7 @@
+@@ -806,7 +821,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
 -          this.verticalPinnedTabsContainer.appendChild(aTab)
-+          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab);
-        );
++          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab)
+         );
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount);
-@@ -1047,6 +1062,7 @@
-
+@@ -1052,6 +1067,7 @@
+ 
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
-
+ 
 +      try {
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1057,6 +1073,9 @@
+@@ -1062,6 +1078,9 @@
          );
          return;
        }
 +      } catch (e) {
 +        console.warn(e);
 +      }
-
+ 
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1286,6 +1305,7 @@
+@@ -1291,6 +1310,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -66,16 +66,16 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -2371,7 +2391,7 @@
-
+@@ -2374,7 +2394,7 @@
+ 
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
 -      panel.id = uniqueId;
 +      if (!panel.id?.startsWith("zen-")) panel.id = uniqueId;
        aTab.linkedPanel = uniqueId;
-
+ 
        // Inject the <browser> into the DOM if necessary.
-@@ -2431,7 +2451,7 @@
+@@ -2434,7 +2454,7 @@
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
          this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
@@ -84,10 +84,10 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2651,6 +2671,12 @@
+@@ -2666,6 +2686,12 @@
          );
        }
-
+ 
 +      let hasZenDefaultUserContextId = false;
 +      let zenForcedWorkspaceId = undefined;
 +      if (typeof ZenWorkspaces !== "undefined") {
@@ -97,7 +97,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2720,6 +2746,12 @@
+@@ -2735,6 +2761,12 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -110,10 +110,10 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2862,6 +2894,13 @@
+@@ -2878,6 +2910,13 @@
          }
        }
-
+ 
 +      requestAnimationFrame(() => {
 +        t.setAttribute("zen-initial-fadein", "true");
 +        setTimeout(() => {
@@ -124,7 +124,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3342,6 +3381,23 @@
+@@ -3389,6 +3428,23 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -148,9 +148,9 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3355,6 +3411,9 @@
+@@ -3402,6 +3458,9 @@
              restoreTabsLazily && !select && !tabData.pinned;
-
+ 
            let url = "about:blank";
 +
 +          gZenPinnedTabManager.resetPinnedTabData(tabData);
@@ -158,10 +158,10 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3391,6 +3450,21 @@
+@@ -3438,6 +3497,21 @@
              preferredRemoteType,
            });
-
+ 
 +          if (tabData.zenWorkspace) {
 +            tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
 +          }
@@ -180,29 +180,29 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
            if (select) {
              tabToSelect = tab;
            }
-@@ -3444,7 +3518,6 @@
+@@ -3491,7 +3565,6 @@
              this.tabContainer._invalidateCachedTabs();
            }
          }
 -
          tab.initialize();
        }
-
-@@ -3992,6 +4065,10 @@
+ 
+@@ -4070,6 +4143,10 @@
          return;
        }
-
-+      for (tab of selectedTabs) {
+ 
++      for (let tab of selectedTabs) {
 +        gZenPinnedTabManager._removePinnedAttributes(tab, true);
 +      }
 +
        this.removeTabs(selectedTabs);
      }
-
-@@ -4309,6 +4386,13 @@
+ 
+@@ -4389,6 +4466,13 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
-
+ 
 +      if (ZenWorkspaces.workspaceEnabled) {
 +        let newTab = ZenWorkspaces.handleTabBeforeClose(aTab);
 +        if (newTab) {
@@ -213,10 +213,10 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4324,6 +4408,10 @@
+@@ -4404,6 +4488,10 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
-
+ 
 +      if (aTab.hasAttribute("zen-glance-tab")) {
 +        gZenGlanceManager.closeGlance();
 +        return;
@@ -224,19 +224,19 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4472,7 +4560,7 @@
+@@ -4556,7 +4644,7 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
 -        this.visibleTabs.length == 1 &&
-+        this.visibleTabs.length == 1 && !aTab._closingGlance
++        this.visibleTabs.length == 1 && !aTab._closingGlance &&
          !anyRemainingTabsInCollapsedTabGroups
        ) {
          closeWindow =
-@@ -5265,10 +5353,10 @@
+@@ -5411,10 +5499,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
-
+ 
 -    hideTab(aTab, aSource) {
 +    hideTab(aTab, aSource, forZenWorkspaces = false) {
        if (
@@ -246,7 +246,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7181,6 +7269,7 @@
+@@ -7384,6 +7472,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -254,7 +254,7 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8114,7 +8203,7 @@ var TabContextMenu = {
+@@ -8344,7 +8433,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -263,16 +263,16 @@ index fec3dc8129a4d235fdd05e0390145a02064ebaa5..65f0675f558bda9a1d02335418ffb92b
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8148,7 +8237,7 @@ var TabContextMenu = {
+@@ -8378,7 +8467,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
 -      tabsToMove[0] == visibleTabs[gBrowser.pinnedTabCount];
 +      tabsToMove[0] == visibleTabs[gBrowser._numVisiblePinTabs];
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
-
+ 
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8376,6 +8465,7 @@ var TabContextMenu = {
+@@ -8607,6 +8696,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index b4c9e38ed..7b2452785 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f42a08a8a 100644
+index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..bc8361d14f27a3ae00b791f15691c0317076f26d 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
-@@ -541,7 +541,7 @@
+@@ -649,7 +649,7 @@
        if (this.#isContainerVerticalPinnedExpanded(tab)) {
          // In expanded vertical mode, the max number of pinned tabs per row is dynamic
          // Set this before adjusting dragged tab's position
@@ -11,25 +11,25 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
          let tabsPerRow = 0;
          let position = 0;
          for (let pinnedTab of pinnedTabs) {
-@@ -918,7 +918,7 @@
-             let postTransitionCleanup = () => {
-               tab.removeAttribute("tabdrop-samewindow");
-
--              this._finishAnimateTabMove();
+@@ -1076,7 +1076,7 @@
+               let postTransitionCleanup = () => {
+                 tab.removeAttribute("tabdrop-samewindow");
+ 
+-                this._finishAnimateTabMove();
 +              this._finishAnimateTabMove(true);
-               if (dropIndex !== false) {
-                 gBrowser.moveTabTo(tab, dropIndex);
-                 if (incrementDropIndex) {
-@@ -928,7 +928,7 @@
-
-               gBrowser.syncThrobberAnimations(tab);
-             };
--            if (gReduceMotion) {
+                 if (dropIndex !== false) {
+                   gBrowser.moveTabTo(tab, dropIndex);
+                   if (incrementDropIndex) {
+@@ -1086,7 +1086,7 @@
+ 
+                 gBrowser.syncThrobberAnimations(tab);
+               };
+-              if (gReduceMotion) {
 +            if (gReduceMotion || true) {
-               postTransitionCleanup();
-             } else {
-               let onTransitionEnd = transitionendEvent => {
-@@ -1077,7 +1077,8 @@
+                 postTransitionCleanup();
+               } else {
+                 let onTransitionEnd = transitionendEvent => {
+@@ -1238,7 +1238,8 @@
        if (
          dt.mozUserCancelled ||
          dt.dropEffect != "none" ||
@@ -39,32 +39,32 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
        ) {
          delete draggedTab._dragData;
          return;
-@@ -1328,7 +1329,7 @@
+@@ -1487,7 +1488,7 @@
        }
-
+ 
        this.#allTabs = [
--      ...this.verticalPinnedTabsContainer.children,
-+      ...document.getElementById("zen-essentials-container").children, ...verticalPinnedTabsContainer.children,
+-        ...this.verticalPinnedTabsContainer.children,
++      ...document.getElementById("zen-essentials-container").children, ...this.verticalPinnedTabsContainer.children,
          ...children,
        ];
        return this.#allTabs;
-@@ -1520,10 +1521,12 @@
-
+@@ -1790,10 +1791,12 @@
+ 
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
 -      if (this.overflowing) {
 -        this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
 -      }
 +      this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
-
+ 
 +      if (!aInstant && Services.prefs.getBoolPref('zen.view.compact')
 +          && Services.prefs.getBoolPref('zen.view.compact.toolbar-flash-popup')) {
 +        gZenCompactModeManager.flashSidebar();
 +      }
        selectedTab._notselectedsinceload = false;
      }
-
-@@ -1571,7 +1574,7 @@
+ 
+@@ -1841,7 +1844,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -73,7 +73,7 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1586,7 +1589,7 @@
+@@ -1856,7 +1859,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -82,13 +82,13 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1651,13 +1654,13 @@
+@@ -1922,13 +1925,13 @@
        let verticalTabsContainer = document.getElementById(
          "vertical-pinned-tabs-container"
        );
 -      let numPinned = gBrowser.pinnedTabCount;
 +      let numPinned = gBrowser._numVisiblePinTabs;
-
+ 
        if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
          let tabs = this.visibleTabs;
          for (let i = 0; i < numPinned; i++) {
@@ -97,42 +97,42 @@ index f9e256b143786c18ba85859ca1b11182ab23f1aa..f60a8850305f1d7c2eadb6ac6996302f
 +          tabs[i].hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(tabs[i]) : verticalTabsContainer.appendChild(tabs[i]);
          }
        }
-
-@@ -1681,7 +1684,7 @@
-
+ 
+@@ -1952,7 +1955,7 @@
+ 
      _positionPinnedTabs() {
        let tabs = this.visibleTabs;
 -      let numPinned = gBrowser.pinnedTabCount;
 +      let numPinned = gBrowser._numVisiblePinTabs;
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
-
-@@ -1762,7 +1765,7 @@
+ 
+@@ -2033,7 +2036,7 @@
          return;
        }
-
+ 
 -      let tabs = this.visibleTabs.slice(0, gBrowser.pinnedTabCount);
 +      let tabs = this.visibleTabs.slice(0, gBrowser._numVisiblePinTabs);
-
+ 
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -1948,7 +1951,7 @@
+@@ -2221,7 +2224,7 @@
        }
-
+ 
        let pinned = draggedTab.pinned;
 -      let numPinned = gBrowser.pinnedTabCount;
 +      let numPinned = gBrowser._numVisiblePinTabs;
        let tabs = this.visibleTabs.slice(
          pinned ? 0 : numPinned,
          pinned ? numPinned : undefined
-@@ -2140,8 +2143,8 @@
+@@ -2456,8 +2459,8 @@
        );
      }
-
+ 
 -    _finishAnimateTabMove() {
 -      if (!this.hasAttribute("movingtab")) {
 +    _finishAnimateTabMove(always = false) {
 +      if (!this.hasAttribute("movingtab") && !always) {
          return;
        }
-
+ 
diff --git a/src/browser/themes/shared/zen-icons/essential-add.svg b/src/browser/themes/shared/zen-icons/essential-add.svg
index 14575f3bc..dae8567e1 100644
--- a/src/browser/themes/shared/zen-icons/essential-add.svg
+++ b/src/browser/themes/shared/zen-icons/essential-add.svg
@@ -3,4 +3,4 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
    -->
-<?xml version="1.0" encoding="utf-8"?><svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 122.88 109.57" fill="context-fill" fill-opacity="context-fill-opacity" xml:space="preserve"><g><path d="M65.46,19.57c-0.68,0.72-1.36,1.45-2.2,2.32l-2.31,2.41l-2.4-2.33c-0.71-0.69-1.43-1.4-2.13-2.09 c-7.42-7.3-13.01-12.8-24.52-12.95c-0.45-0.01-0.93,0-1.43,0.02c-6.44,0.23-12.38,2.6-16.72,6.65c-4.28,4-7.01,9.67-7.1,16.57 c-0.01,0.43,0,0.88,0.02,1.37c0.69,19.27,19.13,36.08,34.42,50.01c2.95,2.69,5.78,5.27,8.49,7.88l11.26,10.85l14.15-14.04 c2.28-2.26,4.86-4.73,7.62-7.37c4.69-4.5,9.91-9.49,14.77-14.52c3.49-3.61,6.8-7.24,9.61-10.73c2.76-3.42,5.02-6.67,6.47-9.57 c2.38-4.76,3.13-9.52,2.62-13.97c-0.5-4.39-2.23-8.49-4.82-11.99c-2.63-3.55-6.13-6.49-10.14-8.5C96.5,7.29,91.21,6.2,85.8,6.82 C76.47,7.9,71.5,13.17,65.46,19.57L65.46,19.57z M60.77,14.85C67.67,7.54,73.4,1.55,85.04,0.22c6.72-0.77,13.3,0.57,19.03,3.45 c4.95,2.48,9.27,6.1,12.51,10.47c3.27,4.42,5.46,9.61,6.1,15.19c0.65,5.66-0.29,11.69-3.3,17.69c-1.7,3.39-4.22,7.03-7.23,10.76 c-2.95,3.66-6.39,7.44-10,11.17C97.2,74.08,91.94,79.12,87.2,83.66c-2.77,2.65-5.36,5.13-7.54,7.29L63.2,107.28l-2.31,2.29 l-2.34-2.25l-13.6-13.1c-2.49-2.39-5.37-5.02-8.36-7.75C20.38,71.68,0.81,53.85,0.02,31.77C0,31.23,0,30.67,0,30.09 c0.12-8.86,3.66-16.18,9.21-21.36c5.5-5.13,12.97-8.13,21.01-8.42c0.55-0.02,1.13-0.03,1.74-0.02C46,0.48,52.42,6.63,60.77,14.85 L60.77,14.85z"/></g></svg>
\ No newline at end of file
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 122.88 109.57" fill="context-fill" fill-opacity="context-fill-opacity" xml:space="preserve"><g><path d="M65.46,19.57c-0.68,0.72-1.36,1.45-2.2,2.32l-2.31,2.41l-2.4-2.33c-0.71-0.69-1.43-1.4-2.13-2.09 c-7.42-7.3-13.01-12.8-24.52-12.95c-0.45-0.01-0.93,0-1.43,0.02c-6.44,0.23-12.38,2.6-16.72,6.65c-4.28,4-7.01,9.67-7.1,16.57 c-0.01,0.43,0,0.88,0.02,1.37c0.69,19.27,19.13,36.08,34.42,50.01c2.95,2.69,5.78,5.27,8.49,7.88l11.26,10.85l14.15-14.04 c2.28-2.26,4.86-4.73,7.62-7.37c4.69-4.5,9.91-9.49,14.77-14.52c3.49-3.61,6.8-7.24,9.61-10.73c2.76-3.42,5.02-6.67,6.47-9.57 c2.38-4.76,3.13-9.52,2.62-13.97c-0.5-4.39-2.23-8.49-4.82-11.99c-2.63-3.55-6.13-6.49-10.14-8.5C96.5,7.29,91.21,6.2,85.8,6.82 C76.47,7.9,71.5,13.17,65.46,19.57L65.46,19.57z M60.77,14.85C67.67,7.54,73.4,1.55,85.04,0.22c6.72-0.77,13.3,0.57,19.03,3.45 c4.95,2.48,9.27,6.1,12.51,10.47c3.27,4.42,5.46,9.61,6.1,15.19c0.65,5.66-0.29,11.69-3.3,17.69c-1.7,3.39-4.22,7.03-7.23,10.76 c-2.95,3.66-6.39,7.44-10,11.17C97.2,74.08,91.94,79.12,87.2,83.66c-2.77,2.65-5.36,5.13-7.54,7.29L63.2,107.28l-2.31,2.29 l-2.34-2.25l-13.6-13.1c-2.49-2.39-5.37-5.02-8.36-7.75C20.38,71.68,0.81,53.85,0.02,31.77C0,31.23,0,30.67,0,30.09 c0.12-8.86,3.66-16.18,9.21-21.36c5.5-5.13,12.97-8.13,21.01-8.42c0.55-0.02,1.13-0.03,1.74-0.02C46,0.48,52.42,6.63,60.77,14.85 L60.77,14.85z"/></g></svg>

From 448a072e8e712869f34edf61404371d94125e30e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 31 Dec 2024 18:54:08 +0100
Subject: [PATCH 5/5] Update primary hover color in zen-theme CSS for improved
 styling

---
 src/browser/base/content/zen-styles/zen-theme.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 18041e55f..2ee45623d 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -78,7 +78,7 @@
   --button-background-color-active: var(--in-content-primary-button-background-active) !important;
 
   --color-accent-primary: var(--button-primary-bgcolor) !important;
-  --color-accent-primary-hover: var(--button-primary-hover-bgcolor) !important;
+  --color-accent-primary-hover: var(--zen-colors-primary-foreground) !important;
   --color-accent-primary-active: var(--button-primary-active-bgcolor) !important;
 
   --link-color: var(--zen-branding-bg-reverse) !important;