Merge branch 'dev' into right-split-drop

src/browser/base/content/ZenUIManager.mjs

@@ -620,6 +620,12 @@ var gZenVerticalTabsManager = {
       }
 
       gZenCompactModeManager.updateCompactModeContext(isSingleToolbar);
+      document.getElementById("urlbar").removeAttribute('--urlbar-height');
+      if (!isSingleToolbar) {
+        document.getElementById("urlbar").style.setProperty('--urlbar-height', '32px');
+      } else {
+        gURLBar.updateLayoutBreakout();
+      }
 
       // Always move the splitter next to the sidebar
       this.navigatorToolbox.after(document.getElementById('zen-sidebar-splitter'));

src/browser/base/content/zen-styles/zen-sidebar-panels.css

@@ -111,6 +111,7 @@
   background: transparent;
   border: none;
   cursor: ew-resize;
+  z-index: 2;
 
   &:is(.zen-split-view-splitter[orient='vertical']) {
     /* Bit of a hacky solution, but it works */

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

@@ -373,8 +373,12 @@
   overflow-y: auto;
   height: 100%;
   scrollbar-width: thin;
-  margin-left: calc(-1 * var(--zen-toolbox-padding));
-  width: calc(100% + var(--zen-toolbox-padding) * 2);
+
+  /* Only do this hack if we have workspaces enabled */
+  :root[zen-workspace-id] & {
+    margin-left: calc(-1 * var(--zen-toolbox-padding));
+    width: calc(100% + var(--zen-toolbox-padding) * 2);
+  }
 }
 
 #zen-browser-tabs-container {