fix: streamline style clearing in ZenGlanceManager and update version numbers in surfer.json

Author: mr-cheffy

src/browser/base/content/ZenStartup.mjs

@@ -83,8 +83,6 @@
 
     _changeSidebarLocation() {
       const kElementsToAppend = ['sidebar-splitter', 'sidebar-box'];
-      const appWrapepr = document.getElementById('zen-sidebar-box-container');
-      appWrapepr.setAttribute('hidden', 'true');
 
       const browser = document.getElementById('browser');
       const toolbox = document.getElementById('navigator-toolbox');

src/browser/base/content/ZenUIManager.mjs

@@ -657,10 +657,10 @@ var gZenVerticalTabsManager = {
       this.navigatorToolbox.after(document.getElementById('zen-sidebar-splitter'));
       window.dispatchEvent(new Event('resize'));
       gZenCompactModeManager.getAndApplySidebarWidth();
+      gZenUIManager.updateTabsToolbar();
     } catch (e) {
       console.error(e);
     }
-    gZenUIManager.updateTabsToolbar();
     this._isUpdating = false;
   },
 

src/browser/base/content/browser-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 0d0a559a6473149b50f4bf18d059e86907c4acd3..a5a48ba1d50b3bf74dec3f3d371a76228e246a9e 100644
+index 0d0a559a6473149b50f4bf18d059e86907c4acd3..25ad798eb26f04262d069fdaf1f3fb00adec9807 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -26,6 +26,7 @@
@@ -27,7 +27,7 @@ index 0d0a559a6473149b50f4bf18d059e86907c4acd3..a5a48ba1d50b3bf74dec3f3d371a7622
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -169,9 +173,13 @@
+@@ -169,9 +173,11 @@
      </vbox>
    </html:template>
 
@@ -37,8 +37,6 @@ index 0d0a559a6473149b50f4bf18d059e86907c4acd3..a5a48ba1d50b3bf74dec3f3d371a7622
 +  <hbox id="zen-main-app-wrapper" flex="1" persist="zen-compact-mode">
 +    <vbox id="zen-toast-container"></vbox>
 +    #include navigator-toolbox.inc.xhtml
-+    <html:span id="zen-sidebar-box-container">
-+    </html:span>
 +    #include browser-box.inc.xhtml
 +  </hbox>
 

src/browser/base/content/zen-assets.inc.xhtml

@@ -19,7 +19,6 @@
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-decks.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-folders.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-glance.css" />
-<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-sidebar-panels.css" />
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-popup.css" />
 
 <link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-compact-mode.css" />

src/browser/base/content/zen-assets.jar.inc.mn

@@ -45,7 +45,6 @@
         content/browser/zen-styles/zen-workspaces.css           (content/zen-styles/zen-workspaces.css)
         content/browser/zen-styles/zen-urlbar.css               (content/zen-styles/zen-urlbar.css)
         content/browser/zen-styles/zen-popup.css                (content/zen-styles/zen-popup.css)
-        content/browser/zen-styles/zen-sidebar-panels.css       (content/zen-styles/zen-sidebar-panels.css)
         content/browser/zen-styles/zen-gradient-generator.css   (content/zen-styles/zen-gradient-generator.css)
         content/browser/zen-styles/zen-rices.css                (content/zen-styles/zen-rices.css)
         content/browser/zen-styles/zen-branding.css             (content/zen-styles/zen-branding.css)

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

@@ -191,3 +191,42 @@
 :root[zen-window-buttons-reversed='true'][zen-right-side='true'] .titlebar-buttonbox-container {
   margin-inline-start: calc(var(--zen-element-separation) - 3px);
 }
+
+.zen-split-view-splitter[orient='vertical'],
+#zen-sidebar-splitter {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: var(--zen-element-separation);
+  background: transparent;
+  border: none;
+  cursor: ew-resize;
+  z-index: 3;
+
+  &:is(.zen-split-view-splitter[orient='vertical']) {
+    /* Bit of a hacky solution, but it works */
+    width: var(--zen-split-row-gap);
+    margin-left: calc(var(--zen-element-separation) * -1 - 1px);
+    height: unset;
+    cursor: ew-resize;
+  }
+
+  &::before {
+    height: 50px;
+    width: 2px;
+    background: var(--button-primary-bgcolor);
+    border-radius: 2px;
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    opacity: 0;
+    transition: opacity 0.1s ease-in-out;
+    pointer-events: none;
+  }
+
+  &:hover::before {
+    opacity: 1;
+  }
+}