UI improvements on OS X

still need to work out the appropriate opacity for the glow on each individual toolbar button, and to make some similar changes for Windows

chrome/content/zotero-platform/mac/attachmentbox.css

@@ -0,0 +1,9 @@
+row > label:first-child
+{
+	color: #7f7f7f;
+}
+
+*[zoteroFontSize=small] #attachment-box
+{
+	font-size: 10px;
+}

chrome/content/zotero-platform/mac/itembox.css

@@ -1 +1,35 @@
+row > label:first-child, .creator-type-label
+{
+	color: #7f7f7f;
+}
 
+.zotero-field-toggle
+{
+	color: transparent;
+	margin: 0px 5px 0px 0px !important;
+	width: 26px !important;
+	max-width: 26px !important;
+	min-width: 26px !important;
+}
+
+.zotero-field-toggle .toolbarbutton-text
+{	
+	visibility: hidden;
+}
+
+.zotero-field-toggle .toolbarbutton-icon
+{
+	margin: 0px !important;
+}
+
+*[zoteroFontSize=small] #item-box
+{
+	font-size: 10px;
+}
+
+.creator-type-label > image {
+	margin: 1px .2em 1px;
+	list-style-image: url('chrome://zotero/skin/mac/arrow-down.png');
+	max-width: 7px;
+	max-height: 7px;
+}

chrome/content/zotero-platform/mac/noteeditor.css

@@ -0,0 +1,9 @@
+row > label:first-child
+{
+	color: #7f7f7f;
+}
+
+*[zoteroFontSize=small] #note-editor
+{
+	font-size: 10px;
+}

chrome/content/zotero-platform/mac/overlay.css

