From f9a2f2f3e06b681a624aa1b7b23575995af70eb8 Mon Sep 17 00:00:00 2001
From: windingwind <33902321+windingwind@users.noreply.github.com>
Date: Fri, 22 Dec 2023 23:10:26 +0800
Subject: [PATCH] Fix Linux UI bugs

---
 chrome/content/zotero/components/button.jsx           |  3 ---
 .../content/zotero/components/virtualized-table.jsx   |  6 +-----
 scss/components/_button.scss                          |  4 ++--
 scss/linux/_about.scss                                |  4 ----
 scss/linux/elements/_noteEditor.scss                  | 10 ----------
 scss/mac/_button.scss                                 | 11 -----------
 scss/zotero-mac.scss                                  |  1 -
 scss/zotero-unix.scss                                 |  2 --
 8 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 scss/linux/_about.scss
 delete mode 100644 scss/linux/elements/_noteEditor.scss
 delete mode 100644 scss/mac/_button.scss

diff --git a/chrome/content/zotero/components/button.jsx b/chrome/content/zotero/components/button.jsx
index b809299344..1782f0bdfa 100644
--- a/chrome/content/zotero/components/button.jsx
+++ b/chrome/content/zotero/components/button.jsx
@@ -74,9 +74,6 @@ class Button extends PureComponent {
 	}
 	
 	get menuMarker() {
-		if (!Zotero.isNode && Zotero.isLinux) {
-			return this.props.isMenu && <span className="menu-marker"/>
-		}
 		return this.props.isMenu && <CSSIcon name="chevron-6" className="menu-marker icon-8"/>
 	}
 
diff --git a/chrome/content/zotero/components/virtualized-table.jsx b/chrome/content/zotero/components/virtualized-table.jsx
index a108fda728..701f077e1d 100644
--- a/chrome/content/zotero/components/virtualized-table.jsx
+++ b/chrome/content/zotero/components/virtualized-table.jsx
@@ -1142,11 +1142,7 @@ class VirtualizedTable extends React.Component {
 			}
 			let sortIndicator = "";
 			if (!column.iconLabel && column.sortDirection) {
-				if (!Zotero.isNode && Zotero.isLinux) {
-					sortIndicator = <span className={"sort-indicator " + (column.sortDirection === 1 ? "ascending" : "descending")}/>;
-				} else {
-					sortIndicator = <CSSIcon name="sort-indicator" className={"icon-8 sort-indicator " + (column.sortDirection === 1 ? "ascending" : "descending")} />;
-				}
+				sortIndicator = <CSSIcon name="sort-indicator" className={"icon-8 sort-indicator " + (column.sortDirection === 1 ? "ascending" : "descending")} />;
 			}
 			const className = cx("cell", column.className, { 'first-column': index === 0, dragging: this.state.draggingColumn == index },
 				{ "cell-icon": !!column.iconLabel });
diff --git a/scss/components/_button.scss b/scss/components/_button.scss
index bc3a42e70d..57de95553c 100644
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@ -10,7 +10,7 @@
 	line-height: inherit;
 	color: inherit;
 	text-align: center;
-	-moz-appearance: toolbarbutton;
+	-moz-appearance: none;
 
 	&[disabled],
 	&.disabled {
@@ -25,7 +25,7 @@
 		}
 	}
 	span.menu-marker {
-		-moz-appearance: toolbarbutton-dropdown;
+		-moz-appearance: none;
 		display: inline-block;
 		margin-left: 4px;
 	}
diff --git a/scss/linux/_about.scss b/scss/linux/_about.scss
deleted file mode 100644
index 4a0bd21a75..0000000000
--- a/scss/linux/_about.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-#aboutcontent
-{
-	color: #3e3e3e;
-}
\ No newline at end of file
diff --git a/scss/linux/elements/_noteEditor.scss b/scss/linux/elements/_noteEditor.scss
deleted file mode 100644
index c13cd8c959..0000000000
--- a/scss/linux/elements/_noteEditor.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-tags-box, related-box {
-	color: Text;
-	background: Background;
-}
-
-#related-popup, #tags-popup {
-	--panel-color: Text;
-	--panel-background: transparent;
-	--panel-border-color: InactiveBorder
-}
\ No newline at end of file
diff --git a/scss/mac/_button.scss b/scss/mac/_button.scss
deleted file mode 100644
index de2c03cb48..0000000000
--- a/scss/mac/_button.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Button
-// --------------------------------------------------
-
-.btn {
-  -moz-appearance: none;
-  
-  span.menu-marker {
-    -moz-appearance: none;
-  }
-}
\ No newline at end of file
diff --git a/scss/zotero-mac.scss b/scss/zotero-mac.scss
index 4a1041d00b..142bc2ec22 100644
--- a/scss/zotero-mac.scss
+++ b/scss/zotero-mac.scss
@@ -4,7 +4,6 @@
 // MacOS specific
 // --------------------------------------------------
 
-@import "mac/button";
 @import "mac/createParent";
 @import "mac/editable";
 @import "mac/tabBar";
diff --git a/scss/zotero-unix.scss b/scss/zotero-unix.scss
index 3d2a72f32f..c403463a3e 100644
--- a/scss/zotero-unix.scss
+++ b/scss/zotero-unix.scss
@@ -4,7 +4,6 @@
 // Linux specific
 // --------------------------------------------------
 
-@import "linux/about";
 @import "linux/createParent";
 @import "linux/editable";
 @import "linux/errorReport";
@@ -16,4 +15,3 @@
 // Elements
 
 @import "linux/elements/itemBox";
-@import "linux/elements/noteEditor";