Refactor Zen UI components and styles for improved compact mode and URL bar behavior

src/browser/app/profile/zen-browser.js

@@ -107,6 +107,7 @@ pref('zen.view.compact.toolbar-flash-popup.duration', 800);
 pref('zen.view.compact.toolbar-hide-after-hover.duration', 1000);
 pref('zen.view.compact.color-toolbar', true);
 pref('zen.view.compact.color-sidebar', true);
+pref('zen.view.use-deprecated-urlbar', false);
 
 #ifdef XP_MACOSX
 // Disable for macos in the meantime until @HarryHeres finds a solution for hight DPI screens

src/browser/base/content/ZenUIManager.mjs

@@ -392,7 +392,7 @@ var gZenVerticalTabsManager = {
             navBar.append(windowButtons);
           }
         } else { // not windows styled buttons
-          if (isRightSide) {
+          if (isRightSide || !isSidebarExpanded) {
             navBar.prepend(windowButtons);
           } else {
             topButtons.prepend(windowButtons);

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

@@ -19,6 +19,15 @@
         display: none !important;
       }
 
+
+      #zen-sidebar-top-buttons:has(#zen-sidebar-top-buttons-customization-target:empty) {
+        max-height: 0 !important;
+        min-height: 0 !important;
+        opacity: 0;
+        overflow: hidden;
+        pointer-events: none;
+      }
+
       #navigator-toolbox {
         --zen-toolbox-max-width: 54px !important;
         --zen-compact-float: calc(var(--zen-element-separation) - 1px);

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

@@ -164,15 +164,6 @@
     &[should-hide='true'] {
 %include vertical-tabs-topbar.inc.css
     }
-
-    :root[zen-window-buttons-reversed='true'] & {
-      &:has(#PersonalToolbar[collapsed="true"]) {
-        opacity: 0;
-        & > * {
-          display: none;
-        }
-      }
-    }
   }
 }
 
@@ -335,14 +326,6 @@
   }
 }
 
-:root:not([customizing]) #zen-sidebar-top-buttons:has(#zen-sidebar-top-buttons-customization-target:empty) {
-  max-height: 0 !important;
-  min-height: 0 !important;
-  opacity: 0;
-  overflow: hidden;
-  pointer-events: none;
-}
-
 #vertical-pinned-tabs-container {
   padding-inline-end: 0 !important;
   display: flex !important;

src/browser/base/content/zen-styles/zen-urlbar.css

@@ -337,7 +337,8 @@ button.popup-notification-dropmarker {
   }
 }
 
-#urlbar[open] {
+@media not (-moz-bool-pref: 'zen.view.use-deprecated-urlbar') {
+  #urlbar[open] {
     z-index: 1000;
     min-width: 45vw;
     max-width: 45vw;
@@ -372,4 +373,5 @@ button.popup-notification-dropmarker {
       border-radius: 10px;
       background: var(--toolbarbutton-hover-background);
     }
+  }
 }