From 4f5feb98a2f51233ab7b7f74109c6ff83b2d00fd Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Wed, 2 Sep 2009 08:26:24 +0000 Subject: [PATCH] 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 --- .../zotero-platform/mac/attachmentbox.css | 9 + .../content/zotero-platform/mac/itembox.css | 34 ++ .../zotero-platform/mac/noteeditor.css | 9 + .../content/zotero-platform/mac/overlay.css | 369 ++++++++++++++++++ .../zotero-platform/mac/tagselector.css | 35 ++ .../mac/treesource-collection.png | Bin 0 -> 320 bytes .../zotero-platform/mac/treesource-search.png | Bin 0 -> 549 bytes .../zotero-platform/mac/zoterotbbutton.xml | 58 +++ .../zotero-platform/unix/attachmentbox.css | 0 .../zotero-platform/unix/noteeditor.css | 0 .../content/zotero-platform/unix/overlay.css | 0 .../zotero-platform/unix/tagselector.css | 0 .../unix/treesource-collection.png | Bin 0 -> 537 bytes .../unix/treesource-search.png | Bin 0 -> 679 bytes .../zotero-platform/win/attachmentbox.css | 0 .../content/zotero-platform/win/itembox.css | 11 - .../zotero-platform/win/noteeditor.css | 0 .../content/zotero-platform/win/overlay.css | 0 .../zotero-platform/win/tagselector.css | 0 .../win/treesource-collection.png | Bin 0 -> 537 bytes .../zotero-platform/win/treesource-search.png | Bin 0 -> 679 bytes .../content/zotero/bindings/attachmentbox.xml | 81 ++-- chrome/content/zotero/bindings/itembox.xml | 26 +- chrome/content/zotero/bindings/noteeditor.xml | 27 +- .../content/zotero/bindings/tagselector.xml | 103 ++--- chrome/content/zotero/overlay.js | 10 +- chrome/content/zotero/overlay.xul | 32 +- .../zotero/xpcom/collectionTreeView.js | 6 +- chrome/locale/en-US/zotero/zotero.dtd | 11 +- .../default/zotero/bindings/attachmentbox.css | 23 ++ .../skin/default/zotero/bindings/itembox.css | 82 +++- .../default/zotero/bindings/noteeditor.css | 22 ++ .../default/zotero/bindings/tagselector.css | 11 +- chrome/skin/default/zotero/mac/arrow-down.png | Bin 0 -> 163 bytes .../default/zotero/mac/folderDropArrow.png | Bin 0 -> 195 bytes chrome/skin/default/zotero/mac/hgrippy.png | Bin 0 -> 3464 bytes chrome/skin/default/zotero/mac/hsplitter.png | Bin 0 -> 3402 bytes .../zotero/mac/menubutton-end-pressed.png | Bin 0 -> 679 bytes .../default/zotero/mac/menubutton-end.png | Bin 0 -> 573 bytes .../zotero/mac/menubutton-mid-pressed.png | Bin 0 -> 188 bytes .../zotero/mac/menubutton-start-pressed.png | Bin 0 -> 759 bytes .../default/zotero/mac/menubutton-start.png | Bin 0 -> 653 bytes .../zotero/mac/selected-focused-gradient.png | Bin 0 -> 323 bytes .../default/zotero/mac/selected-gradient.png | Bin 0 -> 212 bytes chrome/skin/default/zotero/mac/vgrippy.png | Bin 0 -> 3460 bytes chrome/skin/default/zotero/mac/vsplitter.png | Bin 0 -> 3396 bytes chrome/skin/default/zotero/minus-active.png | Bin 0 -> 573 bytes chrome/skin/default/zotero/minus.png | Bin 0 -> 599 bytes chrome/skin/default/zotero/overlay.css | 36 +- chrome/skin/default/zotero/plus-active.png | Bin 0 -> 585 bytes chrome/skin/default/zotero/plus.png | Bin 0 -> 600 bytes chrome/skin/default/zotero/zotero.css | 46 ++- 52 files changed, 856 insertions(+), 185 deletions(-) create mode 100644 chrome/content/zotero-platform/mac/attachmentbox.css create mode 100644 chrome/content/zotero-platform/mac/noteeditor.css create mode 100644 chrome/content/zotero-platform/mac/overlay.css create mode 100644 chrome/content/zotero-platform/mac/tagselector.css create mode 100644 chrome/content/zotero-platform/mac/treesource-collection.png create mode 100644 chrome/content/zotero-platform/mac/treesource-search.png create mode 100644 chrome/content/zotero-platform/mac/zoterotbbutton.xml create mode 100644 chrome/content/zotero-platform/unix/attachmentbox.css create mode 100644 chrome/content/zotero-platform/unix/noteeditor.css create mode 100644 chrome/content/zotero-platform/unix/overlay.css create mode 100644 chrome/content/zotero-platform/unix/tagselector.css create mode 100644 chrome/content/zotero-platform/unix/treesource-collection.png create mode 100644 chrome/content/zotero-platform/unix/treesource-search.png create mode 100644 chrome/content/zotero-platform/win/attachmentbox.css create mode 100644 chrome/content/zotero-platform/win/noteeditor.css create mode 100644 chrome/content/zotero-platform/win/overlay.css create mode 100644 chrome/content/zotero-platform/win/tagselector.css create mode 100644 chrome/content/zotero-platform/win/treesource-collection.png create mode 100644 chrome/content/zotero-platform/win/treesource-search.png create mode 100644 chrome/skin/default/zotero/mac/arrow-down.png create mode 100644 chrome/skin/default/zotero/mac/folderDropArrow.png create mode 100644 chrome/skin/default/zotero/mac/hgrippy.png create mode 100644 chrome/skin/default/zotero/mac/hsplitter.png create mode 100644 chrome/skin/default/zotero/mac/menubutton-end-pressed.png create mode 100644 chrome/skin/default/zotero/mac/menubutton-end.png create mode 100644 chrome/skin/default/zotero/mac/menubutton-mid-pressed.png create mode 100644 chrome/skin/default/zotero/mac/menubutton-start-pressed.png create mode 100644 chrome/skin/default/zotero/mac/menubutton-start.png create mode 100644 chrome/skin/default/zotero/mac/selected-focused-gradient.png create mode 100644 chrome/skin/default/zotero/mac/selected-gradient.png create mode 100644 chrome/skin/default/zotero/mac/vgrippy.png create mode 100644 chrome/skin/default/zotero/mac/vsplitter.png create mode 100644 chrome/skin/default/zotero/minus-active.png create mode 100644 chrome/skin/default/zotero/minus.png create mode 100644 chrome/skin/default/zotero/plus-active.png create mode 100644 chrome/skin/default/zotero/plus.png diff --git a/chrome/content/zotero-platform/mac/attachmentbox.css b/chrome/content/zotero-platform/mac/attachmentbox.css new file mode 100644 index 0000000000..6206fe8397 --- /dev/null +++ b/chrome/content/zotero-platform/mac/attachmentbox.css @@ -0,0 +1,9 @@ +row > label:first-child +{ + color: #7f7f7f; +} + +*[zoteroFontSize=small] #attachment-box +{ + font-size: 10px; +} \ No newline at end of file diff --git a/chrome/content/zotero-platform/mac/itembox.css b/chrome/content/zotero-platform/mac/itembox.css index 8b13789179..3556bd463c 100644 --- a/chrome/content/zotero-platform/mac/itembox.css +++ b/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; +} \ No newline at end of file diff --git a/chrome/content/zotero-platform/mac/noteeditor.css b/chrome/content/zotero-platform/mac/noteeditor.css new file mode 100644 index 0000000000..9c23d1e91b --- /dev/null +++ b/chrome/content/zotero-platform/mac/noteeditor.css @@ -0,0 +1,9 @@ +row > label:first-child +{ + color: #7f7f7f; +} + +*[zoteroFontSize=small] #note-editor +{ + font-size: 10px; +} \ No newline at end of file diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css new file mode 100644 index 0000000000..951051bf5e --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/chrome/content/zotero-platform/mac/tagselector.css b/chrome/content/zotero-platform/mac/tagselector.css new file mode 100644 index 0000000000..fed6e6ccb4 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/chrome/content/zotero-platform/mac/treesource-collection.png b/chrome/content/zotero-platform/mac/treesource-collection.png new file mode 100644 index 0000000000000000000000000000000000000000..8f21ff790a3fec82a2db69d749ebd234fcaa75a7 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`)Ym%P6qNh3p^r= z85p>QL70(Y)*K0-;3H2L#}JFt$v^)8w`W$B@M)Ry{XDnUyMO&Xj!7=k43{o!`6R)` z)+w0kkWqQx^Zl7$|4+uA4%kp0_P2ihm#94wOT=@2FJ;&7JS6V;!;Y!>OB3&n(tr2< z`!3I$*s^{8?q-98(=TuT50~HTCv>mik=mh#t;g5>k1u*)|LgwFZxWt6s_z!IFv@24{mqZ5>rlC~<&nUl zhF_`d|HJiexeKjhO4`9F%KiPX{=D6@Q+Ui90wx`8J;=t;$Rn_NVrMGDg(+Jv-Lr9V Q2l|%5)78&qol`;+0RB6MX#fBK literal 0 HcmV?d00001 diff --git a/chrome/content/zotero-platform/mac/treesource-search.png b/chrome/content/zotero-platform/mac/treesource-search.png new file mode 100644 index 0000000000000000000000000000000000000000..0ccb8470256d32b201cfb508c7276310b7d7e46b GIT binary patch literal 549 zcmV+=0^0qFP)VcTu7QO&a2r zxOmhfk~VRXN+c4FPENw1{tE{O4*miT#LY!qaB}EPQ0m|&LDNW6>bcs^?#}F*N4r~T zQ^F>*nfbooe81;NmSw?zK85|l^BY@);DusBmX+yAng<8W>+ib=c#WwQ>gdg@=CaboSGR1D07`d`MRyI?FM-Y>BlT+8nKN` z(*l=Eg7cFkKL^HIZOjh6%H`C+&`mHj6GS~MI6k@uNs^$W%fqq5y<1@2nw;*Y#T6o! zSyV)w3TV0$K~HZJAcR4#7GB!A>cQ<+027lgVM9!j2Di|tabX?o-$42)1K1!iIO64t z?HR_nf*r~kP6W9e1BG;ZX9Hl}f{cM7aj$YLqhgywIg+0f$q_)v5$N}OAr?(hLkw3J zDLXB9tpY=SAH2RG5xT2bfU4^GE<7Yucur?&&Q-Q(ja%jz<78RXMUsk&$Z}$xC=lZl zoxBT|=OTj9fRA?}mCOLaq;!;-cf&AkFcJUYv(h)v%+K+=cP?D+-Eo0v?6~}_URQnx nb+wJaGHGY~KfdPdmjD9*$A{ukNh|z>00000NkvXXu0mjfQMC8L literal 0 HcmV?d00001 diff --git a/chrome/content/zotero-platform/mac/zoterotbbutton.xml b/chrome/content/zotero-platform/mac/zoterotbbutton.xml new file mode 100644 index 0000000000..0ab3d61333 --- /dev/null +++ b/chrome/content/zotero-platform/mac/zoterotbbutton.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/chrome/content/zotero-platform/unix/attachmentbox.css b/chrome/content/zotero-platform/unix/attachmentbox.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/chrome/content/zotero-platform/unix/noteeditor.css b/chrome/content/zotero-platform/unix/noteeditor.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/chrome/content/zotero-platform/unix/tagselector.css b/chrome/content/zotero-platform/unix/tagselector.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/chrome/content/zotero-platform/unix/treesource-collection.png b/chrome/content/zotero-platform/unix/treesource-collection.png new file mode 100644 index 0000000000000000000000000000000000000000..784e8fa48234f4f64b6922a6758f254ee0ca08ec GIT binary patch literal 537 zcmV+!0_OdRP)x(K@^6+>g^d@v4;gkbWsEoXE%32*i1tcpTNXd5CcIl)ECgqz|2rE6EW}s7R?kl za1q`0GCkMruC6-2LANtwVlsgzsp4?{@7$`KBv!G66>Vie3h?3OmEEkjwdLG0PgLVi z`!N((f$A@n17Ldj#`};0I3@iHJ5M{#IZz|UIYRm4(!uV7eYIYIwQf&}_2J~}>pQ^n z6o8--^T(=hkBNQ_k{-_GWE;FMW7!p}f{NG3nHZ{D5<3d8&tLh%a4AqqnjMkr3m&fkMdECD3N5}Unig5wy40;>lo4j~k+e}v)` zR6)J8Mk*u=SpB`p6o)7j?S0T@9?bz#m@l>gc*zk__|*!FMcHwP!gwLJvS~9c0px8E zW|B!lwB?F)%&66ocFx{jBe!85I&EQ#75Y65B5(Mx_0d{Cg3j-*JeIvt~v(9 ztY`S8F>>s+V~sTmN;}4H=Z!HS)(DKjt$rUaPhR;f5G}c|OUlyu`rOm=z&+MjoL2Ek zTm0^)e6oN~%J`&=(gmjK2N~YhK_xcK zEoV5BWBb;K=H{^+EtW(wWXLTdS4FOhvL)n}sIMf1VICJdydZX>U~@QG{;*1X#WjC) zr1dbuM}d?FAAx%5Xv>qN8EFR2i(h1**=X>G)oOfg_U7?X#32k3>qH~N`C9QvE@}^n zGhqY6++vD;yw#&i6Q>Sed3?u6;$N;m{5aHRIk}}XyzB+bjo7>Llo{{)Y8o@oYqL`? z&lySlkNcO8o-Otluk{V>>wfd%Vbe(Bf8CuZo#-Fld&_&*ZX~f0KLJ#yHcZ$RnzjG{ N002ovPDHLkV1g 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] { diff --git a/chrome/content/zotero-platform/win/noteeditor.css b/chrome/content/zotero-platform/win/noteeditor.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/chrome/content/zotero-platform/win/tagselector.css b/chrome/content/zotero-platform/win/tagselector.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/chrome/content/zotero-platform/win/treesource-collection.png b/chrome/content/zotero-platform/win/treesource-collection.png new file mode 100644 index 0000000000000000000000000000000000000000..784e8fa48234f4f64b6922a6758f254ee0ca08ec GIT binary patch literal 537 zcmV+!0_OdRP)x(K@^6+>g^d@v4;gkbWsEoXE%32*i1tcpTNXd5CcIl)ECgqz|2rE6EW}s7R?kl za1q`0GCkMruC6-2LANtwVlsgzsp4?{@7$`KBv!G66>Vie3h?3OmEEkjwdLG0PgLVi z`!N((f$A@n17Ldj#`};0I3@iHJ5M{#IZz|UIYRm4(!uV7eYIYIwQf&}_2J~}>pQ^n z6o8--^T(=hkBNQ_k{-_GWE;FMW7!p}f{NG3nHZ{D5<3d8&tLh%a4AqqnjMkr3m&fkMdECD3N5}Unig5wy40;>lo4j~k+e}v)` zR6)J8Mk*u=SpB`p6o)7j?S0T@9?bz#m@l>gc*zk__|*!FMcHwP!gwLJvS~9c0px8E zW|B!lwB?F)%&66ocFx{jBe!85I&EQ#75Y65B5(Mx_0d{Cg3j-*JeIvt~v(9 ztY`S8F>>s+V~sTmN;}4H=Z!HS)(DKjt$rUaPhR;f5G}c|OUlyu`rOm=z&+MjoL2Ek zTm0^)e6oN~%J`&=(gmjK2N~YhK_xcK zEoV5BWBb;K=H{^+EtW(wWXLTdS4FOhvL)n}sIMf1VICJdydZX>U~@QG{;*1X#WjC) zr1dbuM}d?FAAx%5Xv>qN8EFR2i(h1**=X>G)oOfg_U7?X#32k3>qH~N`C9QvE@}^n zGhqY6++vD;yw#&i6Q>Sed3?u6;$N;m{5aHRIk}}XyzB+bjo7>Llo{{)Y8o@oYqL`? z&lySlkNcO8o-Otluk{V>>wfd%Vbe(Bf8CuZo#-Fld&_&*ZX~f0KLJ#yHcZ$RnzjG{ N002ovPDHLkV1g + @@ -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 pagesRow = this._id('pages'); + var accessed = this._id('accessedRow'); + 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([ - Zotero.getString('itemFields.accessDate'), - ': ', - Zotero.Date.sqlToDate( + document.getElementById("accessed-label").value = Zotero.getString('itemFields.accessDate')+": "; + document.getElementById("accessed").value = 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([ - 'Filename', // TODO: localize - ': ', // TODO: probably needs to be in localized string - fileName - ], ''); + document.getElementById("fileName-label").value = "Filename: "; + document.getElementById("fileName").value = 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([ - Zotero.getString('itemFields.pages'), - ': ', - pages - ], ''); - pagesRow.value = str; + document.getElementById("pages-label").value = Zotero.getString('itemFields.pages')+': '; + document.getElementById("pages").value = pages; pagesRow.hidden = false; } else { @@ -303,14 +294,10 @@ } if (this.displayDateModified) { - var str = Zotero.localeJoin([ - Zotero.getString('itemFields.dateModified'), - ': ', - Zotero.Date.sqlToDate( + document.getElementById("dateModified-label").value = Zotero.getString('itemFields.dateModified')+': '; + document.getElementById("dateModified").value = Zotero.Date.sqlToDate( this.item.getField('dateModified'), true - ).toLocaleString() - ], ''); - dateModifiedRow.value = str; + ).toLocaleString(); dateModifiedRow.hidden = false; } else { @@ -468,9 +455,8 @@ str = 'general.yes'; break; } - str = Zotero.getString('fulltext.indexState.indexed') + ': ' + - Zotero.getString(str); - indexStatus.setAttribute('value', str); + document.getElementById("index-status-label").value = Zotero.getString('fulltext.indexState.indexed') + ': '; + indexStatus.value = Zotero.getString(str); // Reindex button tooltip (string stored in zotero.properties) var str = Zotero.getString('pane.items.menu.reindexItem'); @@ -508,14 +494,39 @@ - + + + + diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml index 18f8344174..47396481ed 100644 --- a/chrome/content/zotero/bindings/noteeditor.xml +++ b/chrome/content/zotero/bindings/noteeditor.xml @@ -28,6 +28,7 @@ + @@ -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; ]]> @@ -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; ]]> @@ -479,9 +482,23 @@ - - - + + + + + + + + + + + + + + + + + diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml index 22ff97bee2..56773a7463 100644 --- a/chrome/content/zotero/bindings/tagselector.xml +++ b/chrome/content/zotero/bindings/tagselector.xml @@ -30,6 +30,7 @@ + @@ -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'); + } ]]> @@ -768,59 +773,61 @@ - - - - - - - - - + + + + + + - --> - - - - - - - - - - - - - - - - + + + - - - - + + + + + + + + + + - + diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js index 9eb045d98f..3ee477fafa 100644 --- a/chrome/content/zotero/overlay.js +++ b/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"); + } } diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul index fdf8b83fec..e2bdb9014b 100644 --- a/chrome/content/zotero/overlay.xul +++ b/chrome/content/zotero/overlay.xul @@ -21,6 +21,7 @@ ***** END LICENSE BLOCK ***** --> + %globalDTD; @@ -141,10 +142,10 @@ the tag selector to max height --> - - + + - + @@ -200,13 +201,14 @@ oncommand="ZoteroPane.updateTagFilter()"/> - + - - + + @@ -218,14 +220,14 @@ - - - + + + - + - - - - + +