Skip to content

Commit 2140015

Browse files
committed
Clean up logos and icons
There were many duplicates. There were some unused. And there were some of various sizes. The naming was also inconsistent and overcomplicated. Now, all rectangular logos live in media/logos, and all square icons live in media/icons, for reuse across the site as needed.
1 parent 524ead0 commit 2140015

File tree

246 files changed

+496
-2088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+496
-2088
lines changed

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ defaults:
2929
path: "_pages/plugins"
3030
type: pages
3131
values:
32-
icon: /media/icons/default.png
32+
icon: /media/icons/plugin.png
3333
-
3434
scope:
3535
path: "_pages/formats"

‎_includes/ambox‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tr>
1111
<td>
1212
<p>
13-
<div class="image-table"><img src="/media/icons/40px-Information-sign.png" style="vertical-align:middle;"></div>
13+
<div class="image-table"><img src="/media/icons/info.png" style="vertical-align:middle;"></div>
1414
</p>
1515
</td>
1616
<td>

‎_includes/avoidprogramfiles‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<table class="metadata plainlinks ambox ambox-content">
22
<tbody><tr>
33
<td class="image-table">
4-
<p><div class="image-table"><a href="./File:Important-sign.png" class="image"><img alt="Important-sign.png" src="/media/icons/40px-Warning-sign.png" width="40" height="40"></a></div>
4+
<p><div class="image-table"><img alt="Warning" src="/media/icons/warning.png" width="40" height="40"></div>
55
</p>
66
</td>
77
<td> <div style="font-size: large; color: red; padding-bottom: 10px">Caution: "<code>Program Files</code>" not recommended!</div>If you are installing ImageJ on Windows, we strongly recommend that you store your ImageJ.app directory somewhere in your user space (e.g., <code>C:\Users\[your name]\ImageJ.app</code>) rather than in <code>C:\Program Files</code>` or other system-wide directory. If you move ImageJ.app to such a directory, modern versions of Windows will deny ImageJ write permission to its own directory structure, preventing it from being able to update. See also <a rel="nofollow" class="external text" href="https://github.com/imagej/imagej/issues/72">imagej/imagej#72</a>. </td>

‎_includes/biginfo-box‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<tr>
1111
<td>
1212
<p>
13-
<div class="image-table"><img src="/media/icons/40px-Information-sign.png" style="vertical-align:middle;"></div>
13+
<div class="image-table"><img src="/media/icons/info.png" style="vertical-align:middle;"></div>
1414
</p>
1515
</td>
1616
<td>

‎_includes/downloadfiji‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
</th>
88
</tr>
99
<tr>
10-
<td style="text-align: center; vertical-align: top; width: 128px"> <a href="https://downloads.imagej.net/fiji/latest/fiji-win64.zip" rel="nofollow"><img alt="Windows (64-bit)" src="/media/logos/Win.png" width="129" height="128"></a><br><a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-win64.zip"><b>64-bit</b></a>
10+
<td style="text-align: center; vertical-align: top; width: 128px"> <a href="https://downloads.imagej.net/fiji/latest/fiji-win64.zip" rel="nofollow"><img alt="Windows (64-bit)" src="/media/icons/windows.svg" width="129" height="128"></a><br><a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-win64.zip"><b>64-bit</b></a>
1111
</td>
12-
<td style="text-align: center; vertical-align: top; width: 128px"> <a href="https://downloads.imagej.net/fiji/latest/fiji-macosx.zip" rel="nofollow"><img alt="macOS" src="/media/logos/Osx.png" width="105" height="128"></a><br><a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-macosx.zip"><b>macOS</b></a>
12+
<td style="text-align: center; vertical-align: top; width: 128px"> <a href="https://downloads.imagej.net/fiji/latest/fiji-macosx.zip" rel="nofollow"><img alt="macOS" src="/media/icons/apple.png" width="105" height="128"></a><br><a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-macosx.zip"><b>macOS</b></a>
1313
</td>
14-
<td style="text-align: center; vertical-align: top; width: 128px"> <a href="https://downloads.imagej.net/fiji/latest/fiji-linux64.zip" rel="nofollow"><img alt="Linux (64-bit)" src="/media/logos/Tux.svg" width="128" height="128"></a><br><a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-linux64.zip"><b>64-bit</b></a>
14+
<td style="text-align: center; vertical-align: top; width: 128px"> <a href="https://downloads.imagej.net/fiji/latest/fiji-linux64.zip" rel="nofollow"><img alt="Linux (64-bit)" src="/media/icons/linux.svg" width="128" height="128"></a><br><a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-linux64.zip"><b>64-bit</b></a>
1515
</td>
1616
</tr>
1717
<tr>
1818
<th colspan="3"> Other downloads
1919
</th>
2020
</tr>
2121
<tr>
22-
<td style="text-align: center"> <a href="https://downloads.imagej.net/fiji/latest/fiji-win32.zip" rel="nofollow"><img alt="Windows (32-bit)" src="/media/logos/Win.png" width="24" height="24"></a> <a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-win32.zip">32-bit</a>
22+
<td style="text-align: center"> <a href="https://downloads.imagej.net/fiji/latest/fiji-win32.zip" rel="nofollow"><img alt="Windows (32-bit)" src="/media/icons/windows.svg" width="24" height="24"></a> <a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-win32.zip">32-bit</a>
2323
</td>
24-
<td style="text-align: center"> <a href="https://downloads.imagej.net/fiji/latest/fiji-nojre.zip" rel="nofollow"><img alt="All platforms (no JRE)" src="/media/logos/Fiji-icon.png" width="24" height="24"></a> <a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-nojre.zip">No JRE</a>
24+
<td style="text-align: center"> <a href="https://downloads.imagej.net/fiji/latest/fiji-nojre.zip" rel="nofollow"><img alt="All platforms (no JRE)" src="/media/icons/fiji.png" width="24" height="24"></a> <a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-nojre.zip">No JRE</a>
2525
</td>
26-
<td style="text-align: center"> <a href="https://downloads.imagej.net/fiji/latest/fiji-linux32.zip" rel="nofollow"><img alt="Linux (32-bit)" src="/media/logos/Tux.svg" width="24" height="24"></a> <a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-linux32.zip">32-bit</a>
26+
<td style="text-align: center"> <a href="https://downloads.imagej.net/fiji/latest/fiji-linux32.zip" rel="nofollow"><img alt="Linux (32-bit)" src="/media/icons/linux.svg" width="24" height="24"></a> <a rel="nofollow" class="external text" href="https://downloads.imagej.net/fiji/latest/fiji-linux32.zip">32-bit</a>
2727
</td></tr></tbody>
2828
</table>
2929
</div>

‎_includes/fiji‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<div class="info-side-box">
88
<div class="floatleft">
9-
<img alt="Fiji-icon.png" src="/media/logos/Fiji-icon.png" width="64" height="64" style="float:left;">
9+
<img alt="Fiji" src="/media/icons/fiji.png" width="64" height="64" style="float:left;">
1010
</div>
1111
{{info_content}}
1212
</div>

‎_includes/icon‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{%- assign name = include.name | strip -%}
2+
3+
{%- if include.link -%}
4+
{%- assign image_link = include.link -%}
5+
{%- else -%}
6+
{%- capture image_link -%}
7+
{%- case name -%}
8+
{%- when "Alida" -%} /software/alida
9+
{%- when "Android" -%} /platforms/android
10+
{%- when "Bio-Formats" -%} /formats/bio-formats
11+
{%- when "Bio7" -%} /software/bio7
12+
{%- when "BoneJ" -%} /plugins/bonej
13+
{%- when "CellProfiler" -%} /software/cellprofiler
14+
{%- when "ClearVolume" -%} /plugins/clearvolume
15+
{%- when "Eclipse" -%} /develop/eclipse
16+
{%- when "Fiji" -%} /software/fiji
17+
{%- when "Git" -%} /develop/git
18+
{%- when "GitHub" -%} /develop/github
19+
{%- when "Icy" -%} /software/icy
20+
{%- when "ImageJ" -%} /about
21+
{%- when "ImageJ1" -%} /software/imagej1
22+
{%- when "ImageJ2" -%} /software/imagej2
23+
{%- when "ImgLib2" -%} /libs/imglib2
24+
{%- when "KNIME" -%} /software/knime
25+
{%- when "Linux" -%} /platforms/linux
26+
{%- when "LOCI" -%} /orgs/loci
27+
{%- when "MacOS" -%} /platforms/macos
28+
{%- when "Maven" -%} /develop/maven
29+
{%- when "Micro-Manager" -%} /software/micro-manager
30+
{%- when "MiToBo" -%} /software/mitobo
31+
{%- when "OME" -%} /software/omero
32+
{%- when "OMERO" -%} /software/omero
33+
{%- when "Orbit" -%} /software/orbit
34+
{%- when "Pi" -%} /platforms/pi
35+
{%- when "Plugin" -%} /plugins
36+
{%- when "QuPath" -%} /software/qupath
37+
{%- when "SCIFIO" -%} /libs/scifio
38+
{%- when "SciJava" -%} /libs/scijava
39+
{%- when "SLIM Curve" -%} /plugins/slim-curve
40+
{%- when "StarDist" -%} /plugins/stardist
41+
{%- when "VCell" -%} /software/virtual-cell
42+
{%- when "Windows" -%} /platforms/windows
43+
{%- endcase -%}
44+
{%- endcapture -%}
45+
{%- endif -%}
46+
47+
{%- if include.align -%}
48+
{%- assign image_align = 'style="float:' | append: include.align | append: ';"' -%}
49+
{%- else -%}
50+
{%- assign image_align = "" -%}
51+
{%- endif -%}
52+
53+
{%- capture extension -%}
54+
{%- case name -%}
55+
{%- when "Alida" -%} .jpg
56+
{%- when "Android" -%} .svg
57+
{%- when "Linux" -%} .svg
58+
{%- when "Micro-Manager" -%} .jpg
59+
{%- when "Pi" -%} .svg
60+
{%- when "StarDist" -%} .jpg
61+
{%- when "Windows" -%} .svg
62+
{%- else -%} .png
63+
{%- endcase -%}
64+
{%- endcapture -%}
65+
66+
{%- assign filename = name | slugify -%}
67+
{%- if filename == "imagej2" -%}
68+
{%- assign image_url = "/media/icons/imagej.png" -%}
69+
{%- else -%}
70+
{%- assign image_url = "/media/icons/" | append: filename | append: extension -%}
71+
{%- endif -%}
72+
73+
{%- assign image_size = include["size"] | default: "48px" -%}
74+
{%- assign first = image_size | slice: 0 -%}
75+
{%- if first == "x" -%}
76+
{%- assign size = image_size | slice: 1, image_size.size -%}
77+
{%- assign image_size = 'height="' | append: size | append: '"' -%}
78+
{%- else -%}
79+
{%- assign image_size = 'width="' | append: image_size | append: '"' -%}
80+
{%- endif -%}
81+
82+
<a href="{{image_link}}"><img {{image_align}} alt="{{name}}" src="{{image_url}}" {{image_size}}/></a>
83+
84+
{%- comment -%}
85+
# vi:syntax=liquid
86+
{%- endcomment -%}

‎_includes/ides‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
<a href="Eclipse" title="Eclipse"><img alt="Eclipse-luna.png" src="/media/logos/Eclipse-luna-icon.png" width="84" height="109"></a>
3-
<a href="NetBeans" title="NetBeans"><img alt="Netbeans.png" src="/media/Netbeans.png" width="100" height="101"></a>
4-
<a href="IntelliJ_IDEA" title="IntelliJ IDEA"><img alt="Intellij-idea.png" src="/media/Intellij-idea.png" width="73" height="90"></a>
5-
<a href="Command_Line" title="Command Line"><img alt="Command-line.png" src="/media/Command-line.png" width="97" height="88"></a>
2+
<a href="Eclipse" title="Eclipse"><img alt="Eclipse" src="/media/icons/eclipse.png" width="84" height="109"></a>
3+
<a href="NetBeans" title="NetBeans"><img alt="NetBeans" src="/media/icons/netbeans.png" width="100" height="101"></a>
4+
<a href="IntelliJ_IDEA" title="IntelliJ IDEA"><img alt="IntelliJ IDEA" src="/media/icons/intellij-idea.png" width="73" height="90"></a>
5+
<a href="Command_Line" title="Command Line"><img alt="Command-line.png" src="/media/icons/command-line.png" width="97" height="88"></a>
66

77
{%- comment -%}
88
# vi:syntax=liquid

‎_includes/imagej1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<tbody>
1010
<tr>
1111
<td>
12-
<img alt="Imagej1-icon.png" src="/media/logos/Imagej1-icon.png" width="64" height="64">
12+
<img alt="ImageJ 1.x" src="/media/icons/imagej1.png" width="64" height="64">
1313
</td>
1414
<td>
1515
{{info_content}}

‎_includes/info-box‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
{% if include.logo %}
4646
<p markdown="1">{{include.logo}}</p>
4747
{% else %}
48-
<p><img src="/media/icons/40px-Information-sign.png"></p>
48+
<p><img src="/media/icons/info.png"></p>
4949
{% endif %}
5050
{% endcapture %}
5151

0 commit comments

Comments
 (0)