From 61e11f9afa476a93c96b527867e54a0a6d8b1136 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 7 Apr 2015 03:03:52 -0400
Subject: [PATCH] Fix main toolbar icons in 2x mode on Win/Linux

---
 .../content/zotero-platform/mac/overlay.css   |  2 +-
 .../content/zotero-platform/unix/overlay.css  | 37 +++++++++++--------
 .../content/zotero-platform/win/overlay.css   | 20 +++++++---
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 0d3ef09811..ace263648e 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -179,7 +179,7 @@
 	background-size: 14px;
 }
 
-@media (min-resolution: 2dppx) {
+@media (min-resolution: 1.5dppx) {
 	#zotero-pane-stack[oldsearchfield] textbox[type=search] > .textbox-input-box {
 		background: url("chrome://zotero/skin/mac/moz/Search@2x.png") left no-repeat;
 		background-size: 14px;
diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css
index 5dad77db1d..3500fe8597 100644
--- a/chrome/content/zotero-platform/unix/overlay.css
+++ b/chrome/content/zotero-platform/unix/overlay.css
@@ -1,12 +1,21 @@
-/*
+/*
  As of Fx36, the built-in styles don't properly handle a menu-button within combined buttons.
 */
+#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon,
+#zotero-toolbar-save-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
+	width: 32px;
+}
+
+#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon,
+#zotero-toolbar-save-button[cui-areatype="toolbar"] .toolbarbutton-icon {
+	width: 28px;
+}
+
 #zotero-toolbar-main-button[cui-areatype="toolbar"] {
 	margin-right: -1px;
 }
 
 #zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon {
-	width: 28px !important;
 	margin-left: 2px;
 	margin-right: -3px;
 	padding-left: 5px !important;
@@ -26,16 +35,6 @@
 	padding-right: 6px !important;
 }
 
-#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
-	margin-top: 2px;
-	margin-bottom: 2px;
-}
-
-#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker .dropmarker-icon {
-	padding-left: 14px !important;
-	padding-right: 3px !important;
-}
-
 #zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
 	margin-top: 6px;
 	margin-bottom: 6px;
@@ -47,6 +46,16 @@
 	margin-bottom: 0;
 }
 
+#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker .dropmarker-icon {
+	padding-left: 14px !important;
+	padding-right: 3px !important;
+}
+
+#zotero-toolbar-save-button-single[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+	margin-top: 3px;
+	margin-bottom: 3px;
+}
+
 #zotero-toolbar-buttons[cui-areatype="toolbar"] > separator {
 	/* Copied from .toolbarbutton-menubutton-dropmarker::before */
 	display: -moz-box;
@@ -86,10 +95,6 @@
 	box-shadow: var(--toolbarbutton-active-boxshadow);
 	transition-duration: 10ms;
 }
-
-#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
-	width: 32px;
-}
 /* End toolbar buttons */
 
 
diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
index 19fa5e9e96..756291aeea 100644
--- a/chrome/content/zotero-platform/win/overlay.css
+++ b/chrome/content/zotero-platform/win/overlay.css
@@ -1,12 +1,24 @@
-/*
+/*
  As of Fx36, the built-in styles don't properly handle a menu-button within combined buttons.
 */
+#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
+	width: 32px;
+}
+
+#zotero-toolbar-save-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
+	width: 30px;
+}
+
+#zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon,
+#zotero-toolbar-save-button[cui-areatype="toolbar"] .toolbarbutton-icon {
+	width: 28px;
+}
+
 #zotero-toolbar-main-button[cui-areatype="toolbar"] {
 	margin-right: -1px !important;
 }
 
 #zotero-toolbar-main-button[cui-areatype="toolbar"] .toolbarbutton-icon {
-	width: 28px;
 	margin-left: 2px;
 	margin-right: -1px;
 	padding-left: 5px !important;
@@ -94,10 +106,6 @@
 #zotero-toolbar-save-button[cui-areatype="toolbar"] > menupopup {
 	margin-top: -5px;
 }
-
-#zotero-toolbar-main-button-single[cui-areatype="toolbar"] .toolbarbutton-icon {
-	width: 32px;
-}
 /* End toolbar buttons */
 
 @media (min-resolution: 1.5dppx) {