@@ -0,0 +1,369 @@
+#zotero-pane
+{
+	padding: 0 !important;
+}
+
+#zotero-splitter
+{
+	border-top: none;
+	border-bottom: 1px solid #A3A3A3;
+	min-height: 1px !important;
+	max-height: 1px !important;
+	background-image: none;
+}
+
+#zotero-pane .toolbar {
+	-moz-appearance: -moz-mac-unified-toolbar;
+	margin-left: -1px;
+}
+
+#zotero-items-toolbar[state=collapsed]
+{
+	margin-left: -8px !important;
+}
+
+#zotero-pane toolbarseparator {
+	margin-left: 7px;
+}
+
+.zotero-tb-button {
+  -moz-margin-start: 5px;
+  -moz-padding-end: 10px;
+  background: url("chrome://zotero/skin/mac/menubutton-end.png") right center no-repeat;
+}
+
+.zotero-tb-button[open="true"],
+.zotero-tb-button:hover:active, 
+#zotero-pane-stack[fullscreenmode="true"] #zotero-tb-fullscreen  {
+  background: url("chrome://zotero/skin/mac/menubutton-end-pressed.png") right center no-repeat;
+}
+
+.zotero-tb-button > menupopup {
+  -moz-margin-start: 2px;
+  margin-top: -4px;
+}
+
+.zotero-tb-button > .toolbarbutton-icon {
+  -moz-binding: url('chrome://zotero-platform/content/zoterotbbutton.xml#zotero-tb-button');
+  background: url("chrome://zotero/skin/mac/menubutton-start.png") left center no-repeat;
+  outline-color: black;
+  -moz-padding-start: 10px;
+}
+
+.zotero-tb-button[open="true"] > .toolbarbutton-icon,
+.zotero-tb-button:hover:active > .toolbarbutton-icon, 
+#zotero-pane-stack[fullscreenmode="true"] #zotero-tb-fullscreen > .toolbarbutton-icon {
+  background: url("chrome://zotero/skin/mac/menubutton-start-pressed.png") left center no-repeat;
+}
+
+.zotero-tb-button > .toolbarbutton-text {
+  display:  none;
+}
+
+.zotero-tb-button[type="menu"] > .toolbarbutton-icon {
+  -moz-padding-end: 4px;
+}
+
+.zotero-tb-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://zotero/skin/mac/folderDropArrow.png");
+  padding: 0;
+}
+
+/* This property controls the strength of the SVG outer glow mask on the toolbar buttons */
+.zotero-tb-button > .toolbarbutton-icon > stack > .zotero-tb-glow {
+	opacity: .7;
+}
+
+#zotero-tb-sync > .toolbarbutton-icon {
+	-moz-binding: none !important;
+}
+
+#zotero-close-button {
+	margin: 0px !important;
+	padding: 0px 0px 0px 10px !important;
+}
+
+#zotero-tb-sync {
+	margin: none;
+}
+
+#zotero-view-tabbox {
+	background-color: #fff;
+	padding: 0;
+	margin: 0;
+}
+
+#zotero-item-pane-content .groupbox-body {
+	-moz-appearance: none;
+	background-color: #ffffff;
+}
+
+#zotero-view-selected-label {
+	color: #7f7f7f;
+}
+
+#zotero-view-tabbox tabpanels {
+	-moz-appearance: none;
+}
+
+#zotero-view-tabbox > tabs {
+  -moz-appearance: -moz-mac-unified-toolbar; 
+  padding: 2px;
+}
+
+#zotero-view-tabbox > tabs > tab > hbox > .tab-icon {
+	display: none;
+}
+
+#zotero-view-tabbox > tabs > tab > hbox .tab-text {
+  text-shadow: rgba(255, 255, 255, 0.4) 0 1px !important;
+}
+#zotero-view-tabbox > tabs > tab:active:hover > hbox > .tab-text,
+#zotero-view-tabbox > tabs > tab[selected=true] > hbox > .tab-text {
+  text-shadow: none !important;
+}
+
+#zotero-view-tabbox > tabs > tab {
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  -moz-appearance: none;
+  margin: 0;
+  padding: 3px 0 0;
+  background-color: transparent;
+  border: solid transparent;
+  border-width: 0 4px 0 5px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle.png") 0 4 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-down.png") 0 4 0 5 repeat stretch;
+  text-shadow: none !important;
+}
+
+#zotero-view-tabbox > tabs > tab[selected=true] {
+  color: #FFF !important;
+  text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected.png") 0 4 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab[selected=true]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected-down.png") 0 4 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > * {
+  color: #7C7C7C !important; /* remove this when we support click-through */
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > tab[selected=true] {
+  color: #C5C5C5 !important; /* remove this when we support click-through */
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :first-child,
+#zotero-view-tabbox > tabs > [first-visible],
+#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
+  border-width: 0 4px 0 6px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :first-child:active:hover,
+#zotero-view-tabbox > tabs > [first-visible]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-down.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:first-child[selected=true],
+#zotero-view-tabbox > tabs > tab[first-visible][selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:first-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs > tab[first-visible][selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true]:active:hover, {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected-down.png") 0 4 0 6 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > :first-child,
+:root:not([active]) #zotero-view-tabbox > tabs > [first-visible],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > tab:first-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :last-child,
+#zotero-view-tabbox > tabs > [last-visible],
+#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
+  border-width: 0 6px 0 5px;
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > :last-child:active:hover,
+#zotero-view-tabbox > tabs > [last-visible]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-down.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:last-child[selected=true],
+#zotero-view-tabbox > tabs > tab[last-visible][selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-view-tabbox > tabs > tab:last-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs > tab[last-visible][selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true]:active:hover,
+#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true]:active:hover {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected-down.png") 0 6 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > :last-child,
+:root:not([active]) #zotero-view-tabbox > tabs > [last-visible],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-inactive.png") 0 6 0 5 repeat stretch;
+}
+
+:root:not([active]) #zotero-view-tabbox > tabs > tab:last-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
+:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
+  -moz-border-image: url("chrome://global/skin/toolbar/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat stretch;
+}
+
+#zotero-collections-tree {
+	-moz-appearance: none;
+	border: none;
+	margin: 0;
+	padding: 0;
+	min-height: 5.2em;
+	background-color: #d2d8e2;
+}
+
+:root:not([active="true"]) #zotero-collections-tree {
+	background-color: rgb(232, 232, 232);
+}
+
+#zotero-collections-tree treechildren::-moz-tree-row {
+  background-color: transparent;
+  border-color: transparent;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(selected) {  
+  background-color: #6f81a9;
+  background-image: url("chrome://zotero/skin/mac/selected-gradient.png");
+  background-repeat: repeat-x;
+  background-position: bottom left;
+  border-top: 1px solid #979797;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(selected,focus) {  
+  background-image: url("chrome://zotero/skin/mac/selected-focused-gradient.png");
+  background-color: #8a8a8a !important;
+  border-top: 1px solid #91a0c0;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(leaf) ,
+#zotero-collections-tree treechildren::-moz-tree-image(leaf) {
+  cursor: pointer;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell-text(leaf, hover) {
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell(separator) {
+  cursor: default;
+}
+
+#zotero-collections-tree treechildren::-moz-tree-cell-text(selected) {  
+  font-weight: bold !important;
+  color: #ffffff !important;
+}
+
+#zotero-tree-splitter, #zotero-view-splitter
+{
+	-moz-appearance: none;
+	-moz-border-start: none !important;
+	-moz-border-end: none !important;
+	max-width: 1px !important;
+	min-width: 1px !important;
+	width: 1px !important;
+	background-color: #8b8b8b !important;
+}
+
+#zotero-tree-splitter[state=collapsed]
+{
+	border-right: 1px;
+	border-color: #A5A5A5;
+	max-width: 8px !important;
+	min-width: 8px !important;
+	width: 8px !important;
+	background-image: url("chrome://zotero/skin/mac/vsplitter.png");
+	background-repeat: repeat-y;
+	padding: none;
+}
+
+#zotero-tree-splitter[state=collapsed] > grippy
+{
+	-moz-appearance: none;
+	background-image: url("chrome://zotero/skin/mac/vgrippy.png");
+	background-position: center;
+	background-repeat: no-repeat;
+	width: 8px;
+}
+
+#zotero-tags-splitter
+{
+	-moz-appearance: none;
+	border-top: 1px;
+	border-bottom: 1px;
+	border-color: #A5A5A5;
+	height: 8px;
+	background-image: url("chrome://zotero/skin/mac/hsplitter.png") !important;
+	background-repeat: repeat-x;
+	padding: none;
+}
+
+#zotero-tags-splitter > grippy
+{
+	-moz-appearance: none;
+	background-image: url("chrome://zotero/skin/mac/hgrippy.png");
+	background-position: center;
+	background-repeat: no-repeat;
+	height: 8px;
+}
+
+#zotero-tags-splitter > grippy:hover, #zotero-tree-splitter > grippy:hover
+{
+	background-color:transparent;
+}
+
+#zotero-items-tree
+{
+	-moz-appearance: none;
+	border: none;
+	margin: 0;
+	padding: 0;
+}
+
+#zotero-items-tree treechildren::-moz-tree-cell,
+#zotero-items-tree treechildren::-moz-tree-column {
+  border-right: 1px solid #d7dad7;
+}

chrome/content/zotero-platform/mac/tagselector.css

@@ -0,0 +1,35 @@
+groupbox
+{
+	background-color: white;
+}
+
+groupbox > .groupbox-body
+{
+	-moz-appearance: none;
+	margin: 0;
+	padding: 0;
+}
+
+#tags-toggle
+{
+	font-size: 10px;
+}
+
+#view-settings-menu .toolbarbutton-menu-dropmarker
+{
+	margin-left: -12px !important;
+}
+
+#no-tags-box
+{
+	color: #7f7f7f;
+}
+
+#tag-controls
+{
+	background-color: rgb(240,240,240);
+	border-width: 1px 0 0 0;
+	border-style: solid;
+	border-color: rgb(220,220,220);
+	padding: 2px 2px 2px 5px;
+}

