From 0627ee0cb67746744d8ee16aed428591abf7c4a4 Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Sun, 26 Feb 2023 05:34:21 -0500
Subject: [PATCH] fx-compat: Fix adding/editing feeds (#2632)

---
 chrome/content/zotero-platform/mac/zotero.css |  7 ----
 chrome/content/zotero/feedSettings.xhtml      | 39 +++++++------------
 chrome/skin/default/zotero/zotero.css         | 10 +++--
 3 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/zotero.css b/chrome/content/zotero-platform/mac/zotero.css
index cb8d0dca88..e69de29bb2 100644
--- a/chrome/content/zotero-platform/mac/zotero.css
+++ b/chrome/content/zotero-platform/mac/zotero.css
@@ -1,7 +0,0 @@
-.zotero-advanced-options > .zotero-advanced-options-label > dropmarker {
-	transform: rotate(270deg) translateX(4px);
-}
-
-.zotero-advanced-options[state="open"] > .zotero-advanced-options-label > dropmarker {
-	transform: translateX(4px);
-}
\ No newline at end of file
diff --git a/chrome/content/zotero/feedSettings.xhtml b/chrome/content/zotero/feedSettings.xhtml
index ce0e1e3ce6..5914fa2df7 100644
--- a/chrome/content/zotero/feedSettings.xhtml
+++ b/chrome/content/zotero/feedSettings.xhtml
@@ -17,33 +17,22 @@
 	<script src="chrome://global/content/customElements.js"/>
 	<script src="feedSettings.js"/>
 	
-	<grid>
-		<columns>
-			<column/>
-			<column flex="1"/>
-		</columns>
-		
-		<rows>
-			<row>
-				<hbox align="center">
-					<label value="&zotero.feedSettings.url.label;" control="feed-url"/>
-				</hbox>
-				<textbox id="feed-url" flex="1" size="2"
-					 oninput="Zotero_Feed_Settings.invalidateURL();Zotero_Feed_Settings.validateURL()"
-					 focused="true" newlines="stripsurroundingwhitespace"
-					 style="width: 30em; max-width: 30em"/>
-			</row>
-			<row>
-				<hbox align="center">
-					<label value="&zotero.feedSettings.title.label;" control="feed-url"/>
-				</hbox>
-				<textbox id="feed-title" flex="1" newlines="replacewithspaces"/>
-			</row>
-		</rows>
-	</grid>
+	<html:div class="form-grid">
+		<hbox align="center">
+			<label value="&zotero.feedSettings.url.label;" control="feed-url"/>
+		</hbox>
+		<html:input id="feed-url"
+				oninput="Zotero_Feed_Settings.invalidateURL();Zotero_Feed_Settings.validateURL()"
+				autofocus="true" style="width: 30em; max-width: 30em; -moz-box-flex: 1;"/>
+
+		<hbox align="center">
+			<label value="&zotero.feedSettings.title.label;" control="feed-title"/>
+		</hbox>
+		<html:input id="feed-title" style="-moz-box-flex: 1;"/>
+	</html:div>
 	<vbox id="advanced-options" class="zotero-advanced-options">
 		<hbox onclick="Zotero_Feed_Settings.toggleAdvancedOptions()"  class="zotero-advanced-options-label">
-			<dropmarker/>
+			<toolbarbutton class="toolbarbutton-menu-dropmarker"/>
 			<hbox align="center">
 				<label value="&zotero.general.advancedOptions.label;"/>
 			</hbox>
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index e375ab2121..4a3e56b3f5 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -206,12 +206,11 @@ zoterosearch .menulist-icon {
 	max-width: 29.5em;
 }
 
-.zotero-advanced-options>.zotero-advanced-options-label>dropmarker {
-	list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+.zotero-advanced-options > .zotero-advanced-options-label > .toolbarbutton-menu-dropmarker {
 	transform: rotate(270deg);
 }
 
-.zotero-advanced-options[state=open]>.zotero-advanced-options-label>dropmarker {
+.zotero-advanced-options[state=open] > .zotero-advanced-options-label > .toolbarbutton-menu-dropmarker {
 	transform: none;
 }
 
@@ -246,6 +245,11 @@ zoterosearch .menulist-icon {
 	max-width: 16px;
 }
 
+.form-grid {
+	display: grid;
+	grid-template-columns: max-content 1fr;
+}
+
 
 /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */
 @media (min-resolution: 1.25dppx) {