Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

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 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..d031a99ae5c9c6e69cfd831c7d271d8a8d097dc8 100644
+index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..fcff5cc6a4a50ff2d76930e4d2a1e1d0b2e6bc02 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -26,6 +26,7 @@
@@ -25,7 +25,7 @@ index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..d031a99ae5c9c6e69cfd831c7d271d8a
      </vbox>
    </html:template>
  
-+<hbox id="zen-main-app-wrapper" flex="1" persist="zen-compact-mode" class="browser-toolbox-background">
++<hbox id="zen-main-app-wrapper" flex="1" class="browser-toolbox-background">
  #include navigator-toolbox.inc.xhtml
  
  #include browser-box.inc.xhtml

src/zen/compact-mode/ZenCompactMode.mjs

@@ -37,20 +37,10 @@ var gZenCompactModeManager = {
   HOVER_HACK_DELAY: Services.prefs.getIntPref('zen.view.compact.hover-hack-delay', 0),
 
   preInit() {
-    // Remove it before initializing so we can properly calculate the width
-    // of the sidebar at startup and avoid overflowing items not being hidden
-    let xulStoreValue = Services.xulStore.getValue(
-      AppConstants.BROWSER_CHROME_URL,
-      'zen-main-app-wrapper',
-      'zen-compact-mode'
+    this._wasInCompactMode = Services.prefs.getBoolPref(
+      'zen.view.compact.enable-at-startup',
+      false
     );
-    if (xulStoreValue === '-moz-missing\n' || !xulStoreValue) {
-      xulStoreValue = false;
-    }
-    this._wasInCompactMode =
-      xulStoreValue || Services.prefs.getBoolPref('zen.view.compact.enable-at-startup', false);
-    lazyCompactMode.mainAppWrapper.removeAttribute('zen-compact-mode');
-
     this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);
 
     this.addContextMenu();
@@ -133,7 +123,6 @@ var gZenCompactModeManager = {
     // main-window can't store attributes other than window sizes, so we use this instead
     lazyCompactMode.mainAppWrapper.setAttribute('zen-compact-mode', value);
     document.documentElement.setAttribute('zen-compact-mode', value);
-    Services.xulStore.persist(lazyCompactMode.mainAppWrapper, 'zen-compact-mode');
     if (typeof this._wasInCompactMode === 'undefined') {
       Services.prefs.setBoolPref('zen.view.compact.enable-at-startup', value);
     }

src/zen/folders/zen-folders.css

@@ -41,7 +41,7 @@ tab-group[split-view-group] {
     outline-offset: var(--tab-outline-offset);
     outline-color: var(--tab-selected-outline-color);
     transition: scale 0.1s ease;
-    margin-inline: 0 !important;
+    margin-inline: 2px !important;
 
     :root:not([zen-sidebar-expanded='true']) & {
       padding: 0;