chrome/content/zotero-platform/mac/zoterotbbutton.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright (c) 2006  Center for History and New Media
+                        George Mason University, Fairfax, Virginia, USA
+                        http://chnm.gmu.edu
+    
+    Licensed under the Educational Community License, Version 1.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.opensource.org/licenses/ecl1.php
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    
+    ***** END LICENSE BLOCK *****
+-->
+
+<bindings xmlns="http://www.mozilla.org/xbl"
+		  xmlns:xbl="http://www.mozilla.org/xbl" xmlns:svg="http://www.w3.org/2000/svg" 
+		  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+	<binding id="zotero-tb-button" display="xul:button"
+           extends="chrome://global/content/bindings/button.xml#button-base">
+		<resources>
+			<stylesheet src="chrome://global/skin/toolbarbutton.css"/>
+		</resources>
+		<implementation>
+			<constructor>
+				<![CDATA[
+					var imageURL = document.defaultView.getComputedStyle(this, null).listStyleImage;
+					if(imageURL.substr(0, 4) == "url(") {
+						imageURL = imageURL.substring(4, imageURL.length-1);
+					} else if(imageURL.substr(0, 5) == "url('" || imageURL.substr(0, 5) == "url(\"") {
+						imageURL = imageURL.substring(5, imageURL.length-2);
+					}
+					document.getAnonymousElementByAttribute(this, "anonid", "tb-image")
+						.setAttributeNS("http://www.w3.org/1999/xlink", "href", imageURL);
+				]]>
+			</constructor>
+		</implementation>
+		<content>
+			<xul:stack>
+				<svg:svg class="zotero-tb-glow" xmlns="http://www.w3.org/2000/svg" width="18" height="24" version="1.1">
+					<svg:filter id="DropShadow">
+					   <svg:feGaussianBlur in="SourceAlpha" stdDeviation="1" result="MyBlur"/>
+					</svg:filter>
+					<svg:image anonid="tb-image" filter="url(#DropShadow)" x="1" y="4" width="16" height="16"/>	
+				</svg:svg>
+				<xul:image xbl:inherits="src=image" style="padding: 4px 1px 4px 1px;"/>
+			</xul:stack>
+		</content>
+	</binding>
+</bindings>

chrome/content/zotero-platform/win/itembox.css

@@ -7,17 +7,6 @@ row > vbox
 	padding-bottom: 0 !important;
 }
 
