Merge remote-tracking branch 'gracile-fr/3.0icons' into 3.0

This commit is contained in:
Simon Kornblith 2012-05-24 18:42:02 -04:00
commit 2aa9784ccf
24 changed files with 14 additions and 4 deletions

View file

@ -278,7 +278,8 @@
</vbox>
<label class="subhead" value="&zotero.about.additionalSoftware;"/>
<vbox class="subcontent">
<label class="zotero-text-link" href="http://www.famfamfam.com/lab/icons/silk/" value="famfamfam (small icons)"/>
<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://p.yusukekamiyamane.com/" value="Fugue icons (by Yusuke Kamiyamane)"/>
<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)"/>
<label class="zotero-text-link" href="http://tango.freedesktop.org/Tango_Desktop_Project" value="Tango Desktop Project (pref icons)"/>

File diff suppressed because one or more lines are too long

View file

@ -336,7 +336,6 @@ Zotero.ItemTypes = new function() {
}
}
// DEBUG: only have icons for some types so far
switch (itemType) {
case 'attachment-file':
case 'attachment-link':
@ -345,14 +344,21 @@ Zotero.ItemTypes = new function() {
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':
@ -361,9 +367,12 @@ Zotero.ItemTypes = new function() {
case 'map':
case 'newspaperArticle':
case 'note':
case 'patent':
case 'podcast':
case 'presentation':
case 'radioBroadcast':
case 'report':
case 'statute':
case 'thesis':
case 'tvBroadcast':
case 'videoRecording':

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 738 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 748 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 480 B

After

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 611 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 641 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 743 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 773 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 480 B

After

Width:  |  Height:  |  Size: 519 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 748 B

After

Width:  |  Height:  |  Size: 865 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 743 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 711 B

After

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 531 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 675 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 649 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 728 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 734 B

@ -1 +1 @@
Subproject commit c5c6499a665af49b587186ff9c83dbecaafc2e52
Subproject commit c56b22c4f7e56fcb428c7ef2917a44943a6e9a69