From f0de6d0d57385c29525484b17f990e6ace53282f Mon Sep 17 00:00:00 2001
From: Tom Najdek <tom@doppnet.com>
Date: Fri, 12 Jan 2024 14:03:30 +0100
Subject: [PATCH] Tweak spacing in select items dialog

---
 chrome/content/zotero/selectItemsDialog.xhtml | 102 +++++++++---------
 scss/_zotero.scss                             |   1 +
 scss/components/_selectItemsDialog.scss       |  28 +++++
 3 files changed, 77 insertions(+), 54 deletions(-)
 create mode 100644 scss/components/_selectItemsDialog.scss

diff --git a/chrome/content/zotero/selectItemsDialog.xhtml b/chrome/content/zotero/selectItemsDialog.xhtml
index 703d77b86c..6729d16c85 100644
--- a/chrome/content/zotero/selectItemsDialog.xhtml
+++ b/chrome/content/zotero/selectItemsDialog.xhtml
@@ -1,27 +1,27 @@
 <?xml version="1.0"?>
 <!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
+	***** BEGIN LICENSE BLOCK *****
+	
+	Copyright © 2009 Center for History and New Media
+	George Mason University, Fairfax, Virginia, USA
+	http://zotero.org
+	
+	This file is part of Zotero.
+	
+	Zotero is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	Zotero is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+	
+	You should have received a copy of the GNU Affero General Public License
+	along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+	
+	***** END LICENSE BLOCK *****
 -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
@@ -43,38 +43,32 @@
 	persist="screenX screenY width height"
 	style="display: flex"
 >
-	<dialog
-		orient="vertical"
-		buttons="cancel,accept"
-		style="padding: 2em"
-	>
-		<script>
-			var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-			
-			Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
-
-			Services.scriptloader.loadSubScript("chrome://zotero/content/selectItemsDialog.js", this);
-			
-			// Custom elements
-			Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
-		</script>
-
-		<vbox id="zotero-select-items-container" flex="1">
-
-		<hbox align="center" pack="end">
-			<quick-search-textbox id="zotero-tb-search" timeout="250" oncommand="onSearch()" dir="reverse"/>
-		</hbox>
-
-		<hbox flex="1">
-			<vbox id="zotero-collections-tree-container" class="virtualized-table-container" style="min-width: 200px">
-				<html:div id="zotero-collections-tree"></html:div>
-			</vbox>
-
-			<hbox id="zotero-items-pane-content" class="virtualized-table-container" flex="1">
-				<html:div id="zotero-items-tree"></html:div>
-			</hbox>
-		</hbox>
+<dialog
+	id="select-items-dialog"
+	orient="vertical"
+	buttons="cancel,accept"
+>
+<script>
+	var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+	Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+	Services.scriptloader.loadSubScript("chrome://zotero/content/selectItemsDialog.js", this);
+	
+	// Custom elements
+	Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
+</script>
 
+<vbox id="zotero-select-items-container" flex="1">
+	<hbox id="search-toolbar">
+		<quick-search-textbox id="zotero-tb-search" timeout="250" oncommand="onSearch()" dir="reverse"/>
+	</hbox>
+	<hbox id="collections-items-container">
+		<vbox id="zotero-collections-tree-container" class="virtualized-table-container">
+			<html:div id="zotero-collections-tree"></html:div>
 		</vbox>
-	</dialog>
+		<hbox id="zotero-items-pane-content" class="virtualized-table-container" flex="1">
+			<html:div id="zotero-items-tree"></html:div>
+		</hbox>
+	</hbox>
+</vbox>
+</dialog>
 </window>
\ No newline at end of file
diff --git a/scss/_zotero.scss b/scss/_zotero.scss
index 0aa566bb51..c68aba55cc 100644
--- a/scss/_zotero.scss
+++ b/scss/_zotero.scss
@@ -41,6 +41,7 @@
 @import "components/publications-dialog";
 @import "components/rtfScan.scss";
 @import "components/search";
+@import "components/selectItemsDialog";
 @import "components/spinner";
 @import "components/syncButtonTooltip";
 @import "components/tabBar";
diff --git a/scss/components/_selectItemsDialog.scss b/scss/components/_selectItemsDialog.scss
new file mode 100644
index 0000000000..3301d024dd
--- /dev/null
+++ b/scss/components/_selectItemsDialog.scss
@@ -0,0 +1,28 @@
+#select-items-dialog {
+    padding: 2em;
+
+    #zotero-select-items-container {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+    }
+
+    #zotero-collections-tree-container {
+        min-width: 200px;
+    }
+
+    #search-toolbar {
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-end;
+    }
+
+    #search-toolbar {
+        flex: 0 0 auto;
+    }
+
+    #collections-items-container {
+        flex: 1 1 auto;
+        margin-bottom: 8px;
+    }
+}
\ No newline at end of file