-row > hbox > hbox
-{
-	-moz-box-align: center;
-}
-
-row hbox hbox label
-{
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
 row vbox[fieldname=abstractNote],
 row vbox[fieldname=extra]
 {

chrome/content/zotero/bindings/attachmentbox.xml

@@ -31,6 +31,7 @@
 	<binding id="attachment-box">
 		<resources>
 			<stylesheet src="chrome://zotero/skin/bindings/attachmentbox.css"/>
+			<stylesheet src="chrome://zotero-platform/content/attachmentbox.css"/>
 		</resources>
 		
 		<implementation>
@@ -145,8 +146,8 @@
 					var showButton = this._id('show');
 					var fileNameRow = this._id('fileNameRow');
 					var urlField = this._id('url');
-					var accessed = this._id('accessed');
+					var accessed = this._id('accessedRow');
-					var pagesRow = this._id('pages');
+					var pagesRow = this._id('pagesRow');
 					var dateModifiedRow = this._id('dateModified');
 					var indexBox = this._id('index-box');
 					var selectButton = this._id('select-button');
@@ -235,13 +236,10 @@
 						
 						// Access date
 						if (this.displayAccessed) {
-							accessed.value = Zotero.localeJoin([
+							document.getElementById("accessed-label").value = Zotero.getString('itemFields.accessDate')+": ";
-								Zotero.getString('itemFields.accessDate'),
+							document.getElementById("accessed").value = Zotero.Date.sqlToDate(
-								': ',
-								Zotero.Date.sqlToDate(
 									this.item.getField('accessDate'), true
-								).toLocaleString()
+								).toLocaleString();
-							], '');
 							accessed.hidden = false;
 						}
 						else {
@@ -263,11 +261,8 @@
 						var file = this.item.getFile(false, true);
 						var fileName = file.leafName;
 						if (fileName) {
-							fileNameRow.value = Zotero.localeJoin([
+							document.getElementById("fileName-label").value = "Filename: ";
-								'Filename', // TODO: localize
+							document.getElementById("fileName").value = fileName;
-								': ', // TODO: probably needs to be in localized string
-								fileName
-							], '');
 							fileNameRow.hidden = false;
 						}
 						else {
@@ -286,12 +281,8 @@
 						var pages = Zotero.Fulltext.getPages(this.item.id);
 						var pages = pages ? pages.total : null;
 						if (pages) {
-							var str = Zotero.localeJoin([
+							document.getElementById("pages-label").value = Zotero.getString('itemFields.pages')+': ';
-								Zotero.getString('itemFields.pages'),
+							document.getElementById("pages").value = pages;
-								': ',
-								pages
-							], '');
-							pagesRow.value = str;
 							pagesRow.hidden = false;
 						}
 						else {
@@ -303,14 +294,10 @@
 					}
 					
 					if (this.displayDateModified) {
-						var str = Zotero.localeJoin([
+						document.getElementById("dateModified-label").value = Zotero.getString('itemFields.dateModified')+': ';
-							Zotero.getString('itemFields.dateModified'),
+						document.getElementById("dateModified").value = Zotero.Date.sqlToDate(
-							': ',
-							Zotero.Date.sqlToDate(
 								this.item.getField('dateModified'), true
-							).toLocaleString()
+							).toLocaleString();
-						], '');
-						dateModifiedRow.value = str;
 						dateModifiedRow.hidden = false;
 					}
 					else {
@@ -468,9 +455,8 @@
 							str = 'general.yes';
 							break;
 					}
-					str = Zotero.getString('fulltext.indexState.indexed') + ': ' +
+					document.getElementById("index-status-label").value = Zotero.getString('fulltext.indexState.indexed') + ': ';
-						Zotero.getString(str);
+					indexStatus.value = Zotero.getString(str);
-					indexStatus.setAttribute('value', str);
 					
 					// Reindex button tooltip (string stored in zotero.properties)
 					var str = Zotero.getString('pane.items.menu.reindexItem');
@@ -508,14 +494,39 @@
 					<button id="show" label="&zotero.item.attachment.file.show;" flex="1"/>
 				</hbox>
 				<label id="url" crop="end"/>
-				<label id="fileNameRow" crop="end"/>
+				<grid>
-				<label id="accessed"/>
+					<columns>
-				<label id="pages"/>
+						<column/>
-				<label id="dateModified"/>
+						<column flex="1"/>
+					</columns>
+					<rows>
+						<row id="fileNameRow">
+							<label id="fileName-label"/>
+							<label id="fileName" crop="end"/>
+						</row>
+						<row id="accessedRow">
+							<label id="accessed-label"/>
+							<label id="accessed"/>
+						</row>
+						<row id="pagesRow">
+							<label id="pages-label"/>
+							<label id="pages"/>
+						</row>
+						<row id="dateModifiedRow">
+							<label id="dateModified-label"/>
+							<label id="dateModified"/>
+						</row>
+						<row>
+							<label id="index-status-label"/>
+							<hbox>
+								<label id="index-status"/>
+								<toolbarbutton id="reindex" oncommand="this.hidden = true; setTimeout(function () { ZoteroPane.reindexItem(); }, 50)"/>
+							</hbox>
+						</row>
+					</rows>
+				</grid>
 				
 				<hbox id="index-box">
-					<label id="index-status"/>
-					<toolbarbutton id="reindex" oncommand="this.hidden = true; setTimeout(function () { ZoteroPane.reindexItem(); }, 50)"/>
 				</hbox>
 				
 				<zoteronoteeditor id="note-editor" notitle="1" flex="1"/>

chrome/content/zotero/bindings/itembox.xml

@@ -357,8 +357,8 @@
 					//
 					// Clear and rebuild metadata fields
 					//
-					while (this._dynamicFields.hasChildNodes()) {
+					while (this._dynamicFields.childNodes.length > 1) {
-						this._dynamicFields.removeChild(this._dynamicFields.firstChild);
+						this._dynamicFields.removeChild(this._dynamicFields.lastChild);
 					}
 					
 					var fieldNames = [];
@@ -632,7 +632,6 @@
 					if (this.editable) {
 						typeBox.className = 'creator-type-label zotero-clicky';
 						var img = document.createElement('image');
-						img.setAttribute('src', 'chrome://zotero/skin/arrow-down.gif');
 						typeBox.appendChild(img);
 					}
 					else {
@@ -645,6 +644,7 @@
 					typeBox.appendChild(label);
 					
 					var hbox = document.createElement("hbox");
+					hbox.className = 'creator-type-value';
 					
 					// Name
 					var firstlast = document.createElement("hbox");
@@ -685,7 +685,7 @@
 					var toggleButton = document.createElement('toolbarbutton');
 					toggleButton.setAttribute('fieldname',
 						'creator-' + this._creatorCount + '-fieldMode');
-					toggleButton.className = 'zotero-clicky';
+					toggleButton.className = 'zotero-field-toggle zotero-clicky';
 					hbox.appendChild(toggleButton);
 					
 					// Minus (-) button
@@ -2178,7 +2178,7 @@
 						</menu>
 					</popup>
 				</popupset>
-				<hbox id="go-buttons" align="center" hidden="true">
+				<hbox id="go-buttons" align="center">
 					<button id="view-button"
 						onfocus="document.getBindingParent(this).ensureElementIsVisible(this)"
 						oncommand="document.getBindingParent(this).onViewClick(this, event)" disabled="false"/>
@@ -2193,18 +2193,22 @@
 					</button>
 				</hbox>
 				<hbox align="center" hidden="true">
-					<menulist id="item-type-menu" oncommand="document.getBindingParent(this).changeTypeTo(this.value, this)" flex="1"
-						onfocus="document.getBindingParent(this).ensureElementIsVisible(this)"
-						onkeypress="if (event.keyCode == event.DOM_VK_TAB){ if (!event.shiftKey) { document.getBindingParent(this).focusFirstField('info'); event.preventDefault(); } }">
-						<menupopup/>
-					</menulist>
 				</hbox>
 				<grid flex="1">
 					<columns>
 						<column/>
 						<column flex="1"/>
 					</columns>
-					<rows id="dynamic-fields" flex="1"/>
+					<rows id="dynamic-fields" flex="1">
+						<row>
+							<label value="&zotero.items.itemType;:"/>
+							<menulist class="zotero-clicky" id="item-type-menu" oncommand="document.getBindingParent(this).changeTypeTo(this.value, this)" flex="1"
+								onfocus="document.getBindingParent(this).ensureElementIsVisible(this)"
+								onkeypress="if (event.keyCode == event.DOM_VK_TAB){ if (!event.shiftKey) { document.getBindingParent(this).focusFirstField('info'); event.preventDefault(); } }">
+								<menupopup/>
+							</menulist>
+						</row>
+					</rows>
 				</grid>
 			</scrollbox>
 		</content>

chrome/content/zotero/bindings/noteeditor.xml

@@ -28,6 +28,7 @@
 	<binding id="note-editor">
 		<resources>
 			<stylesheet src="chrome://zotero/skin/bindings/noteeditor.css"/>
+			<stylesheet src="chrome://zotero-platform/content/noteeditor.css"/>
 		</resources>
 		
 		<implementation>
@@ -431,7 +432,8 @@
 							v = "[" + Zotero.getString('pane.item.noteEditor.clickHere') + "]";
 						}
 						
-						this.id('tagsLabel').value = Zotero.getString('pane.item.tags') + " " + v;
+						this.id('tagsLabel').value = Zotero.getString('pane.item.tags');
+						this.id('tagsClick').value = v;
 					]]>
 				</body>
 			</method>
@@ -465,7 +467,8 @@
 							v = "[" + Zotero.getString('pane.item.noteEditor.clickHere') + "]";
 						}
 						
-						this.id('seeAlsoLabel').value = Zotero.getString('pane.item.related') + " " + v;
+						this.id('seeAlsoLabel').value = Zotero.getString('pane.item.related');
+						this.id('seeAlsoClick').value = v;
 					]]>
 				</body>
 			</method>
@@ -479,9 +482,23 @@
 			</method>
 		</implementation>
 		<content>
