From 331ef4ac34a5744b9019f8107c8610ca90763b02 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 7 Nov 2013 03:07:18 -0500
Subject: [PATCH] Apply Fx25 tree-row fix to Windows only, and fix spacing
 there too

"height: auto" (from another extension's fix for this) actually caused
the bottoms of tree rows to be cut off on Windows (and at least on one
Linux installation with Chinese characters).
---
 chrome/content/zotero-platform/win/overlay.css    | 7 +++++++
 chrome/content/zotero/advancedSearch.xul          | 1 +
 chrome/content/zotero/preferences/preferences.xul | 1 +
 chrome/skin/default/zotero/zotero.css             | 7 -------
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
index 1afdc6e0b..19ca3948c 100644
--- a/chrome/content/zotero-platform/win/overlay.css
+++ b/chrome/content/zotero-platform/win/overlay.css
@@ -67,6 +67,13 @@
 	-moz-border-left-colors: none;
 }
 
+/* Undo tree row spacing change in Fx25 on Windows */
+#zotero-collections-tree treechildren::-moz-tree-row,
+#zotero-items-tree treechildren::-moz-tree-row,
+#zotero-prefs treechildren::-moz-tree-row {
+	height: 20px;
+}
+
 #zotero-collections-tree {
 	border-width: 0 1px 1px 0;
 }
diff --git a/chrome/content/zotero/advancedSearch.xul b/chrome/content/zotero/advancedSearch.xul
index fe7575716..57b16540a 100644
--- a/chrome/content/zotero/advancedSearch.xul
+++ b/chrome/content/zotero/advancedSearch.xul
@@ -2,6 +2,7 @@
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css"?>
 
 <!DOCTYPE window [
 	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd">
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 74d6e59e9..964aa93ae 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -29,6 +29,7 @@
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://zotero/skin/preferences.css"?>
 <?xml-stylesheet href="chrome://zotero/skin/zotero.css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css"?>
 
 <!--
 	To add an observer for a preference change, add an appropriate case in
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 605d9d323..e3ac5ad57 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -316,11 +316,4 @@ label.zotero-text-link {
 
 #zotero-note-window {
 	padding-bottom: 4px;
-}
-
-/* Undo tree row spacing change in Fx25 on Windows */
-#zotero-collections-tree treechildren::-moz-tree-row,
-#zotero-items-tree treechildren::-moz-tree-row,
-#zotero-prefs treechildren::-moz-tree-row {
-	height: auto;
 }
\ No newline at end of file