From 01017e7d63b3d89f8341f45d94376cc318b03468 Mon Sep 17 00:00:00 2001
From: windingwind <33902321+windingwind@users.noreply.github.com>
Date: Thu, 12 Sep 2024 11:13:19 +0200
Subject: [PATCH] Fix prefs window style on MacOS (#4682)

Use MacOS menupopup style to prefs window
Move style mac/menupopup into mac/components
---
 .../zotero-platform/mac/preferences.css       | 26 -------------------
 scss/mac/_helpButton.scss                     |  5 ++++
 scss/mac/{ => components}/_menupopup.scss     |  0
 scss/preferences-mac.scss                     | 19 ++++++++++++++
 scss/zotero-mac.scss                          |  2 +-
 5 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 chrome/content/zotero-platform/mac/preferences.css
 create mode 100644 scss/mac/_helpButton.scss
 rename scss/mac/{ => components}/_menupopup.scss (100%)
 create mode 100644 scss/preferences-mac.scss

diff --git a/chrome/content/zotero-platform/mac/preferences.css b/chrome/content/zotero-platform/mac/preferences.css
deleted file mode 100644
index 1f4170cf71..0000000000
--- a/chrome/content/zotero-platform/mac/preferences.css
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-window[windowtype="zotero:pref"] {
-	padding: 0;
-	font: -moz-dialog !important;
-	
-	-moz-appearance: dialog;
-	color: -moz-DialogText;
-}
-
-groupbox > label > h2, groupbox > * > label > h2 {
-	border-bottom: #b5b5b5 1px solid;
-}
-
-groupbox > label > h2, groupbox > * > label > h2, caption {
-	padding-bottom: 0.2em;
-	font: caption;
-}
-
-.help-button {
-	appearance: auto;
-	-moz-default-appearance: -moz-mac-help-button;
-	min-width: 0;
-}
diff --git a/scss/mac/_helpButton.scss b/scss/mac/_helpButton.scss
new file mode 100644
index 0000000000..8d9d0aba23
--- /dev/null
+++ b/scss/mac/_helpButton.scss
@@ -0,0 +1,5 @@
+.help-button {
+	appearance: auto;
+	-moz-default-appearance: -moz-mac-help-button;
+	min-width: 0;
+}
diff --git a/scss/mac/_menupopup.scss b/scss/mac/components/_menupopup.scss
similarity index 100%
rename from scss/mac/_menupopup.scss
rename to scss/mac/components/_menupopup.scss
diff --git a/scss/preferences-mac.scss b/scss/preferences-mac.scss
new file mode 100644
index 0000000000..6672b62797
--- /dev/null
+++ b/scss/preferences-mac.scss
@@ -0,0 +1,19 @@
+// Abstracts
+
+@import "abstracts/variables";
+@import "abstracts/functions";
+@import "abstracts/mixins";
+@import "abstracts/placeholders";
+@import "abstracts/utilities";
+@import "abstracts/split-button";
+@import "abstracts/svgicon";
+
+@import "themes/light";
+@import "themes/dark";
+
+@import "mac/helpButton";
+
+// Components
+
+@import "mac/components/menupopup";
+@import "mac/components/menulist";
diff --git a/scss/zotero-mac.scss b/scss/zotero-mac.scss
index 2e182a1598..c25eeb1417 100644
--- a/scss/zotero-mac.scss
+++ b/scss/zotero-mac.scss
@@ -9,7 +9,7 @@
 @import "mac/tabBar";
 @import "mac/tabbox";
 @import "mac/titleBar";
-@import "mac/menupopup";
+@import "mac/components/menupopup";
 @import "mac/components/menulist";
 
 // Elements