-			<xul:vbox xbl:inherits="flex">
+			<xul:vbox id="note-editor" xbl:inherits="flex">
-				<xul:label id="seeAlsoLabel" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).seeAlsoClick();"/>
+				<xul:grid>
-				<xul:label id="tagsLabel" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).tagsClick();"/>
+					<xul:columns>
+						<xul:column/>
+						<xul:column flex="1"/>
+					</xul:columns>
+					<xul:rows>
+						<xul:row>
+							<xul:label id="seeAlsoLabel"/>
+							<xul:label id="seeAlsoClick" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).seeAlsoClick();"/>
+						</xul:row>
+						<xul:row>
+							<xul:label id="tagsLabel"/>
+							<xul:label id="tagsClick" class="zotero-clicky" crop="end" onclick="document.getBindingParent(this).tagsClick();"/>
+						</xul:row>
+					</xul:rows>
+				</xul:grid>
 				<xul:popupset>
 					<xul:popup id="seeAlsoPopup" width="300" onpopupshowing="this.firstChild.reload();">
 						<xul:seealsobox id="seeAlso" flex="1"/>

chrome/content/zotero/bindings/tagselector.xml

@@ -30,6 +30,7 @@
 	<binding id="tag-selector">
 		<resources>
 			<stylesheet src="chrome://zotero/skin/bindings/tagselector.css"/>
+			<stylesheet src="chrome://zotero-platform/content/tagselector.css"/>
 		</resources>
 		
 		<implementation>
@@ -156,6 +157,10 @@
 					this.id('display-all-tags').setAttribute('checked', !this.filterToScope);
 					this.id('show-automatic').setAttribute('checked', this.showAutomatic);
 					this.dragObserver = new this._dragObserverConstructor;
+					if(Zotero.isFx30) {
+						this.id('tags-search-filter').hidden = false;
+						this.id('tags-search').setAttribute('type', 'timed');
+					}
 				]]>
 			</constructor>
 			
@@ -768,59 +773,61 @@
 				
 				<xul:vbox id="tags-toggle" flex="1"/>
 				
-				<xul:hbox>
+				<xul:vbox id="tag-controls">
-					<xul:hbox pack="start">
-						<!-- TODO: localize or change -->
-						<!-- <xul:checkbox id="display-all-tags" label="&zotero.tagSelector.displayAll;"-->
-						<xul:checkbox id="display-all-tags" label="Display all tags in this library"
-							oncommand="var ts = document.getBindingParent(this); ts.filterToScope = !this.checked; event.stopPropagation();">
-						</xul:checkbox>
-					</xul:hbox>
-					
-					<!--
 					<xul:hbox>
-						<xul:radiogroup orient="horizontal">
+						<xul:hbox pack="start">
-							<xul:radio label="any"/>
+							<!-- TODO: localize or change -->
-							<xul:radio label="all"/>
+							<!-- <xul:checkbox id="display-all-tags" label="&zotero.tagSelector.displayAll;"-->
-						</xul:radiogroup>
+							<xul:checkbox id="display-all-tags" label="Display all tags in this library"
+								oncommand="var ts = document.getBindingParent(this); ts.filterToScope = !this.checked; event.stopPropagation();">
+							</xul:checkbox>
+						</xul:hbox>
+						
+						<!--
+						<xul:hbox>
+							<xul:radiogroup orient="horizontal">
+								<xul:radio label="any"/>
+								<xul:radio label="all"/>
+							</xul:radiogroup>
+						</xul:hbox>
+						-->
 					</xul:hbox>
-					-->
+						
-				</xul:hbox>
+					<xul:hbox>
-					
+						<xul:label id="tags-search-filter" value="&zotero.tagSelector.filter;" hidden="true"/>
-				<xul:hbox>
+						<xul:textbox id="tags-search" flex="1" type="search" timeout="250" dir="reverse"
-					<xul:label value="&zotero.tagSelector.filter;"/>
+							oncommand="this.parentNode.parentNode.parentNode.handleKeyPress(); event.stopPropagation()"
-					<xul:textbox id="tags-search" flex="1" type="timed" timeout="250" dir="reverse"
+							onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { this.parentNode.parentNode.parentNode.parentNode.handleKeyPress(true); }">
-						oncommand="this.parentNode.parentNode.parentNode.handleKeyPress(); event.stopPropagation()"
+							<xul:toolbarbutton id="search-cancel"
-						onkeypress="if (event.keyCode == event.DOM_VK_ESCAPE) { this.parentNode.parentNode.parentNode.handleKeyPress(true); }">
+								oncommand="this.parentNode.focus(); this.parentNode.parentNode.parentNode.parentNode.parentNode.handleKeyPress(true)" hidden="true"/>
-						<xul:toolbarbutton id="search-cancel"
+						</xul:textbox>
-							oncommand="this.parentNode.focus(); this.parentNode.parentNode.parentNode.parentNode.handleKeyPress(true)" hidden="true"/>
+						<xul:toolbarbutton id="view-settings-menu" tooltiptext="&zotero.toolbar.actions.label;"
-					</xul:textbox>
+								image="chrome://zotero/skin/tag-selector-menu.png" type="menu">
-					<xul:toolbarbutton id="view-settings-menu" tooltiptext="&zotero.toolbar.actions.label;"
+							<xul:menupopup id="view-settings-popup">
-							image="chrome://zotero/skin/tag-selector-menu.png" type="menu">
+								<xul:menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" autocheck="true" type="checkbox"
-						<xul:menupopup id="view-settings-popup">
+									oncommand="var ts = this.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode; ts._dirty = true; ts.setAttribute('showAutomatic', this.getAttribute('checked') == 'true')"/>
-							<xul:menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" autocheck="true" type="checkbox"
+							</xul:menupopup>
-								oncommand="var ts = this.parentNode.parentNode.parentNode.parentNode.parentNode; ts._dirty = true; ts.setAttribute('showAutomatic', this.getAttribute('checked') == 'true')"/>
+						</xul:toolbarbutton>
-						</xul:menupopup>
-					</xul:toolbarbutton>
-				</xul:hbox>
-				
-				<xul:hbox>
-					<xul:hbox pack="center">
-						<xul:label id="num-selected"/>
 					</xul:hbox>
 					
