From fcbc6ec1d5d3b87a392d9413cecbbbdee950438d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 28 Sep 2026 10:31:30 -0400
Subject: [PATCH] Fix cramped button and menulist labels on macOS 26+

Firefox stopped inflating native controls on Tahoe (bug 1992898), but
still uses the old widget border sizes, so labels nearly touch the edges
of the new capsule-shaped buttons and run into menulist arrows.
---
 scss/mac/components/_button.scss | 13 +++++++++++++
 scss/preferences-mac.scss        |  1 +
 scss/zotero-mac.scss             |  1 +
 3 files changed, 15 insertions(+)
 create mode 100644 scss/mac/components/_button.scss

diff --git a/scss/mac/components/_button.scss b/scss/mac/components/_button.scss
new file mode 100644
index 0000000000..209ec56f84
--- /dev/null
+++ b/scss/mac/components/_button.scss
@@ -0,0 +1,13 @@
+// Firefox 153 draws native controls on macOS 26+ to fill their entire frame
+// (see InflateControlRect() in nsNativeThemeCocoa.mm) but still uses the old
+// widget border sizes, leaving labels nearly touching the edges of the new
+// capsule-shaped buttons and menulists
+@media (-moz-mac-tahoe-theme) {
+	:where(button:not(.plain)) {
+		padding-inline: 6px;
+	}
+	
+	:where(menulist) {
+		padding-inline: 6px;
+	}
+}
diff --git a/scss/preferences-mac.scss b/scss/preferences-mac.scss
index bbcc68925c..6791302315 100644
--- a/scss/preferences-mac.scss
+++ b/scss/preferences-mac.scss
@@ -15,6 +15,7 @@
 
 // Components
 
+@import "mac/components/button";
 @import "mac/components/input";
 @import "mac/components/menupopup";
 @import "mac/components/menulist";
diff --git a/scss/zotero-mac.scss b/scss/zotero-mac.scss
index 48f9235271..e498f8d388 100644
--- a/scss/zotero-mac.scss
+++ b/scss/zotero-mac.scss
@@ -10,6 +10,7 @@
 @import "mac/tabBar";
 @import "mac/tabbox";
 @import "mac/titleBar";
+@import "mac/components/button";
 @import "mac/components/input";
 @import "mac/components/menupopup";
 @import "mac/components/menulist";