Clean up page icon ("favicon") handling

Makes sure we use standardised formats and references, and makes sure we have all the sizes we might need.
fcic · Oct 14, 2016 · 2b4e6ed · 2b4e6ed
1 parent 267d1ed
commit 2b4e6ed
Show file tree

Hide file tree

Showing 23 changed files with 394 additions and 8 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,5 @@
 app
 core
-favicon.ico
 .gitmodules
 node_modules
 .*

diff --git a/app/images/favicon.ico b/app/images/favicon.ico
diff --git a/app/images/favicon.png b/app/images/favicon.png
diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
@@ -0,0 +1,43 @@
+ICONS := \
+	novnc-16x16.png \
+	novnc-24x24.png \
+	novnc-32x32.png \
+	novnc-48x48.png \
+	novnc-64x64.png
+
+ANDROID_LAUNCHER := \
+	novnc-48x48.png \
+	novnc-72x72.png \
+	novnc-96x96.png \
+	novnc-144x144.png \
+	novnc-192x192.png \
+	novnc-512x512.png
+
+IPHONE_LAUNCHER := \
+	novnc-60x60.png \
+	novnc-120x120.png
+
+IPAD_LAUNCHER := \
+	novnc-76x76.png \
+	novnc-152x152.png
+
+ALL_ICONS := $(ICONS) $(ANDROID_LAUNCHER) $(IPHONE_LAUNCHER) $(IPAD_LAUNCHER)
+
+all: $(ALL_ICONS)
+
+novnc-16x16.png: novnc-icon-sm.svg
+	convert -density 90 \
+		-background transparent "$<" "$@"
+novnc-24x24.png: novnc-icon-sm.svg
+	convert -density 135 \
+		-background transparent "$<" "$@"
+novnc-32x32.png: novnc-icon-sm.svg
+	convert -density 180 \
+		-background transparent "$<" "$@"
+
+novnc-%.png: novnc-icon.svg
+	convert -density $$[`echo $* | cut -d x -f 1` * 90 / 48] \
+		-background transparent "$<" "$@"
+
+clean:
+	rm -f *.png
diff --git a/app/images/icons/novnc-120x120.png b/app/images/icons/novnc-120x120.png
diff --git a/app/images/icons/novnc-144x144.png b/app/images/icons/novnc-144x144.png
diff --git a/app/images/icons/novnc-152x152.png b/app/images/icons/novnc-152x152.png
diff --git a/app/images/icons/novnc-16x16.png b/app/images/icons/novnc-16x16.png
diff --git a/app/images/icons/novnc-192x192.png b/app/images/icons/novnc-192x192.png
diff --git a/app/images/icons/novnc-24x24.png b/app/images/icons/novnc-24x24.png
diff --git a/app/images/icons/novnc-32x32.png b/app/images/icons/novnc-32x32.png
diff --git a/app/images/icons/novnc-48x48.png b/app/images/icons/novnc-48x48.png
diff --git a/app/images/icons/novnc-512x512.png b/app/images/icons/novnc-512x512.png
diff --git a/app/images/icons/novnc-60x60.png b/app/images/icons/novnc-60x60.png
diff --git a/app/images/icons/novnc-64x64.png b/app/images/icons/novnc-64x64.png
diff --git a/app/images/icons/novnc-72x72.png b/app/images/icons/novnc-72x72.png
diff --git a/app/images/icons/novnc-76x76.png b/app/images/icons/novnc-76x76.png
diff --git a/app/images/icons/novnc-96x96.png b/app/images/icons/novnc-96x96.png
diff --git a/app/images/icons/novnc-icon-sm.svg b/app/images/icons/novnc-icon-sm.svg