-					<!--
+					<xul:hbox align="center">
-					Disabled (at least) until there's an ANY search mode
+						<xul:hbox pack="center">
-					<xul:toolbarbutton label="&zotero.tagSelector.selectVisible;"
+							<xul:label id="num-selected"/>
-						oncommand="this.parentNode.parentNode.parentNode.parentNode.selectVisible()"/>
+						</xul:hbox>
-					<xul:button label="&zotero.tagSelector.clearVisible;"
+						
-						oncommand="this.parentNode.parentNode.parentNode.parentNode.clearVisible()"/> -->
+						<!--
-					<xul:toolbarseparator/>
+						Disabled (at least) until there's an ANY search mode
-					<xul:hbox pack="center">
+						<xul:toolbarbutton label="&zotero.tagSelector.selectVisible;"
-						<xul:button label="&zotero.tagSelector.clearAll;"
+							oncommand="this.parentNode.parentNode.parentNode.parentNode.selectVisible()"/>
-							oncommand="this.parentNode.parentNode.parentNode.parentNode.clearAll(); event.stopPropagation();"/>
+						<xul:button label="&zotero.tagSelector.clearVisible;"
+							oncommand="this.parentNode.parentNode.parentNode.parentNode.clearVisible()"/> -->
+						<xul:toolbarseparator/>
+						<xul:hbox pack="center">
+							<xul:button label="&zotero.tagSelector.clearAll;"
+								oncommand="this.parentNode.parentNode.parentNode.parentNode.parentNode.clearAll(); event.stopPropagation();"/>
+						</xul:hbox>
 					</xul:hbox>
-				</xul:hbox>
+				</xul:vbox>
 			</xul:groupbox>
 		</content>
 	</binding>

chrome/content/zotero/overlay.js

@@ -110,9 +110,9 @@ var ZoteroPane = new function()
 		
 		if (Zotero.isMac) {
 			//document.getElementById('zotero-tb-actions-zeroconf-update').setAttribute('hidden', false);
-			document.getElementById('zotero-pane').setAttribute('platform', 'mac');
+			document.getElementById('zotero-pane-stack').setAttribute('platform', 'mac');
 		} else if(Zotero.isWin) {
-			document.getElementById('zotero-pane').setAttribute('platform', 'win');
+			document.getElementById('zotero-pane-stack').setAttribute('platform', 'win');
 		}
 		
 		//Initialize collections view
@@ -212,6 +212,12 @@ var ZoteroPane = new function()
 		if (Zotero.Prefs.get('debugShowDuplicates')) {
 			document.getElementById('zotero-tb-actions-showDuplicates').hidden = false;
 		}
+		
+		// use appropriate search box
+		if(Zotero.isFx30) {
+			document.getElementById("zotero-tb-search-label").hidden = false;
+			document.getElementById("zotero-tb-search").setAttribute("type", "conditional-timed");
+		}
 	}
 	
 	

chrome/content/zotero/overlay.xul

@@ -21,6 +21,7 @@
     ***** END LICENSE BLOCK *****
 -->
 <?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css" type="text/css"?>
 
 <!DOCTYPE overlay [
 	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
@@ -141,10 +142,10 @@
 						the tag selector to max height -->
 				<vbox flex="1">
 					<hbox class="toolbar">
-						<toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
+						<toolbarbutton id="zotero-tb-collection-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newCollection.label;" oncommand="ZoteroPane.newCollection()"/>
-						<toolbarbutton id="zotero-tb-group-add" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane.newGroup()"/>
+						<toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane.newGroup()"/>
 						<spacer flex="1"/>
-						<toolbarbutton id="zotero-tb-actions-menu" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
+						<toolbarbutton id="zotero-tb-actions-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
 							<menupopup id="zotero-tb-actions-popup" onpopupshowing="document.getElementById('cmd_zotero_reportErrors').setAttribute('disabled', Zotero.getErrors().length == 0)">
 								<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
 								<menuitem id="zotero-tb-actions-import-clipboard" label="&zotero.toolbar.importFromClipboard;" oncommand="Zotero_File_Interface.importFromClipboard();" />
@@ -200,13 +201,14 @@
 					oncommand="ZoteroPane.updateTagFilter()"/>
 			</vbox>
 			
-			<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest" collapse="before">
+			<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest" collapse="before"
+				onmousemove="document.getElementById('zotero-items-toolbar').setAttribute('state', this.getAttribute('state'));">
 				<grippy/>
 			</splitter>
 			
 			<vbox id="zotero-items-pane" persist="width" flex="1">
-				<hbox class="toolbar" align="center">
+				<hbox class="toolbar"  id="zotero-items-toolbar" align="center">
-					<toolbarbutton id="zotero-tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
+					<toolbarbutton id="zotero-tb-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
 						<!-- New Item drop-down built in overlay.js::onLoad() -->
 						<menupopup>
 							<menuseparator/>
@@ -218,14 +220,14 @@
 							</menu>
 						</menupopup>
 					</toolbarbutton>
-					<toolbarbutton id="zotero-tb-item-from-page" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage('temporaryPDFHack', event.shiftKey ? !Zotero.Prefs.get('automaticSnapshots') : null)"/>
+					<toolbarbutton id="zotero-tb-item-from-page" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage('temporaryPDFHack', event.shiftKey ? !Zotero.Prefs.get('automaticSnapshots') : null)"/>
-					<toolbarbutton id="zotero-tb-lookup" tooltiptext="&zotero.toolbar.lookup.label;" oncommand="ZoteroPane.openLookupWindow()"/>
+					<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" oncommand="ZoteroPane.openLookupWindow()"/>
-					<toolbarbutton id="zotero-tb-note-add" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
+					<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
 					<toolbarseparator/>
-					<toolbarbutton id="zotero-tb-advanced-search" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane.openAdvancedSearchWindow()"/>
+					<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane.openAdvancedSearchWindow()"/>
 					<spacer flex="1"/>
-					<label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/>
+					<label id="zotero-tb-search-label" value="&zotero.toolbar.search.label;" control="zotero-tb-search" hidden="true"/>
-					<textbox id="zotero-tb-search" type="conditional-timed" timeout="250" command="cmd_zotero_search" dir="reverse"
+					<textbox id="zotero-tb-search" type="search" timeout="250" command="cmd_zotero_search" dir="reverse"
 						onkeypress="ZoteroPane.handleSearchKeypress(this, event)"
 						oninput="ZoteroPane.handleSearchInput(this, event)"
 						testcode="me.value.indexOf('&quot;') == -1"
@@ -373,7 +375,7 @@
 							</grid>
 						</tooltip>
 					</hbox>
-					<toolbarbutton id="zotero-tb-sync" class="zotero-small-progress-indicator" tooltip="_child"
+					<toolbarbutton id="zotero-tb-sync" class="zotero-tb-button" tooltip="_child"
 							oncommand="Zotero.Sync.Server.canAutoResetClient = true; Zotero.Sync.Runner.sync()">
 						<tooltip
 								onpopupshowing="ZoteroPane.setLastSyncStatus(this)"
@@ -384,8 +386,8 @@
 						</tooltip>
 					</toolbarbutton>
 					<toolbarseparator/>
-					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
+					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();" class="zotero-tb-button"/>
-					<toolbarbutton class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
+					<toolbarbutton id="zotero-close-button" class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
 				</hbox>
 				<!-- TODO: localize -->
 				<button id="zotero-item-restore-button" label="Restore to Library"

chrome/content/zotero/xpcom/collectionTreeView.js

@@ -490,7 +490,11 @@ Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col)
 		
 		case 'collection':
 			// TODO: group collection
