From 878fc20cecccf73147816aef212574427c21d6bf Mon Sep 17 00:00:00 2001
From: Tom Najdek <tom@doppnet.com>
Date: Wed, 10 Apr 2024 17:27:32 +0200
Subject: [PATCH] fx115: Migrate or remove `-moz-box-flex` which is no longer
 recognized

* feed settings: part of the grid, not needed
* progress queue: migrated to flex
* tab-bar-container: already fixed in scss
* zotero-lookup-multiline-progress: migrated to flex
* zotero-lookup-textbox: removed, does nothing
* #zotero-prefpane-advanced #data-dir-path: migrated to flex
* #zotero-prefpane-sync: migrated to flex on #storage-url, removed from #storage-password to fix layout
* .search-condition: migrated to flex
* updates.css: migrated to flex
---
 chrome/content/zotero/feedSettings.xhtml                 | 4 ++--
 chrome/content/zotero/preferences/preferences_sync.xhtml | 4 ++--
 chrome/content/zotero/progressQueueDialog.xhtml          | 2 +-
 chrome/content/zotero/update/updates.css                 | 4 ++--
 chrome/content/zotero/zoteroPane.xhtml                   | 4 ++--
 chrome/skin/default/zotero/overlay.css                   | 1 -
 scss/elements/_zoteroSearch.scss                         | 4 ++--
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/chrome/content/zotero/feedSettings.xhtml b/chrome/content/zotero/feedSettings.xhtml
index b2a0c8e787..6ebe08680a 100644
--- a/chrome/content/zotero/feedSettings.xhtml
+++ b/chrome/content/zotero/feedSettings.xhtml
@@ -26,12 +26,12 @@
 		</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;"/>
+				autofocus="true" style="width: 30em; max-width: 30em;"/>
 
 		<hbox align="center">
 			<label value="&zotero.feedSettings.title.label;" control="feed-title"/>
 		</hbox>
-		<html:input id="feed-title" style="-moz-box-flex: 1;"/>
+		<html:input id="feed-title" style="max-width: 30em;" />
 	</html:div>
 	<vbox id="advanced-options" class="zotero-advanced-options">
 		<hbox onclick="Zotero_Feed_Settings.toggleAdvancedOptions()"  class="zotero-advanced-options-label">
diff --git a/chrome/content/zotero/preferences/preferences_sync.xhtml b/chrome/content/zotero/preferences/preferences_sync.xhtml
index c7528c8e29..20bf03e881 100644
--- a/chrome/content/zotero/preferences/preferences_sync.xhtml
+++ b/chrome/content/zotero/preferences/preferences_sync.xhtml
@@ -139,7 +139,7 @@
                                 </menupopup>
                             </menulist>
                             <label value="://"/>
-                            <html:input id="storage-url" style="-moz-box-flex: 1;"
+                            <html:input id="storage-url" style="flex: 1;"
                                 preference="extensions.zotero.sync.storage.url"
                                 onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
                                 onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
@@ -156,7 +156,7 @@
     
                         <label value="&zotero.preferences.sync.password;"/>
                         <hbox>
-                            <html:input id="storage-password" style="-moz-box-flex: 0;" type="password"
+                            <html:input id="storage-password" type="password"
                                 onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
                                 onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
                         </hbox>
diff --git a/chrome/content/zotero/progressQueueDialog.xhtml b/chrome/content/zotero/progressQueueDialog.xhtml
index 27a90a3b9b..a52fff7e76 100644
--- a/chrome/content/zotero/progressQueueDialog.xhtml
+++ b/chrome/content/zotero/progressQueueDialog.xhtml
@@ -14,7 +14,7 @@
 	<vbox id="zotero-progress-box" style="padding:10px" flex="1">
 		<label id="label" control="progress-indicator" value=""/>
 		<hbox align="center">
-			<html:progress id="progress-indicator" max="100" style="-moz-box-flex: 1;"/>
+			<html:progress id="progress-indicator" max="100" style="flex: 1;"/>
 			<button id="cancel-button" label="&zotero.general.cancel;"/>
 			<button id="minimize-button" label="&zotero.general.minimize;"/>
 			<button id="close-button" label="&zotero.general.close;"/>
diff --git a/chrome/content/zotero/update/updates.css b/chrome/content/zotero/update/updates.css
index aaeb65ddee..34310551b5 100644
--- a/chrome/content/zotero/update/updates.css
+++ b/chrome/content/zotero/update/updates.css
@@ -8,11 +8,11 @@
 }
 
 #downloadProgress {
-	-moz-box-flex: 1;
+	flex: 1;
 }
 
 .update-name {
-	-moz-box-flex: 1;
+	flex: 1;
 }
 
 #errorReason {
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index e7970d5e0c..0630d7e021 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -805,7 +805,7 @@
 	
 	<!-- Keep in sync with Zotero.test conditional block in overlay.js -->
 	<hbox id="zotero-title-bar">
-		<div xmlns="http://www.w3.org/1999/xhtml" id="tab-bar-container" style="-moz-box-flex: 1;"/>
+		<div xmlns="http://www.w3.org/1999/xhtml" id="tab-bar-container" />
 		<hbox id="zotero-tabs-toolbar" class="zotero-toolbar" align="center">
 			<toolbarbutton id="zotero-tb-tabs-menu" class="zotero-tb-button" tabindex="-1" data-l10n-id="zotero-toolbar-tabs-menu" type="panel"
 				oncommand="if (this.disabled) { event.preventDefault(); return; } Zotero_Tabs.showTabsMenu(this)"/>
@@ -1084,7 +1084,7 @@
 																	align="start"
 																	oncommand="Zotero_Lookup.accept(document.getElementById('zotero-lookup-textbox'))"
 																	label="&zotero.lookup.button.search;"/>
-																<html:progress id="zotero-lookup-multiline-progress" value="0" hidden="true" style="-moz-box-flex: 1"/>
+																<html:progress id="zotero-lookup-multiline-progress" value="0" hidden="true" style="flex: 1"/>
 															</hbox>
 														</vbox>
 													</vbox>
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 3d3ea33877..83beae75b5 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -216,7 +216,6 @@ TODO: Replace with SVG
 #zotero-lookup-textbox {
 	margin: 4px;
 	padding: 2px;
-	-moz-box-flex: 1;
 	overflow-x: hidden; /* Fixes a glitch that renders an extra row */
 }
 
diff --git a/scss/elements/_zoteroSearch.scss b/scss/elements/_zoteroSearch.scss
index 4ee67d0482..47efe7791d 100644
--- a/scss/elements/_zoteroSearch.scss
+++ b/scss/elements/_zoteroSearch.scss
@@ -32,7 +32,7 @@ zoterosearch {
 	}
 
 	.search-condition {
-		-moz-box-flex: 1;
+		flex: 1;
 		display: flex;
 		align-items: center;
 
@@ -78,7 +78,7 @@ zoterosearch {
 	}
 
 	.search-in-the-last {
-		-moz-box-flex: 1;
+		flex: 1;
 		display: flex;
 		align-items: center;