From c7757131a6867a8029ce92ae543adbb9207280c5 Mon Sep 17 00:00:00 2001
From: windingwind <33902321+windingwind@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:28:05 +0800
Subject: [PATCH] Fix Prefs window style on Windows (#4465)

---
 .../zotero-platform/win/preferences.css       | 12 ----------
 scss/preferences-win.scss                     | 24 +++++++++++++++++++
 scss/win/{ => components}/_menupopup.scss     |  0
 scss/zotero-win.scss                          |  2 +-
 4 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 chrome/content/zotero-platform/win/preferences.css
 create mode 100644 scss/preferences-win.scss
 rename scss/win/{ => components}/_menupopup.scss (100%)

diff --git a/chrome/content/zotero-platform/win/preferences.css b/chrome/content/zotero-platform/win/preferences.css
deleted file mode 100644
index 1832672d94..0000000000
--- a/chrome/content/zotero-platform/win/preferences.css
+++ /dev/null
@@ -1,12 +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;
-	
-	-moz-appearance: window;
-	background-color: -moz-Dialog;
-	color: -moz-DialogText;
-	font: message-box;
-}
diff --git a/scss/preferences-win.scss b/scss/preferences-win.scss
new file mode 100644
index 0000000000..e17feb8783
--- /dev/null
+++ b/scss/preferences-win.scss
@@ -0,0 +1,24 @@
+// 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";
+
+// Windows specific
+
+@import "win/abstracts/mixins";
+
+// Components
+
+@import "win/components/button";
+@import "win/components/input";
+@import "win/components/menulist";
+@import "win/components/menupopup";
+@import "win/components/tabbox";
diff --git a/scss/win/_menupopup.scss b/scss/win/components/_menupopup.scss
similarity index 100%
rename from scss/win/_menupopup.scss
rename to scss/win/components/_menupopup.scss
diff --git a/scss/zotero-win.scss b/scss/zotero-win.scss
index 7970b3482e..2d52528d30 100644
--- a/scss/zotero-win.scss
+++ b/scss/zotero-win.scss
@@ -9,7 +9,6 @@
 @import "win/createParent";
 @import "win/tabBar";
 @import "win/titleBar";
-@import "win/menupopup";
 
 // Elements
 
@@ -20,4 +19,5 @@
 @import "win/components/button";
 @import "win/components/input";
 @import "win/components/menulist";
+@import "win/components/menupopup";
 @import "win/components/tabbox";