diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js index de71048aa..c9418cf1f 100644 --- 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 index 29b2ad5c8..c81e0b0e7 100644 --- 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 new file mode 100644 index 000000000..e88f4f257 Binary files /dev/null and b/chrome/skin/default/zotero/bullet_blue@2x.png differ diff --git a/chrome/skin/default/zotero/bullet_blue_empty@2x.png b/chrome/skin/default/zotero/bullet_blue_empty@2x.png new file mode 100644 index 000000000..d35fb0f98 Binary files /dev/null and b/chrome/skin/default/zotero/bullet_blue_empty@2x.png differ diff --git a/chrome/skin/default/zotero/group_add@2x.png b/chrome/skin/default/zotero/group_add@2x.png new file mode 100644 index 000000000..6d331573f Binary files /dev/null and b/chrome/skin/default/zotero/group_add@2x.png differ diff --git a/chrome/skin/default/zotero/library_add.png b/chrome/skin/default/zotero/library_add.png new file mode 100644 index 000000000..8dfbb245e Binary files /dev/null and b/chrome/skin/default/zotero/library_add.png differ diff --git a/chrome/skin/default/zotero/library_add@2x.png b/chrome/skin/default/zotero/library_add@2x.png new file mode 100644 index 000000000..cdb306faf Binary files /dev/null and b/chrome/skin/default/zotero/library_add@2x.png differ diff --git a/chrome/skin/default/zotero/locate-show-file@2x.png b/chrome/skin/default/zotero/locate-show-file@2x.png new file mode 100644 index 000000000..60572ba7b Binary files /dev/null and b/chrome/skin/default/zotero/locate-show-file@2x.png differ diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css index 7b61d16d4..669969ecf 100644 --- 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 new file mode 100644 index 000000000..e7cd7f6c8 Binary files /dev/null and b/chrome/skin/default/zotero/toolbar-feed-add@2x.png differ diff --git a/chrome/skin/default/zotero/toolbar-feed-edit@2x.png b/chrome/skin/default/zotero/toolbar-feed-edit@2x.png new file mode 100644 index 000000000..ff6a7178d Binary files /dev/null and b/chrome/skin/default/zotero/toolbar-feed-edit@2x.png differ diff --git a/chrome/skin/default/zotero/treeitem-forumPost@2x.png b/chrome/skin/default/zotero/treeitem-forumPost@2x.png new file mode 100644 index 000000000..59123fe37 Binary files /dev/null and b/chrome/skin/default/zotero/treeitem-forumPost@2x.png differ diff --git a/chrome/skin/default/zotero/treesource-feed-error@2x.png b/chrome/skin/default/zotero/treesource-feed-error@2x.png new file mode 100644 index 000000000..24f70cf6b Binary files /dev/null and b/chrome/skin/default/zotero/treesource-feed-error@2x.png differ diff --git a/chrome/skin/default/zotero/treesource-feed@2x.png b/chrome/skin/default/zotero/treesource-feed@2x.png new file mode 100644 index 000000000..d75d86aab Binary files /dev/null and b/chrome/skin/default/zotero/treesource-feed@2x.png differ diff --git a/chrome/skin/default/zotero/treesource-feedLibrary@2x.png b/chrome/skin/default/zotero/treesource-feedLibrary@2x.png new file mode 100644 index 000000000..b5dd37fc0 Binary files /dev/null and b/chrome/skin/default/zotero/treesource-feedLibrary@2x.png differ diff --git a/chrome/skin/default/zotero/treesource-groups@2x.png b/chrome/skin/default/zotero/treesource-groups@2x.png new file mode 100644 index 000000000..cbdd01bda Binary files /dev/null and b/chrome/skin/default/zotero/treesource-groups@2x.png differ