Adjustments while updating to firefox 136.0

zen-browser · Feb 26, 2025 · 576632f · 576632f
1 parent f7995f6
commit 576632f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
@@ -176,7 +176,7 @@ pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
 pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch');
 
 // TODO: Check this out!
-pref("browser.profiles.enabled", false);
+pref("browser.profiles.enabled", true);
 
 // Zen webpanels (calling it sidebar due to legacy reasons)
 pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n   \"url\":\"https://www.wikipedia.org/\"\n  },\n\"p2\":{\n   \"url\":\"https://m.twitter.com/\",\n\"ua\": true\n  },\n\"p3\": {\n   \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n},\n\"p4\": {\n   \"url\": \"https://translate.google.com/\",\n\"ua\": true\n},\n\"p5\": {\n   \"url\": \"https://todoist.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\",\"p4\",\"p5\"]}");

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
@@ -483,9 +483,11 @@ var gZenVerticalTabsManager = {
       if (isSidebarExpanded) {
         this.navigatorToolbox.setAttribute('zen-sidebar-expanded', 'true');
         document.documentElement.setAttribute('zen-sidebar-expanded', 'true');
+        gBrowser.tabContainer.setAttribute('expanded', 'true');
       } else {
         this.navigatorToolbox.removeAttribute('zen-sidebar-expanded');
         document.documentElement.removeAttribute('zen-sidebar-expanded');
+        gBrowser.tabContainer.removeAttribute('expanded');
       }
 
       const appContentNavbarContaienr = document.getElementById('zen-appcontent-navbar-container');

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -775,6 +775,8 @@
   transition: opacity 0.2s ease-in-out;
   background: var(--zen-colors-border);
   appearance: none;
+  position: relative !important;
+  order: 0;
 }
 
 /* Mark: Move sidebar to the right */

diff --git 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 fa96568d366fd3608f9bd583fa793150bd815c8b..1eb9e56d0e3bda0d7fa7fe856521ec261ba3a893 100644
+index fa96568d366fd3608f9bd583fa793150bd815c8b..f92f3fba8deaebdc494a443de522e990d029cd67 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -82,6 +82,15 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..1eb9e56d0e3bda0d7fa7fe856521ec26
                  if (dropIndex !== false) {
                    gBrowser.moveTabTo(tab, dropIndex);
                    if (!directionForward) {
+@@ -1122,7 +1134,7 @@
+                   }
+                 }
+               };
+-              if (gReduceMotion) {
++              if (true || gReduceMotion) {
+                 postTransitionCleanup();
+               } else {
+                 let onTransitionEnd = transitionendEvent => {
 @@ -1285,7 +1297,8 @@
        if (
          dt.mozUserCancelled ||
@@ -331,8 +340,8 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..1eb9e56d0e3bda0d7fa7fe856521ec26
 +      let numPinned = gBrowser._numVisiblePinTabs;
 +      let essential = draggedTab.hasAttribute("zen-essential");
 +      let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
-+        pinned ? (essential ? 0 : gBrowser._numZenEssentials) : numPinned,
-+        pinned ? (essential ? gBrowser._numZenEssentials : (numPinned-gBrowser._numZenEssentials)) : undefined
++        pinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
++        pinned ? (essential ? gBrowser._numZenVisibleEssentials : ((numPinned - gBrowser._numZenVisibleEssentials) + 1)) : undefined
        );
 
        if (this.#rtlMode) {
@@ -353,7 +362,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..1eb9e56d0e3bda0d7fa7fe856521ec26
            movingTab._moveTogetherSelectedTabsData.animate = false;
          };
 -        if (gReduceMotion) {
-+            if (gReduceMotion || true) {
++        if (true || gReduceMotion) {
            postTransitionCleanup();
          } else {
            let onTransitionEnd = transitionendEvent => {

diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
@@ -1138,3 +1138,8 @@ menupopup > menuitem:is([type='checkbox']) .menu-iconic-left {
     padding-inline-start: 6px;
   }
 }
+
+#toolbar-context-toggle-vertical-tabs,
+#toolbar-context-customize-sidebar {
+  display: none;
+}