www

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | Submodules | README | LICENSE

commit 7aa6d98f35c64f4fa658875d8b3cb2bb5207ba47
parent 129b8113b95f9ee429faba0f71653d322fed06cc
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri,  1 Apr 2016 05:26:54 -0400

Use library icon for New Library button, and add more HiDPI icons

Includes HiDPI icons for feed rows, which weren't showing up before

Diffstat:
Mchrome/content/zotero/xpcom/collectionTreeView.js | 3+--
Mchrome/content/zotero/xpcom/data/cachedTypes.js | 2+-
Achrome/skin/default/zotero/bullet_blue@2x.png | 0
Achrome/skin/default/zotero/bullet_blue_empty@2x.png | 0
Achrome/skin/default/zotero/group_add@2x.png | 0
Achrome/skin/default/zotero/library_add.png | 0
Achrome/skin/default/zotero/library_add@2x.png | 0
Achrome/skin/default/zotero/locate-show-file@2x.png | 0
Mchrome/skin/default/zotero/overlay.css | 10+++++++---
Achrome/skin/default/zotero/toolbar-feed-add@2x.png | 0
Achrome/skin/default/zotero/toolbar-feed-edit@2x.png | 0
Achrome/skin/default/zotero/treeitem-forumPost@2x.png | 0
Achrome/skin/default/zotero/treesource-feed-error@2x.png | 0
Achrome/skin/default/zotero/treesource-feed@2x.png | 0
Achrome/skin/default/zotero/treesource-feedLibrary@2x.png | 0
Achrome/skin/default/zotero/treesource-groups@2x.png | 0
16 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js @@ -732,10 +732,9 @@ Zotero.CollectionTreeView.prototype.getImageSrc = function(row, col) /* if (treeRow.ref.updating) { collectionType += '-updating'; - } else if (treeRow.ref.lastCheckError) { + } else */if (treeRow.ref.lastCheckError) { collectionType += '-error'; } - */ break; case 'trash': diff --git a/chrome/content/zotero/xpcom/data/cachedTypes.js b/chrome/content/zotero/xpcom/data/cachedTypes.js @@ -467,6 +467,7 @@ Zotero.ItemTypes = new function() { case 'bookSection': case 'computerProgram': case 'film': + case 'forumPost': case 'instantMessage': case 'interview': case 'journalArticle': @@ -487,7 +488,6 @@ Zotero.ItemTypes = new function() { case 'dictionaryEntry': case 'email': case 'encyclopediaArticle': - case 'forumPost': case 'hearing': case 'manuscript': case 'map': diff --git a/chrome/skin/default/zotero/bullet_blue@2x.png b/chrome/skin/default/zotero/bullet_blue@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/bullet_blue_empty@2x.png b/chrome/skin/default/zotero/bullet_blue_empty@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/group_add@2x.png b/chrome/skin/default/zotero/group_add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/library_add.png b/chrome/skin/default/zotero/library_add.png Binary files differ. diff --git a/chrome/skin/default/zotero/library_add@2x.png b/chrome/skin/default/zotero/library_add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/locate-show-file@2x.png b/chrome/skin/default/zotero/locate-show-file@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css @@ -308,7 +308,7 @@ #zotero-tb-library-add-menu { - list-style-image: url('chrome://zotero/skin/group_add.png'); + list-style-image: url('chrome://zotero/skin/library_add.png'); } @@ -703,6 +703,8 @@ /* 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-menuitem-new-feed { list-style-image: url('chrome://zotero/skin/toolbar-feed-add@2x.png'); } + #zotero-tb-library-add-menu { list-style-image: url('chrome://zotero/skin/library_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'); } @@ -713,6 +715,8 @@ .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-edit-feed { list-style-image: url('chrome://zotero/skin/toolbar-feed-edit@2x.png'); } + .zotero-menuitem-refresh-feed { list-style-image: url('chrome://zotero/skin/arrow_refresh@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'); } @@ -725,7 +729,7 @@ #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-tb-sync-error { list-style-image: url(chrome://zotero/skin/error@2x.png); } + #zotero-tb-sync-error[state=warning] { list-style-image: url(chrome://zotero/skin/warning@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/toolbar-feed-add@2x.png b/chrome/skin/default/zotero/toolbar-feed-add@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/toolbar-feed-edit@2x.png b/chrome/skin/default/zotero/toolbar-feed-edit@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treeitem-forumPost@2x.png b/chrome/skin/default/zotero/treeitem-forumPost@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-feed-error@2x.png b/chrome/skin/default/zotero/treesource-feed-error@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-feed@2x.png b/chrome/skin/default/zotero/treesource-feed@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-feedLibrary@2x.png b/chrome/skin/default/zotero/treesource-feedLibrary@2x.png Binary files differ. diff --git a/chrome/skin/default/zotero/treesource-groups@2x.png b/chrome/skin/default/zotero/treesource-groups@2x.png Binary files differ.