From 0fe3a4af10ca7625740ebedb1ecd92fe4aa979e2 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 10 Feb 2026 13:44:27 +0100
Subject: [PATCH] feat: Only allow overflowing webexts for twilight, b=no-bug,
 c=common, tabs

---
 prefs/zen/view.yaml                             | 2 +-
 src/browser/themes/shared/zen-icons/icons.css   | 2 +-
 src/zen/common/styles/zen-omnibox.css           | 4 ++--
 src/zen/common/styles/zen-single-components.css | 7 +++++--
 src/zen/sessionstore/ZenSessionManager.sys.mjs  | 8 +++-----
 src/zen/sessionstore/ZenWindowSync.sys.mjs      | 2 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css         | 2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/prefs/zen/view.yaml b/prefs/zen/view.yaml
index b5c498ea4..d990c13fa 100644
--- a/prefs/zen/view.yaml
+++ b/prefs/zen/view.yaml
@@ -56,4 +56,4 @@
   value: true
 
 - name: zen.view.overflow-webext-toolbar
-  value: true
+  value: "@IS_TWILIGHT@"
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 1e9792f05..44b9aff95 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -485,7 +485,7 @@
 }
 
 #zen-site-data-icon-button {
-  padding: 0 6px !important;
+  padding: 0 4px !important;
   border-radius: var(--urlbar-icon-border-radius) !important;
 
   & image {
diff --git a/src/zen/common/styles/zen-omnibox.css b/src/zen/common/styles/zen-omnibox.css
index 79f2651af..4bf89aba9 100644
--- a/src/zen/common/styles/zen-omnibox.css
+++ b/src/zen/common/styles/zen-omnibox.css
@@ -209,7 +209,7 @@
   margin: 0;
 
   :root[zen-single-toolbar="true"] & {
-    padding: 6px !important;
+    padding: 5px !important;
     width: unset !important;
     height: unset !important;
   }
@@ -396,7 +396,7 @@
 #urlbar #tracking-protection-icon-container,
 #urlbar:not([breakout-extend="true"]) #identity-box:is(:not(.chromeUI), [pageproxystate="invalid"]) #identity-icon-box {
   border-radius: var(--urlbar-icon-border-radius) !important;
-  min-width: 28px;
+  min-width: 26px;
 }
 
 /* Notification Stack */
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index f19a09413..696ae6100 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -172,7 +172,9 @@
   }
 }
 
-.toolbarbutton-1:not(#tabs-newtab-button) {
+.toolbarbutton-1:not(#tabs-newtab-button),
+.urlbar-page-action,
+.identity-box-button {
   --tab-border-radius: 6px;
   --toolbarbutton-border-radius: var(--tab-border-radius);
   --toolbarbutton-inner-padding: 6px;
@@ -386,6 +388,7 @@
     &:hover {
       background-color: color-mix(in srgb, currentColor 10%, transparent);
     }
+
     .zen-site-data-section:hover & {
       opacity: 0.5;
     }
@@ -541,7 +544,7 @@
           0px 2px 4px rgba(0, 0, 0, 0.1),
           inset 0px 1px 0px light-dark(transparent, rgba(255, 255, 255, 0.15));
         border-radius: 6px;
-        --base-border-color: light-dark(rgba(0, 0, 0, 0.175), rgba(255, 255, 255, 0.1));
+        --base-border-color: light-dark(rgba(0, 0, 0, 0.3), rgba(255, 255, 255, 0.1));
         border: 1px solid light-dark(var(--base-border-color), rgb(21, 21, 21));
       }
 
diff --git a/src/zen/sessionstore/ZenSessionManager.sys.mjs b/src/zen/sessionstore/ZenSessionManager.sys.mjs
index ef163af69..81e547928 100644
--- a/src/zen/sessionstore/ZenSessionManager.sys.mjs
+++ b/src/zen/sessionstore/ZenSessionManager.sys.mjs
@@ -98,18 +98,16 @@ export class nsZenSessionManager {
   log(...args) {
     if (lazy.gShouldLog) {
       // eslint-disable-next-line no-console
-      console.log("ZenSessionManager:", ...args);
+      console.debug("ZenSessionManager:", ...args);
     }
   }
 
   get #storeFilePath() {
-    let profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile).path;
-    return PathUtils.join(profileDir, FILE_NAME);
+    return PathUtils.join(PathUtils.profileDir, FILE_NAME);
   }
 
   get #backupFolderPath() {
-    let profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile).path;
-    return PathUtils.join(profileDir, "zen-sessions-backup");
+    return PathUtils.join(PathUtils.profileDir, "zen-sessions-backup");
   }
 
   /**
diff --git a/src/zen/sessionstore/ZenWindowSync.sys.mjs b/src/zen/sessionstore/ZenWindowSync.sys.mjs
index 71f34abb8..cba9444c3 100644
--- a/src/zen/sessionstore/ZenWindowSync.sys.mjs
+++ b/src/zen/sessionstore/ZenWindowSync.sys.mjs
@@ -169,7 +169,7 @@ class nsZenWindowSync {
   log(...args) {
     if (lazy.gShouldLog) {
       // eslint-disable-next-line no-console
-      console.info("ZenWindowSync:", ...args);
+      console.debug("ZenWindowSync:", ...args);
     }
   }
 
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index fe647eb2d..26cf51eec 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -297,7 +297,7 @@
 
   --tab-block-margin: 2px;
   --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.18));
-  --tab-selected-shadow: 0 1px 1px 1px light-dark(rgba(0, 0, 0, 0.09), rgba(0, 0, 0, 0.05)) !important;
+  --tab-selected-shadow: 0 1px 1px 0px light-dark(rgba(0, 0, 0, 0.09), rgba(0, 0, 0, 0.05)) !important;
   grid-gap: 0 !important;
 
   &[overflow]::after,