From c978d6b80a274e9c942cf0efe2a6661121d18f12 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 29 Aug 2026 01:53:07 +0200
Subject: [PATCH] no-bug: Add exceptions

---
 src/browser/base/content/navigator-toolbox-inc-xhtml.patch | 4 ++--
 src/browser/base/content/zen-panels/site-data.inc          | 4 ++++
 src/zen/common/styles/zen-browser-ui.css                   | 2 --
 src/zen/common/styles/zen-popup.css                        | 4 ++--
 src/zen/common/styles/zen-single-components.css            | 1 -
 src/zen/common/styles/zen-theme.css                        | 4 +++-
 src/zen/compact-mode/zen-compact-mode.css                  | 2 +-
 src/zen/folders/ZenFolder.mjs                              | 2 +-
 src/zen/spaces/ZenSpace.mjs                                | 2 +-
 src/zen/tabs/zen-tabs/vertical-tabs.css                    | 2 ++
 10 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 471dd604f..6bfa00678 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index dd2f391096968564086911c532f696dc7ffb8ae1..3de617bf4fb7fa35f7d4d7b618e4673b72b953ee 100644
+index dd2f391096968564086911c532f696dc7ffb8ae1..c968e5f0ebb5f0151fb124bafe10d8d5361e060f 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -19,7 +19,7 @@ index dd2f391096968564086911c532f696dc7ffb8ae1..3de617bf4fb7fa35f7d4d7b618e4673b
    </toolbar>
  
 +<hbox id="titlebar">
-+  <html:div id="zen-toolbar-background" class="zen-toolbar-background zen-browser-generic-background">
++  <html:div id="zen-toolbar-background" class="zen-toolbar-background zen-squircle-before zen-squircle-after zen-browser-generic-background">
 +    <html:div class="zen-browser-grain" />
 +  </html:div>
 +  <box id="zen-overflow-extensions-list" skipintoolbarset="true" contextmenu="toolbar-context-menu" />
diff --git a/src/browser/base/content/zen-panels/site-data.inc b/src/browser/base/content/zen-panels/site-data.inc
index aa95fb9f8..2e798a4da 100644
--- a/src/browser/base/content/zen-panels/site-data.inc
+++ b/src/browser/base/content/zen-panels/site-data.inc
@@ -15,19 +15,23 @@
                 mainview-with-header="true">
       <hbox id="zen-site-data-header">
         <toolbarbutton id="zen-site-data-header-share"
+                        class="zen-squircle-before"
                         data-l10n-id="zen-site-data-header-share"
                         flex="1"
                         closemenu="none" />
         <toolbarbutton id="zen-site-data-header-reader-mode"
+                        class="zen-squircle-before"
                         data-l10n-id="zen-site-data-header-reader-mode"
                         command="View:ReaderView"
                         tooltip="dynamic-shortcut-tooltip"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-screenshot"
+                        class="zen-squircle-before"
                         data-l10n-id="zen-site-data-header-screenshot"
                         command="Browser:Screenshot"
                         flex="1" />
         <toolbarbutton id="zen-site-data-header-bookmark"
+                        class="zen-squircle-before"
                         data-l10n-id="zen-site-data-header-bookmark"
                         command="Browser:AddBookmarkAs"
                         flex="1" />
diff --git a/src/zen/common/styles/zen-browser-ui.css b/src/zen/common/styles/zen-browser-ui.css
index ed2e68635..7308f9e58 100644
--- a/src/zen/common/styles/zen-browser-ui.css
+++ b/src/zen/common/styles/zen-browser-ui.css
@@ -66,7 +66,6 @@ body,
 
   &:is(.zen-toolbar-background) {
     &::after {
-      corner-shape: superellipse(var(--zen-squircle-value));
       background: var(--zen-main-browser-background-toolbar);
     }
   }
@@ -80,7 +79,6 @@ body,
 
   &:is(.zen-toolbar-background) {
     &::before {
-      corner-shape: superellipse(var(--zen-squircle-value));
       background: var(--zen-main-browser-background-toolbar-old);
     }
   }
