Merge branch 'main' into main

src/browser/base/content/zen-styles/zen-compact-mode.css

@@ -33,6 +33,10 @@
       border-radius: var(--zen-panel-radius);
     }
 
+    & > * {
+      pointer-events: none;  
+    }
+
     &, & #titlebar {
       min-width: calc(var(--zen-navigation-toolbar-min-width) + var(--zen-compact-toolbox-margin-single) * 4) !important;
     }
@@ -68,7 +72,7 @@
   @media not (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
     #navigator-toolbox {
       /* Remove the top margin */
-      --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 3) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
+      --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
     }
 
     #zen-sidebar-web-panel-wrapper,
@@ -84,9 +88,13 @@
   #navigator-toolbox:has(*[open="true"]:not(tab):not(#zen-sidepanel-button)) {
     transform: none !important;
     opacity: 1;
+
+    & > * {
+      pointer-events: all;  
+    }
   }
   
-  #navigator-toolbox > *{ line-height: normal; pointer-events: auto }
+  #navigator-toolbox > *{ line-height: normal; }
   
   #navigator-toolbox,
   #navigator-toolbox > *{

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -395,10 +395,13 @@
       z-index: 1;
     }
 
+    #navigator-toolbox, #titlebar, #TabsToolbar {
+      transition: 0s !important;
+    }
+
     #TabsToolbar {
       --hovered-verticaltab-width: 20em;
 
-      transition: 200ms, margin 200ms, border-color 0 ease-in-out !important;
       z-index: 1;
       background-repeat: no-repeat !important;
       background-position: center center !important;
@@ -418,12 +421,8 @@
       visibility: hidden !important;
     }
 
-    #TabsToolbar-customization-target:hover > .toolbarbutton-1 > .toolbarbutton-text {
-      transition-delay: 0.2s !important;
-    }
-    
-    #TabsToolbar-customization-target:hover > .toolbarbutton-1 > .toolbarbutton-text {
-      transition-delay: 0.2s !important;
+    #navigator-toolbox:hover {
+      --zen-navigation-toolbar-min-width: 3.7rem !important;
     }
         
     #navigator-toolbox:hover #TabsToolbar {

src/browser/installer/package-manifest-in.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e1d90c5ea 100644
+index da760e143740a166df14d055cf3ec7b095b93d10..093dacee4356d4084432d53639873e3da006dd94 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -370,8 +370,8 @@ bin/libfreebl_64int_3.so
+@@ -377,17 +377,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
@@ -13,3 +13,23 @@ index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e
  #endif
  
  ; [Crash Reporter]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+ #ifdef XP_MACOSX
+-@BINPATH@/crashreporter.app/
++;@BINPATH@/crashreporter.app/
+ #else
+-@BINPATH@/crashreporter@BIN_SUFFIX@
++;@BINPATH@/crashreporter@BIN_SUFFIX@
+ #if defined(XP_WIN)
+ @BINPATH@/@DLL_PREFIX@mozwer@DLL_SUFFIX@
+ #endif
+@@ -397,7 +397,7 @@ bin/libfreebl_64int_3.so
+ ; [ minidump-analyzer ]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+-@BINPATH@/minidump-analyzer@BIN_SUFFIX@
++;@BINPATH@/minidump-analyzer@BIN_SUFFIX@
+ #endif
+ 
+ ; [ Ping Sender ]