-			break;
+			return "chrome://zotero-platform/content/treesource-collection.png";
+ 		
+		case 'search':
+			// TODO: is this platform independent?
+			return "chrome://zotero-platform/content/treesource-search.png";
 		
 		case 'header':
 			if (source.ref.id == 'group-libraries-header') {

chrome/locale/en-US/zotero/zotero.dtd

@@ -29,6 +29,7 @@
 <!ENTITY zotero.tabs.related.label						"Related">
 <!ENTITY zotero.notes.separate							"Edit in a separate window">
 
+<!ENTITY zotero.items.itemType							"Item Type">
 <!ENTITY zotero.items.type_column						"Type">
 <!ENTITY zotero.items.title_column						"Title">
 <!ENTITY zotero.items.creator_column					"Creator">
@@ -94,11 +95,11 @@
 
 <!ENTITY zotero.tagSelector.noTagsToDisplay			"No tags to display">
 <!ENTITY zotero.tagSelector.filter					"Filter:">
-<!ENTITY zotero.tagSelector.showAutomatic			"Show automatic">
+<!ENTITY zotero.tagSelector.showAutomatic			"Show Automatic">
-<!ENTITY zotero.tagSelector.displayAll				"Display all tags">
+<!ENTITY zotero.tagSelector.displayAll				"Display All Tags">
-<!ENTITY zotero.tagSelector.selectVisible			"Select visible">
+<!ENTITY zotero.tagSelector.selectVisible			"Select Visible">
-<!ENTITY zotero.tagSelector.clearVisible				"Deselect visible">
+<!ENTITY zotero.tagSelector.clearVisible				"Deselect Visible">
-<!ENTITY zotero.tagSelector.clearAll					"Deselect all">
+<!ENTITY zotero.tagSelector.clearAll					"Deselect All">
 <!ENTITY zotero.tagSelector.renameTag				"Rename Tag...">
 <!ENTITY zotero.tagSelector.deleteTag				"Delete Tag...">
 

chrome/skin/default/zotero/bindings/attachmentbox.css

@@ -34,3 +34,26 @@
 	font-size: .95em;
 	padding: 0;
 }
+
+row > label:first-child
+{
+	font-weight: bold;
+}
+
+label
+{
+	-moz-margin-start: 1px !important;
+	-moz-margin-end: 5px !important;
+	padding: 1px 1px 0 2px;
+}
+
+zoteronoteeditor
+{
+	margin: 2px 2px 0 2px;
+}
+
+#title
+{
+	font-size: 12px;
+	font-weight: bold;
+}

chrome/skin/default/zotero/bindings/itembox.css

@@ -59,13 +59,20 @@ row label
 }
 
 /* creator type menu */
-.creator-type-label {
+.creator-type-label, .creator-type-value {
 	-moz-box-align: center;
 	-moz-box-pack: end;
+	height: 1.8em !important;
+	min-height: none !important;
+	max-height: 1.8em !important;
+	padding: 0;
+	margin: 0;
 }
+
  
-.creator-type-label image {
+.creator-type-label > image {
-	margin: 0 .5em 1px;
+	margin: 0 1em 1px;
+	list-style-image: url('chrome://zotero/skin/arrow-down.gif');
 }
 
 /* no space between last name and comma */
@@ -74,16 +81,15 @@ row hbox label:first-child
 	margin-right: 1px;
 }
 
-row hbox label.comma
+row label,
+row > vbox[fieldname=abstractNote],
+row > vbox[fieldname=extra]
 {
-	
+	margin-top: 0px;
-}
+	margin-bottom: 0px;
-
+	-moz-margin-start: 1px !important;
-row vbox[fieldname=abstractNote],
+	-moz-margin-end: 5px !important;
-row vbox[fieldname=extra]
+	padding: 1px 1px 0 2px;
-{
-	margin-top: 1px;
-	margin-left: 6px;
 }
 
 hbox.zotero-date-field-status
@@ -97,3 +103,55 @@ hbox.zotero-date-field-status label
 	color: #666;
 	margin: 0 0 0 1px;
 }
+
+#item-type-menu
+{
+	-moz-appearance: none;
+	color: black;
+	height: 1.5em !important;
+	min-height: 1.5em !important;
+	padding: 0 0 0 2px !important;
+	margin: 1px 5px 0 0 !important;
+	max-height: 1.5em !important;
+	border: 1px solid transparent;	
+	-moz-border-top-colors: none;
+	-moz-border-right-colors: none;
+	-moz-border-bottom-colors: none;
+	-moz-border-left-colors: none;
+	background-color: transparent;
+}
+
+#item-type-menu > .menulist-label-box
+{
+	-moz-box-flex: 0 !important;
+}
+
+#item-type-menu > .menulist-label-box, #item-type-menu > .menulist-label-box > .menulist-label
+{
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+#item-type-menu > .menulist-dropmarker
+{
+	display: none;
+}
+
+.zotero-field-toggle
+{
+	color: transparent;
+	margin: 0px 5px 0px 0px !important;
+	width: 26px !important;
+	max-width: 26px !important;
+	min-width: 26px !important;
+}
+
+.zotero-field-toggle .toolbarbutton-text
+{	
+	visibility: hidden;
+}
+
+.zotero-field-toggle .toolbarbutton-icon
+{
+	margin: 0px !important;
+}

chrome/skin/default/zotero/bindings/noteeditor.css

@@ -8,3 +8,25 @@
 #tagsPopup {
 	min-width: 300px;
 }