diff --git a/src/zen/common/styles/zen-popup.css b/src/zen/common/styles/zen-popup.css
index e9aff9a65..133406d7a 100644
--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -335,7 +335,7 @@ menuseparator {
     gap: 8px;
     z-index: 1000;
     padding: var(--zen-toast-padding);
-    border-radius: 10px;
+    border-radius: 14px;
     background: linear-gradient(to bottom, var(--zen-primary-color) -40%, color-mix(in srgb, var(--zen-primary-color), #0f0f0f 20%));
     box-shadow: light-dark(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.4)) 0 0 22px 2px;
     border: none;
@@ -374,7 +374,7 @@ menuseparator {
       min-width: unset !important;
       min-height: 28px;
       margin: 0 !important;
-      border-radius: 6px !important;
+      border-radius: 10px !important;
       border-top: 2px solid light-dark(transparent, rgba(255, 255, 255, 0.1));
       color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8)) !important;
       box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.05);
diff --git a/src/zen/common/styles/zen-single-components.css b/src/zen/common/styles/zen-single-components.css
index 18ca05eb8..36daaf52e 100644
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -601,7 +601,6 @@
       position: absolute;
       width: 100%;
       height: 100%;
-      corner-shape: superellipse(var(--zen-squircle-value));
 
       @media (-moz-platform: macos) {
         background: linear-gradient(to bottom, light-dark(rgb(255, 255, 255), rgb(34, 34, 34)), light-dark(rgb(246, 246, 246), rgb(21, 21, 21)));
diff --git a/src/zen/common/styles/zen-theme.css b/src/zen/common/styles/zen-theme.css
index b676d6efc..6439f30ba 100644
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -352,7 +352,9 @@
 %include zen-buttons.css
 
 @media (-moz-pref('layout.css.corner-shape.enabled')) {
-  *:not(.no-squircles) {
+  *:not(.no-squircles),
+  .zen-squircle-before::before,
+  .zen-squircle-after::after {
     corner-shape: superellipse(var(--zen-squircle-value));
   }
 }
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index 7058bcf44..4724558e7 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -29,7 +29,7 @@
   &,
   &::before,
   &::after {
-    border-radius: calc(var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px));
+    border-radius: calc((var(--zen-native-inner-radius) - var(--zen-compact-mode-no-padding-radius-fix, 0px)) * var(--zen-squircle-value));
   }
 }
 
diff --git a/src/zen/folders/ZenFolder.mjs b/src/zen/folders/ZenFolder.mjs
index 088131fa6..793909716 100644
--- a/src/zen/folders/ZenFolder.mjs
+++ b/src/zen/folders/ZenFolder.mjs
@@ -12,7 +12,7 @@ export class nsZenFolder extends MozTabbrowserTabGroup {
   #initialized = false;
 
   static markup = `
-      <hbox class="tab-group-label-container zen-drop-target" pack="center">
+      <hbox class="tab-group-label-container zen-squircle-before zen-drop-target" pack="center">
         <html:div class="tab-group-folder-icon"/>
         <label class="tab-group-label" role="button"/>
         <image class="tab-reset-button reset-icon" role="button" keyNav="false" data-l10n-id="zen-folders-unload-all-tooltip"/>
diff --git a/src/zen/spaces/ZenSpace.mjs b/src/zen/spaces/ZenSpace.mjs
index d024ded06..06e9af39f 100644
--- a/src/zen/spaces/ZenSpace.mjs
+++ b/src/zen/spaces/ZenSpace.mjs
@@ -52,7 +52,7 @@ export class nsZenWorkspace extends MozXULElement {
 
   static get markup() {
     return `
-        <vbox class="zen-workspace-tabs-section zen-current-workspace-indicator zen-drop-target" flex="1" context="zenWorkspaceMoreActions">
+        <vbox class="zen-workspace-tabs-section zen-current-workspace-indicator zen-squircle-before zen-drop-target" flex="1" context="zenWorkspaceMoreActions">
           <stack class="zen-current-workspace-indicator-stack">
             <image class="zen-current-workspace-indicator-chevron" />
             <hbox class="zen-current-workspace-indicator-icon" />
diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index 9bd132ef6..cfa4e8177 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -1208,6 +1208,7 @@
         background-position: center;
         fill: currentColor;
         -moz-context-properties: fill, fill-opacity;
+        corner-shape: superellipse(var(--zen-squircle-value));
       }
 
       background: transparent;
@@ -1234,6 +1235,7 @@
         z-index: 0;
         content: "";
         transition: background 0.1s ease-in-out;
+        corner-shape: superellipse(var(--zen-squircle-value));
       }
     }