From 2b68113fd71ea2f5697b44169fb1e38b592c30dc Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 14 Jun 2011 03:24:21 +0000
Subject: [PATCH] - Fix search bar drop-down on Linux - Increase padding
 slightly next to non-menu toolbar buttons - Tweak alignment of sync icon

---
 chrome/content/zotero-platform/mac/overlay.css  |  5 ++++-
 chrome/content/zotero-platform/unix/overlay.css | 12 ++++++++++++
 chrome/content/zotero-platform/win/overlay.css  | 11 +++++++----
 chrome/skin/default/zotero/overlay.css          |  6 +++---
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 91415ebe72..6ed923252b 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -43,7 +43,10 @@
   padding: 5px 1px 5px 11px;
 }
 
-#zotero-tb-search-menu-button {
+#zotero-tb-search-menu-button
+{
+	margin: -6px -2px -6px -16px;
+	padding: 6px 2px 6px 14px;
 	list-style-image: url("chrome://browser/skin/searchbar-dropmarker.png");
 }
 
diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css
index e57dc6b718..749487b2e3 100644
--- a/chrome/content/zotero-platform/unix/overlay.css
+++ b/chrome/content/zotero-platform/unix/overlay.css
@@ -1,5 +1,17 @@
+.zotero-tb-button:not([type=menu]) {
+	margin-right: 4px;
+}
+
 #zotero-tb-search-menu-button {
 	-moz-appearance: toolbarbutton-dropdown !important;
 	width: 12px;
 	height: 12px;
+}
+
+#zotero-tb-search-menu-button .button-menu-dropmarker {
+	display: none;
+}
+
+#zotero-tb-search .textbox-search-icon {
+	visibility: hidden;
 }
\ No newline at end of file
diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
index 14829ebf50..a9b0403f11 100644
--- a/chrome/content/zotero-platform/win/overlay.css
+++ b/chrome/content/zotero-platform/win/overlay.css
@@ -2,13 +2,12 @@
 	margin-left: 5px;
 }
 
-#zotero-tb-search .textbox-search-icon {
-	visibility: hidden;
+.zotero-tb-button:not([type=menu]) {
+	margin-right: 4px;
 }
 
 #zotero-tb-search-menu-button {
 	margin: 0 -1px 0 -4px;
-	padding: 0;
 	border: 0;
 	background: transparent;
 	/* Mozilla file copied from chrome://browser/skin/mainwindow-dropdown-arrow.png
@@ -26,13 +25,17 @@
 	-moz-image-region: rect(0, 26px, 11px, 13px);
 }
 
+#zotero-tb-search .textbox-search-icon {
+	visibility: hidden;
+}
+
 #zotero-tb-sync-warning {
 	margin-right: 2px;
 }
 
-
 #zotero-tb-sync {
 	margin-right: 1px;
+	padding-top: 4px;
 }
 
 #zotero-tb-fullscreen {
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 8580c61402..9e748467cc 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -416,14 +416,14 @@
 
 #zotero-tb-search
 {
-	font-size: 11px !important; /* Keep font size in Linux within reason */
+	font-size: 11px !important;
 	width: 150px;
 }
 
 #zotero-tb-search-menu-button
 {
-	margin: -6px -2px -6px -16px;
-	padding: 6px 2px 6px 14px;
+	margin: 0;
+	padding: 0;
 	-moz-appearance: none;
 	min-width: 0;
 	cursor: default;