commit af871a3fd53a47561ed590f044bb82176faecf9f parent 58b56abbc7c2e7d11861164c5be439fe08966c12 Author: Dan Stillman <dstillman@zotero.org> Date: Mon, 6 Apr 2015 16:40:52 -0400 Add 2x versions of many icons Courtesy of Pastel SVG (2x famfamfam) I didn't add 2x versions for any composite icons or any Fugue icons. Also: - Removed some unused/redundant images - Switched to shadowless versions for a couple Fugue icons Diffstat:
71 files changed, 128 insertions(+), 42 deletions(-)
diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css @@ -107,6 +107,12 @@ margin-left: 7px; } +@media (min-resolution: 1.5dppx) { + .zotero-tb-button > .toolbarbutton-icon { + max-width: 28px; + } +} + .zotero-tb-button, .zotero-tb-button:first-child, .zotero-tb-button:last-child { -moz-margin-start: 0 !important; -moz-margin-end: 3px !important; @@ -467,6 +473,16 @@ treechildren::-moz-tree-image { list-style-image: url('chrome://zotero/skin/mac/toolbar-note-add.png'); } +@media (min-resolution: 1.5dppx) { + #zotero-tb-advanced-search { + list-style-image: url('chrome://zotero/skin/mac/toolbar-advanced-search@2x.png'); + } + + #zotero-tb-note-add { + list-style-image: url('chrome://zotero/skin/mac/toolbar-note-add@2x.png'); + } +} + #zotero-tb-actions-menu { list-style-image: url('chrome://zotero/skin/mac/cog.png'); diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css @@ -93,6 +93,16 @@ /* End toolbar buttons */ +@media (min-resolution: 1dppx) { + #zotero-toolbar .toolbarbutton-icon { + width: 16px; + } + + #zotero-tb-sync > .toolbarbutton-icon { + width: 20px; + } +} + .zotero-tb-button:not([type=menu]) { margin-right: 4px; } diff --git a/chrome/content/zotero-platform/unix/treesource-collection.png b/chrome/content/zotero-platform/unix/treesource-collection.png Binary files differ. diff --git a/chrome/content/zotero-platform/unix/treesource-search.png b/chrome/content/zotero-platform/unix/treesource-search.png Binary files differ. diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css @@ -100,6 +100,16 @@ } /* End toolbar buttons */ +@media (min-resolution: 1dppx) { + #zotero-toolbar .toolbarbutton-icon { + width: 16px; + } + + #zotero-tb-sync > .toolbarbutton-icon { + width: 20px; + } +} + #zotero-tb-search-menu-button { margin: 0 -1px 0 -4px; border: 0; diff --git a/chrome/content/zotero-platform/win/treesource-collection.png b/chrome/content/zotero-platform/win/treesource-collection.png Binary files differ. diff --git a/chrome/content/zotero-platform/win/treesource-search.png b/chrome/content/zotero-platform/win/treesource-search.png Binary files differ. diff --git a/chrome/content/zotero/about.xul b/chrome/content/zotero/about.xul @@ -61,6 +61,7 @@ <label class="zotero-text-link" href="http://p.yusukekamiyamane.com/" value="Fugue icons (by Yusuke Kamiyamane)"/> <label class="zotero-text-link" href="http://www.davidashen.net/rnv.html" value="RNV (CSL validation)"/> <label class="zotero-text-link" href="http://documentup.com/kriskowal/q/" value="Q (by Kristopher Michael Kowal)"/> + <label class="zotero-text-link" href="https://codefisher.org/pastel-svg/" value="Pastel SVG icons (by Michael Buckley)"/> <label class="zotero-text-link" href="http://www.famfamfam.com/lab/icons/silk/" value="Silk icons (by Mark James)"/> <label class="zotero-text-link" href="http://simile.mit.edu/timeline/" value="SIMILE Project (Timeline)"/> <label class="zotero-text-link" href="http://www.w3.org/2005/ajar/tab" value="Tabulator (RDF parser)"/> diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js @@ -907,7 +907,7 @@ Zotero_Browser.Tab.prototype.getCaptureIcon = function (hiDPI) { case this.CAPTURE_STATE_TRANSLATABLE: var itemType = this.page.translators[0].itemType; return (itemType === "multiple" - ? "chrome://zotero/skin/treesource-collection.png" + ? "chrome://zotero/skin/treesource-collection" + suffix + ".png" : Zotero.ItemTypes.getImageSrc(itemType)); // TODO: Show icons for images, PDFs, etc.? diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js @@ -421,6 +421,8 @@ Zotero.CollectionTreeView.prototype.getCellText = function(row, column) Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col) { + var suffix = Zotero.hiDPI ? "@2x" : ""; + var itemGroup = this._getItemAtRow(row); var collectionType = itemGroup.type; @@ -458,10 +460,13 @@ Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col) case 'collection': case 'search': - return "chrome://zotero-platform/content/treesource-" + collectionType + ".png"; + if (Zotero.isMac) { + return "chrome://zotero-platform/content/treesource-" + collectionType + ".png"; + } + break; } - return "chrome://zotero/skin/treesource-" + collectionType + ".png"; + return "chrome://zotero/skin/treesource-" + collectionType + suffix + ".png"; } Zotero.CollectionTreeView.prototype.isContainer = function(row) diff --git a/chrome/content/zotero/xpcom/data/cachedTypes.js b/chrome/content/zotero/xpcom/data/cachedTypes.js @@ -323,6 +323,8 @@ Zotero.ItemTypes = new function() { } function getImageSrc(itemType) { + var suffix = Zotero.hiDPI ? "@2x" : ""; + if (this.isCustom(itemType)) { var id = this.getID(itemType) - this.customIDOffset; if (_customImages[id]) { @@ -337,50 +339,57 @@ Zotero.ItemTypes = new function() { } switch (itemType) { + // Use treeitem.png case 'attachment-file': + case 'document': + break; + + // HiDPI images available case 'attachment-link': - case 'attachment-snapshot': case 'attachment-web-link': - case 'attachment-pdf': case 'artwork': case 'audioRecording': case 'bill': - case 'blogPost': case 'book': case 'bookSection': - case 'case': case 'computerProgram': - case 'conferencePaper': - case 'dictionaryEntry': - case 'document': - case 'email': - case 'encyclopediaArticle': case 'film': - case 'forumPost': - case 'hearing': case 'instantMessage': case 'interview': case 'journalArticle': case 'letter': case 'magazineArticle': - case 'manuscript': - case 'map': case 'newspaperArticle': case 'note': + case 'report': + case 'webpage': + return "chrome://zotero/skin/treeitem-" + itemType + suffix + ".png"; + + // No HiDPI images available + case 'attachment-snapshot': + case 'attachment-pdf': + case 'blogPost': + case 'case': + case 'conferencePaper': + case 'dictionaryEntry': + case 'email': + case 'encyclopediaArticle': + case 'forumPost': + case 'hearing': + case 'manuscript': + case 'map': case 'patent': case 'podcast': case 'presentation': case 'radioBroadcast': - case 'report': case 'statute': case 'thesis': case 'tvBroadcast': case 'videoRecording': - case 'webpage': return "chrome://zotero/skin/treeitem-" + itemType + ".png"; } - return "chrome://zotero/skin/treeitem.png"; + return "chrome://zotero/skin/treeitem" + suffix + ".png"; } } diff --git a/chrome/content/zotero/xpcom/data/tags.js b/chrome/content/zotero/xpcom/data/tags.js @@ -667,12 +667,14 @@ Zotero.Tags = new function() { * @return {Q Promise} A Q promise for a data: URL for a PNG */ this.generateItemsListImage = function (colors, extraImage) { - var swatchWidth = 8; - var separator = 3; - var extraImageSeparator = 1; - var extraImageWidth = 16; - var canvasHeight = 16; - var swatchHeight = 8; + var multiplier = (extraImage && extraImage.indexOf('2x') != -1) ? 2 : 1; + + var swatchWidth = 8 * multiplier; + var separator = 3 * multiplier; + var extraImageSeparator = 1 * multiplier; + var extraImageWidth = 16 * multiplier; + var canvasHeight = 16 * multiplier; + var swatchHeight = 8 * multiplier; var prependExtraImage = true; var hash = colors.join("") + (extraImage ? extraImage : ""); diff --git a/chrome/skin/default/zotero/arrow_refresh@2x.png b/chrome/skin/default/zotero/arrow_refresh@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/arrow_rotate_error.png b/chrome/skin/default/zotero/arrow_rotate_error.png Binary files differ. diff --git a/chrome/skin/default/zotero/attach@2x.png b/chrome/skin/default/zotero/attach@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/bindings/attachmentbox.css b/chrome/skin/default/zotero/bindings/attachmentbox.css @@ -24,6 +24,13 @@ list-style-image: url(chrome://zotero/skin/arrow_refresh.png); } +@media (min-resolution: 1.5dppx) { + #reindex { + list-style-image: url(chrome://zotero/skin/arrow_refresh@2x.png); + width: 20px; + } +} + #index-box > button { font-size: .95em; diff --git a/chrome/skin/default/zotero/cog@2x.png b/chrome/skin/default/zotero/cog@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/control_stop_blue@2x.png b/chrome/skin/default/zotero/control_stop_blue@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/error@2x.png b/chrome/skin/default/zotero/error@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/exclamation@2x.png b/chrome/skin/default/zotero/exclamation@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/locate-external-viewer@2x.png b/chrome/skin/default/zotero/locate-external-viewer@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/locate-view-online@2x.png b/chrome/skin/default/zotero/locate-view-online@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/mac/toolbar-advanced-search@2x.png b/chrome/skin/default/zotero/mac/toolbar-advanced-search@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/mac/toolbar-note-add@2x.png b/chrome/skin/default/zotero/mac/toolbar-note-add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css @@ -287,11 +287,6 @@ } -#zotero-tb-tag-selector -{ - list-style-image: url(chrome://zotero/skin/tag-selector.png); -} - #zotero-collections-tree, #zotero-items-tree, #zotero-item-pane > groupbox { margin: 0; @@ -408,7 +403,7 @@ .zotero-menuitem-attachments-file { - list-style-image: url('chrome://zotero/skin/treeitem-attachment-file.png'); + list-style-image: url('chrome://zotero/skin/treeitem.png'); } .zotero-menuitem-attachments-link @@ -668,4 +663,35 @@ .zotero-box-label { margin-left: 3px !important; -} -\ No newline at end of file +} + + +/* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ +@media (min-resolution: 1.5dppx) { + #zotero-tb-collection-add { list-style-image: url('chrome://zotero/skin/toolbar-collection-add@2x.png'); } + #zotero-tb-actions-menu { list-style-image: url('chrome://zotero/skin/cog@2x.png'); } + #zotero-tb-add { list-style-image: url('chrome://zotero/skin/toolbar-item-add@2x.png'); } + #zotero-tb-attachment-add { list-style-image: url('chrome://zotero/skin/attach@2x.png'); } + #zotero-tb-note-add { list-style-image: url('chrome://zotero/skin/toolbar-note-add@2x.png'); } + #zotero-menuitem-note { list-style-image: url('chrome://zotero/skin/treeitem-note@2x.png'); } + .zotero-menuitem-new-saved-search { list-style-image: url('chrome://zotero/skin/treesource-search@2x.png'); } + .zotero-menuitem-show-duplicates { list-style-image: url('chrome://zotero/skin/treesource-duplicates@2x.png'); } + .zotero-menuitem-show-unfiled { list-style-image: url('chrome://zotero/skin/treesource-unfiled@2x.png'); } + .zotero-menuitem-new-collection { list-style-image: url('chrome://zotero/skin/toolbar-collection-add@2x.png'); } + .zotero-menuitem-edit-collection { list-style-image: url('chrome://zotero/skin/toolbar-collection-edit@2x.png'); } + .zotero-menuitem-delete-collection { list-style-image: url('chrome://zotero/skin/toolbar-collection-delete@2x.png'); } + .zotero-menuitem-show-in-library { list-style-image: url('chrome://zotero/skin/treesource-library@2x.png'); } + .zotero-menuitem-move-to-trash { list-style-image: url('chrome://zotero/skin/treesource-trash-full@2x.png'); } + .zotero-menuitem-attach-note { list-style-image: url('chrome://zotero/skin/toolbar-note-add@2x.png'); } + .zotero-menuitem-attach { list-style-image: url('chrome://zotero/skin/attach@2x.png'); } + .zotero-menuitem-attachments-file { list-style-image: url('chrome://zotero/skin/treeitem@2x.png'); } + .zotero-menuitem-attachments-link { list-style-image: url('chrome://zotero/skin/treeitem-attachment-link@2x.png'); } + .zotero-menuitem-attachments-web-link { list-style-image: url('chrome://zotero/skin/treeitem-attachment-web-link@2x.png'); } + .zotero-menuitem-create-report { list-style-image: url('chrome://zotero/skin/treeitem-report@2x.png'); } + #zotero-tb-advanced-search { list-style-image: url('chrome://zotero/skin/toolbar-advanced-search@2x.png'); } + #zotero-tb-locate { list-style-image: url('chrome://zotero/skin/toolbar-go-arrow@2x.png'); } + #zotero-tb-sync-storage-cancel { list-style-image: url(chrome://zotero/skin/control_stop_blue@2x.png); margin-right: 0; } + #zotero-tb-sync-error, #zotero-tb-sync-error[mode=warning] { list-style-image: url(chrome://zotero/skin/error@2x.png); } + #zotero-tb-sync-error[mode=error] { list-style-image: url(chrome://zotero/skin/exclamation@2x.png); } + #zotero-pane-stack[fullscreenmode="true"] #zotero-tb-fullscreen { list-style-image: url('chrome://zotero/skin/toolbar-fullscreen-top@2x.png'); } +} diff --git a/chrome/skin/default/zotero/page-white-add@2x.png b/chrome/skin/default/zotero/page-white-add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/tag-automatic@2x.png b/chrome/skin/default/zotero/tag-automatic@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/tag-selector-menu@2x.png b/chrome/skin/default/zotero/tag-selector-menu@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/tag-selector.png b/chrome/skin/default/zotero/tag-selector.png Binary files differ. diff --git a/chrome/skin/default/zotero/tag@2x.png b/chrome/skin/default/zotero/tag@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-advanced-search@2x.png b/chrome/skin/default/zotero/toolbar-advanced-search@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-collection-add@2x.png b/chrome/skin/default/zotero/toolbar-collection-add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-collection-delete@2x.png b/chrome/skin/default/zotero/toolbar-collection-delete@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-collection-edit@2x.png b/chrome/skin/default/zotero/toolbar-collection-edit@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-fullscreen-top@2x.png b/chrome/skin/default/zotero/toolbar-fullscreen-top@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-go-arrow@2x.png b/chrome/skin/default/zotero/toolbar-go-arrow@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-item-add@2x.png b/chrome/skin/default/zotero/toolbar-item-add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-item-from-page.png b/chrome/skin/default/zotero/toolbar-item-from-page.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-link-add@2x.png b/chrome/skin/default/zotero/toolbar-link-add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-note-add@2x.png b/chrome/skin/default/zotero/toolbar-note-add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-artwork@2x.png b/chrome/skin/default/zotero/treeitem-artwork@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-attachment-file.png b/chrome/skin/default/zotero/treeitem-attachment-file.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-attachment-link@2x.png b/chrome/skin/default/zotero/treeitem-attachment-link@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-attachment-web-link@2x.png b/chrome/skin/default/zotero/treeitem-attachment-web-link@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-audioRecording.png b/chrome/skin/default/zotero/treeitem-audioRecording.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-audioRecording@2x.png b/chrome/skin/default/zotero/treeitem-audioRecording@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-bill@2x.png b/chrome/skin/default/zotero/treeitem-bill@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-book@2x.png b/chrome/skin/default/zotero/treeitem-book@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-bookSection@2x.png b/chrome/skin/default/zotero/treeitem-bookSection@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-case.png b/chrome/skin/default/zotero/treeitem-case.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-computerProgram@2x.png b/chrome/skin/default/zotero/treeitem-computerProgram@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-document.png b/chrome/skin/default/zotero/treeitem-document.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-film@2x.png b/chrome/skin/default/zotero/treeitem-film@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-instantMessage@2x.png b/chrome/skin/default/zotero/treeitem-instantMessage@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-interview@2x.png b/chrome/skin/default/zotero/treeitem-interview@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-journalArticle@2x.png b/chrome/skin/default/zotero/treeitem-journalArticle@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-letter@2x.png b/chrome/skin/default/zotero/treeitem-letter@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-magazineArticle@2x.png b/chrome/skin/default/zotero/treeitem-magazineArticle@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-newspaperArticle@2x.png b/chrome/skin/default/zotero/treeitem-newspaperArticle@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-note@2x.png b/chrome/skin/default/zotero/treeitem-note@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-report@2x.png b/chrome/skin/default/zotero/treeitem-report@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-webpage@2x.png b/chrome/skin/default/zotero/treeitem-webpage@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem@2x.png b/chrome/skin/default/zotero/treeitem@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-collection@2x.png b/chrome/skin/default/zotero/treesource-collection@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-duplicates@2x.png b/chrome/skin/default/zotero/treesource-duplicates@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-library@2x.png b/chrome/skin/default/zotero/treesource-library@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-search@2x.png b/chrome/skin/default/zotero/treesource-search@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-trash-full@2x.png b/chrome/skin/default/zotero/treesource-trash-full@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-trash@2x.png b/chrome/skin/default/zotero/treesource-trash@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-unfiled@2x.png b/chrome/skin/default/zotero/treesource-unfiled@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css @@ -43,13 +43,6 @@ toolbarpaletteitem[place="palette"] #zotero-toolbar-save-button-single { list-style-image: url("chrome://zotero/skin/treeitem-webpage@2x.png"); } -@media (min-resolution: 1.5dppx) { - #zotero-toolbar-save-button[cui-areatype="toolbar"], - #zotero-toolbar-save-button-single[cui-areatype="toolbar"] { - list-style-image: url("chrome://zotero/skin/treeitem-webpage@2x.png"); - } -} - /* Show single icon for combo buttons in palette */ toolbarpaletteitem[place="palette"] #zotero-toolbar-main-button { list-style-image: url("chrome://zotero/skin/zotero-z-32px-australis.svg"); @@ -369,4 +362,13 @@ label.zotero-text-link { { width: 29.5em; max-width: 29.5em; -} -\ No newline at end of file +} + + +/* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ +@media (min-resolution: 1.5dppx) { + #zotero-toolbar-save-button,#zotero-toolbar-save-button-single { list-style-image: url("chrome://zotero/skin/treeitem-webpage@2x.png"); } + #zotero-toolbar-save-button[cui-areatype="menu-panel"],#zotero-toolbar-save-button-single[cui-areatype="menu-panel"],toolbarpaletteitem[place="palette"] #zotero-toolbar-save-button,toolbarpaletteitem[place="palette"] #zotero-toolbar-save-button-single { list-style-image: url("chrome://zotero/skin/treeitem-webpage@2x.png"); } + .zotero-scrape-popup-library { list-style-image: url('chrome://zotero/skin/treesource-library@2x.png'); } + .zotero-scrape-popup-collection { list-style-image: url('chrome://zotero/skin/treesource-collection@2x.png'); } +}