+
+linksbox
+{
+	margin-top: 4px;
+}
+
+row > label:first-child
+{
+	text-align: right;
+}
+
+row > label:first-child
+{
+	font-weight: bold;
+}
+
+label
+{
+	-moz-margin-start: 1px !important;
+	-moz-margin-end: 5px !important;
+	padding: 1px 1px 0 2px;
+}

chrome/skin/default/zotero/bindings/tagselector.css

@@ -23,11 +23,7 @@ checkbox
 	margin-right: .2em;
 	padding: .15em .25em;
 	-moz-user-focus: ignore;
-}
+	max-width: 250px;
-
-#tags-toggle label[selected="true"]
-{
-	background: #a9c6f0 !important;
 }
 
 /* Visible out-of-scope tags should be grey */
@@ -85,3 +81,8 @@ toolbarbutton.zotero-clicky
 	padding:1px;
 	height:1em;
 }
+
+#view-settings-menu .toolbarbutton-menu-dropmarker
+{
+	margin-left: -12px !important;
+}

chrome/skin/default/zotero/overlay.css

@@ -24,17 +24,6 @@
 	overflow: hidden;
 }
 
-/* these are hacks to display a window separator in full screen mode on OS X */
-window #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
-{
-	border-top: 1px solid #A3A3A3;
-}
-
-window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
-{
-	border-top: 1px solid black;
-}
-
 #zotero-collections-pane
 {
 	min-width: 150px;
@@ -56,12 +45,16 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	background: #FFFF99;
 }
 
+#zotero-collections-tree treechildren::-moz-tree-cell-text(hover) {
+	text-decoration: none !important;
+	cursor: auto !important;
+}
 
 #zotero-pane splitter
 {
 	border: 0;
 	width: 10px;
-	background-color: transparent !important;
+	background-color: transparent;
 	background-image: none;
 }
 
@@ -112,7 +105,6 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 #zotero-tb-collection-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');
-	margin-top: -2px;
 }
 
 #zotero-tb-group-add
@@ -132,20 +124,6 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	padding: 0;
 }
 
-/* These fix a rendering bug in Fx2.0b2 */
-#zotero-pane toolbarbutton .toolbarbutton-text
-{
-	margin:0 2px;
-}
-#zotero-pane .toolbarbutton-menu-dropmarker
-{
-	margin-right:4px;
-}
-#zotero-tb-fullscreen .toolbarbutton-text, #zotero-editpane-dynamic-fields .toolbarbutton-text
-{
-	margin:0;
-}
-
 
 #zotero-tb-actions-menu
 {
@@ -274,7 +252,7 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	width: 150px;
 }
 
-#zotero-tb-search-cancel
+#zotero-tb-search[type=conditional-timed] > #zotero-tb-search-cancel
 {
 	width: 10px;
 	height: 10px;
@@ -285,7 +263,7 @@ window[active="true"] #zotero-pane-stack[fullscreenmode="true"][platform="mac"]
 	-moz-appearance: none !important; /* Fix rendering problems on Linux */
 }
 
-#zotero-tb-search-cancel:hover:active
+#zotero-tb-search[type=conditional-timed] > #zotero-tb-search-cancel:hover:active
 {
 	list-style-image: url('chrome://zotero/skin/search-cancel-active.png');
 }

chrome/skin/default/zotero/zotero.css

@@ -146,27 +146,61 @@ zoteromergepane {
 .zotero-clicky
 {	
 	-moz-border-radius: 6px;
+	border: 1px solid transparent;
 }
 
 .zotero-clicky[value="-"], .zotero-clicky[value="+"]
 {
-	margin: 0px;
+	color: transparent !important;
-	padding-left: 4px;
+	padding: 0 !important;
-	padding-right: 4px;
+	margin: 0 5px 0 0 !important;
+	width: 19px;
+	height: 12px;
+}
+
+.zotero-clicky[value="-"] {
+	-moz-border-image: url('chrome://zotero/skin/minus.png') 0 0 0 0 stretch;
+	min-width: 18px;
+	min-height: 18px;
+	max-width: 18px;
+	max-height: 18px;
+}
+
+.zotero-clicky[value="+"] {
+	-moz-border-image: url('chrome://zotero/skin/plus.png') 0 0 0 0 stretch;
+	min-width: 18px;
+	min-height: 18px;
+	max-width: 18px;
+	max-height: 18px;
+}
+
+.zotero-clicky[value="+"][disabled=true] {
+	-moz-border-image: url('chrome://zotero/skin/plus.png') 0 0 0 0 stretch;
+	opacity: .5;
+}
+
+.zotero-clicky[value="+"]:not([disabled=true]):active {
+	-moz-border-image: url('chrome://zotero/skin/plus-active.png') 0 0 0 0 stretch;
+}
+
+.zotero-clicky[value="-"]:not([disabled=true]):active {
+	-moz-border-image: url('chrome://zotero/skin/minus-active.png') 0 0 0 0 stretch;
 }
 
 .zotero-clicky:not([disabled=true]):hover,
 .zotero-clicky:not([disabled=true]):hover .toolbarbutton-text
 {
-	color: white;
 	background: #666;
+	background: rgb(187, 206, 241);
+	border: 1px solid rgb(109, 149, 224) !important;
 }
 
 .zotero-clicky:not([disabled=true]):active,
-.zotero-clicky:not([disabled=true]):active .toolbarbutton-text
+.zotero-clicky:not([disabled=true]):active .toolbarbutton-text,
+.zotero-clicky[selected="true"]
 {
 	color: white;
-	background: #333;
+	background: rgb(89, 139, 236) !important;
 }