www

commit 8e40bde671fa9ad86512fd5924c269299abece93
parent 4eff7bd2d42866cc4e73a77486801cc23c672264
Author: Simon Kornblith <simon@simonster.com>
Date:   Thu, 13 Aug 2015 19:12:01 -0400

Make QuickFormat text bigger and border smaller on OS X

Diffstat:
M
chrome/content/zotero-platform/mac/integration.css
 | 
19
+++++++++++--------
M
chrome/content/zotero/integration/quickFormat.js
 | 
2
+-
M
chrome/content/zotero/integration/quickFormat.xul
 | 
1
-
M
chrome/skin/default/zotero/integration.css
 | 
4
++++

4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/chrome/content/zotero-platform/mac/integration.css b/chrome/content/zotero-platform/mac/integration.css
@@ -1,15 +1,17 @@
 body {
 	line-height: 1.45em;
+	font-size: 15px;
 }
 
 body[multiline="true"] {
-	line-height: 1.63em;
+	line-height: 26px;
 }
 
 #quick-format-dialog {
 	background: transparent;
 	-moz-appearance: none;
 	padding: 0;
+	width: 800px;
 }
 
 #quick-format-search {
@@ -18,23 +20,24 @@ body[multiline="true"] {
 }
 
 #quick-format-search[multiline="true"] {
-	padding: 1px 2px 0 18px;
+	padding: 2px 2px 0 19.5px;
+	margin: 2.5px 3.5px;
 	border: 1px solid rgba(0, 0, 0, 0.5);
 	-moz-appearance: none;
 }
 
 #quick-format-search:not([multiline="true"]) {
-	padding-top: 2.5px;
-	height: 30px !important;
+	padding-top: 4.5px;
+	height: 37px !important;
 }
 
 #quick-format-entry {
 	background: -moz-linear-gradient(-90deg, rgb(243,123,119) 0, rgb(180,47,38) 50%, rgb(156,36,27) 50%);
-	padding: 15px;
+	padding: 12px;
 }
 
 #zotero-icon {
-	margin: -2.5px 0 1px -13px;
+	margin: -2.5px 0 2px -8px;
 }
 
 #quick-format-search[multiline="true"] #zotero-icon {
@@ -94,6 +97,6 @@ panel button:-moz-focusring {
   box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 2px 1px -moz-mac-focusring;
 }
 
-body {
-	font-size: 13px;
+.quick-format-bubble {
+	padding: 1px 6px 1px 6px;
 }
 \ No newline at end of file
diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
@@ -758,7 +758,7 @@ var Zotero_QuickFormat = new function () {
 		if(qfe.scrollHeight > 30) {
 			qfe.setAttribute("multiline", true);
 			qfs.setAttribute("multiline", true);
-			qfs.style.height = (4+qfe.scrollHeight)+"px";
+			qfs.style.height = ((Zotero.isMac ? 6 : 4)+qfe.scrollHeight)+"px";
 			window.sizeToContent();
 		} else {
 			delete qfs.style.height;
diff --git a/chrome/content/zotero/integration/quickFormat.xul b/chrome/content/zotero/integration/quickFormat.xul
@@ -34,7 +34,6 @@
 	id="quick-format-dialog"
 	orient="vertical"
 	title="&zotero.integration.quickFormatDialog.title;"
-	width="600" 
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	persist="screenX screenY"
diff --git a/chrome/skin/default/zotero/integration.css b/chrome/skin/default/zotero/integration.css
@@ -239,3 +239,7 @@ richlistitem[selected="true"] {
 panel button .button-text {
 	margin: 0 !important;
 }
+
+#quick-format-dialog {
+	width: 600px;
+}