From af871a3fd53a47561ed590f044bb82176faecf9f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 6 Apr 2015 16:40:52 -0400 Subject: [PATCH] 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 --- .../content/zotero-platform/mac/overlay.css | 16 +++++++ .../content/zotero-platform/unix/overlay.css | 10 +++++ .../unix/treesource-collection.png | Bin 537 -> 0 bytes .../unix/treesource-search.png | Bin 679 -> 0 bytes .../content/zotero-platform/win/overlay.css | 10 +++++ .../win/treesource-collection.png | Bin 537 -> 0 bytes .../zotero-platform/win/treesource-search.png | Bin 679 -> 0 bytes chrome/content/zotero/about.xul | 1 + chrome/content/zotero/browser.js | 2 +- .../zotero/xpcom/collectionTreeView.js | 9 +++- .../content/zotero/xpcom/data/cachedTypes.js | 41 +++++++++++------- chrome/content/zotero/xpcom/data/tags.js | 14 +++--- .../skin/default/zotero/arrow_refresh@2x.png | Bin 0 -> 1234 bytes .../default/zotero/arrow_rotate_error.png | Bin 843 -> 0 bytes chrome/skin/default/zotero/attach@2x.png | Bin 0 -> 884 bytes .../default/zotero/bindings/attachmentbox.css | 7 +++ chrome/skin/default/zotero/cog@2x.png | Bin 0 -> 1341 bytes .../default/zotero/control_stop_blue@2x.png | Bin 0 -> 1962 bytes chrome/skin/default/zotero/error@2x.png | Bin 0 -> 1254 bytes chrome/skin/default/zotero/exclamation@2x.png | Bin 0 -> 1366 bytes .../zotero/locate-external-viewer@2x.png | Bin 0 -> 901 bytes .../default/zotero/locate-view-online@2x.png | Bin 0 -> 2340 bytes .../zotero/mac/toolbar-advanced-search@2x.png | Bin 0 -> 2573 bytes .../zotero/mac/toolbar-note-add@2x.png | Bin 0 -> 2664 bytes chrome/skin/default/zotero/overlay.css | 40 ++++++++++++++--- .../skin/default/zotero/page-white-add@2x.png | Bin 0 -> 896 bytes .../skin/default/zotero/tag-automatic@2x.png | Bin 0 -> 832 bytes .../default/zotero/tag-selector-menu@2x.png | Bin 0 -> 171 bytes chrome/skin/default/zotero/tag-selector.png | Bin 877 -> 0 bytes chrome/skin/default/zotero/tag@2x.png | Bin 0 -> 821 bytes .../zotero/toolbar-advanced-search@2x.png | Bin 0 -> 1247 bytes .../zotero/toolbar-collection-add@2x.png | Bin 0 -> 999 bytes .../zotero/toolbar-collection-delete@2x.png | Bin 0 -> 985 bytes .../zotero/toolbar-collection-edit@2x.png | Bin 0 -> 1251 bytes .../zotero/toolbar-fullscreen-top@2x.png | Bin 0 -> 911 bytes .../default/zotero/toolbar-go-arrow@2x.png | Bin 0 -> 591 bytes .../default/zotero/toolbar-item-add@2x.png | Bin 0 -> 1506 bytes .../default/zotero/toolbar-item-from-page.png | Bin 739 -> 0 bytes .../default/zotero/toolbar-link-add@2x.png | Bin 0 -> 1224 bytes .../default/zotero/toolbar-note-add@2x.png | Bin 0 -> 1062 bytes .../default/zotero/treeitem-artwork@2x.png | Bin 0 -> 1031 bytes .../zotero/treeitem-attachment-file.png | Bin 294 -> 0 bytes .../zotero/treeitem-attachment-link@2x.png | Bin 0 -> 944 bytes .../treeitem-attachment-web-link@2x.png | Bin 0 -> 1471 bytes .../zotero/treeitem-audioRecording.png | Bin 738 -> 685 bytes .../zotero/treeitem-audioRecording@2x.png | Bin 0 -> 1016 bytes .../skin/default/zotero/treeitem-bill@2x.png | Bin 0 -> 1295 bytes .../skin/default/zotero/treeitem-book@2x.png | Bin 0 -> 828 bytes .../zotero/treeitem-bookSection@2x.png | Bin 0 -> 861 bytes chrome/skin/default/zotero/treeitem-case.png | Bin 753 -> 723 bytes .../zotero/treeitem-computerProgram@2x.png | Bin 0 -> 886 bytes .../skin/default/zotero/treeitem-document.png | Bin 373 -> 0 bytes .../skin/default/zotero/treeitem-film@2x.png | Bin 0 -> 830 bytes .../zotero/treeitem-instantMessage@2x.png | Bin 0 -> 667 bytes .../default/zotero/treeitem-interview@2x.png | Bin 0 -> 786 bytes .../zotero/treeitem-journalArticle@2x.png | Bin 0 -> 560 bytes .../default/zotero/treeitem-letter@2x.png | Bin 0 -> 1338 bytes .../zotero/treeitem-magazineArticle@2x.png | Bin 0 -> 589 bytes .../zotero/treeitem-newspaperArticle@2x.png | Bin 0 -> 1456 bytes .../skin/default/zotero/treeitem-note@2x.png | Bin 0 -> 714 bytes .../default/zotero/treeitem-report@2x.png | Bin 0 -> 1005 bytes .../default/zotero/treeitem-webpage@2x.png | Bin 2058 -> 965 bytes chrome/skin/default/zotero/treeitem@2x.png | Bin 0 -> 390 bytes .../zotero/treesource-collection@2x.png | Bin 0 -> 628 bytes .../zotero/treesource-duplicates@2x.png | Bin 0 -> 520 bytes .../default/zotero/treesource-library@2x.png | Bin 0 -> 792 bytes .../default/zotero/treesource-search@2x.png | Bin 0 -> 1128 bytes .../zotero/treesource-trash-full@2x.png | Bin 0 -> 1069 bytes .../default/zotero/treesource-trash@2x.png | Bin 0 -> 1150 bytes .../default/zotero/treesource-unfiled@2x.png | Bin 0 -> 429 bytes chrome/skin/default/zotero/zotero.css | 18 ++++---- 71 files changed, 128 insertions(+), 40 deletions(-) delete mode 100644 chrome/content/zotero-platform/unix/treesource-collection.png delete mode 100644 chrome/content/zotero-platform/unix/treesource-search.png delete mode 100644 chrome/content/zotero-platform/win/treesource-collection.png delete mode 100644 chrome/content/zotero-platform/win/treesource-search.png create mode 100644 chrome/skin/default/zotero/arrow_refresh@2x.png delete mode 100644 chrome/skin/default/zotero/arrow_rotate_error.png create mode 100644 chrome/skin/default/zotero/attach@2x.png create mode 100644 chrome/skin/default/zotero/cog@2x.png create mode 100644 chrome/skin/default/zotero/control_stop_blue@2x.png create mode 100644 chrome/skin/default/zotero/error@2x.png create mode 100644 chrome/skin/default/zotero/exclamation@2x.png create mode 100644 chrome/skin/default/zotero/locate-external-viewer@2x.png create mode 100644 chrome/skin/default/zotero/locate-view-online@2x.png create mode 100644 chrome/skin/default/zotero/mac/toolbar-advanced-search@2x.png create mode 100644 chrome/skin/default/zotero/mac/toolbar-note-add@2x.png create mode 100644 chrome/skin/default/zotero/page-white-add@2x.png create mode 100644 chrome/skin/default/zotero/tag-automatic@2x.png create mode 100644 chrome/skin/default/zotero/tag-selector-menu@2x.png delete mode 100644 chrome/skin/default/zotero/tag-selector.png create mode 100644 chrome/skin/default/zotero/tag@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-advanced-search@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-collection-add@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-collection-delete@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-collection-edit@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-fullscreen-top@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-go-arrow@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-item-add@2x.png delete mode 100644 chrome/skin/default/zotero/toolbar-item-from-page.png create mode 100644 chrome/skin/default/zotero/toolbar-link-add@2x.png create mode 100644 chrome/skin/default/zotero/toolbar-note-add@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-artwork@2x.png delete mode 100755 chrome/skin/default/zotero/treeitem-attachment-file.png create mode 100644 chrome/skin/default/zotero/treeitem-attachment-link@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-attachment-web-link@2x.png mode change 100644 => 100755 chrome/skin/default/zotero/treeitem-audioRecording.png create mode 100755 chrome/skin/default/zotero/treeitem-audioRecording@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-bill@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-book@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-bookSection@2x.png mode change 100644 => 100755 chrome/skin/default/zotero/treeitem-case.png create mode 100644 chrome/skin/default/zotero/treeitem-computerProgram@2x.png delete mode 100644 chrome/skin/default/zotero/treeitem-document.png create mode 100644 chrome/skin/default/zotero/treeitem-film@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-instantMessage@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-interview@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-journalArticle@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-letter@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-magazineArticle@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-newspaperArticle@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-note@2x.png create mode 100644 chrome/skin/default/zotero/treeitem-report@2x.png create mode 100644 chrome/skin/default/zotero/treeitem@2x.png create mode 100644 chrome/skin/default/zotero/treesource-collection@2x.png create mode 100644 chrome/skin/default/zotero/treesource-duplicates@2x.png create mode 100644 chrome/skin/default/zotero/treesource-library@2x.png create mode 100644 chrome/skin/default/zotero/treesource-search@2x.png create mode 100644 chrome/skin/default/zotero/treesource-trash-full@2x.png create mode 100644 chrome/skin/default/zotero/treesource-trash@2x.png create mode 100644 chrome/skin/default/zotero/treesource-unfiled@2x.png diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index ee9a7839d..fc2911e58 100644 --- 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 index 5518adfb4..25561b683 100644 --- 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 deleted file mode 100644 index 784e8fa48234f4f64b6922a6758f254ee0ca08ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 .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 deleted file mode 100644 index 784e8fa48234f4f64b6922a6758f254ee0ca08ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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