Simplify names of favicons

All of the icons are square, only providing the size in one direction is
enough. This change lets us avoid some unnecessary complexity in the
Makefile.

19 files changed, 5 insertions, 5 deletions

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index 5635b53..8ee31c1 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -7,22 +7,22 @@ IOS_3X_SIZES := 60 87 120 180
 ALL_IOS_SIZES := $(IOS_1X_SIZES) $(IOS_2X_SIZES) $(IOS_3X_SIZES)
 
 ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(ALL_IOS_SIZES)
-ALL_ICONS := $(foreach SIZE, $(ALL_SIZES), novnc-$(SIZE)x$(SIZE).png)
+ALL_ICONS := $(ALL_SIZES:%=novnc-%.png)
 
 all: $(ALL_ICONS)
 
-novnc-16x16.png: novnc-icon-sm.svg
+novnc-16.png: novnc-icon-sm.svg
 	convert -density 90 \
 		-background transparent "$<" "$@"
-novnc-24x24.png: novnc-icon-sm.svg
+novnc-24.png: novnc-icon-sm.svg
 	convert -density 135 \
 		-background transparent "$<" "$@"
-novnc-32x32.png: novnc-icon-sm.svg
+novnc-32.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] \
+	convert -density $$[`echo $*` * 90 / 48] \
 		-background transparent "$<" "$@"
 
 clean:
diff --git a/app/images/icons/novnc-120x120.png b/app/images/icons/novnc-120.png
index 40823ef..40823ef 100644
--- a/app/images/icons/novnc-120x120.png
+++ b/app/images/icons/novnc-120.png
diff --git a/app/images/icons/novnc-144x144.png b/app/images/icons/novnc-144.png
index eee71f1..eee71f1 100644
--- a/app/images/icons/novnc-144x144.png
+++ b/app/images/icons/novnc-144.png
diff --git a/app/images/icons/novnc-152x152.png b/app/images/icons/novnc-152.png
index 0694b2d..0694b2d 100644
--- a/app/images/icons/novnc-152x152.png
+++ b/app/images/icons/novnc-152.png
diff --git a/app/images/icons/novnc-16x16.png b/app/images/icons/novnc-16.png
index 42108f4..42108f4 100644
--- a/app/images/icons/novnc-16x16.png
+++ b/app/images/icons/novnc-16.png
diff --git a/app/images/icons/novnc-167x167.png b/app/images/icons/novnc-167.png
index 6b361b6..6b361b6 100644
--- a/app/images/icons/novnc-167x167.png
+++ b/app/images/icons/novnc-167.png
diff --git a/app/images/icons/novnc-180x180.png b/app/images/icons/novnc-180.png
index cf8802b..cf8802b 100644
--- a/app/images/icons/novnc-180x180.png
+++ b/app/images/icons/novnc-180.png
diff --git a/app/images/icons/novnc-192x192.png b/app/images/icons/novnc-192.png
index ef9201f..ef9201f 100644
--- a/app/images/icons/novnc-192x192.png
+++ b/app/images/icons/novnc-192.png
diff --git a/app/images/icons/novnc-24x24.png b/app/images/icons/novnc-24.png
index 1106135..1106135 100644
--- a/app/images/icons/novnc-24x24.png
+++ b/app/images/icons/novnc-24.png
diff --git a/app/images/icons/novnc-32x32.png b/app/images/icons/novnc-32.png
index ff00dc3..ff00dc3 100644
--- a/app/images/icons/novnc-32x32.png
+++ b/app/images/icons/novnc-32.png
diff --git a/app/images/icons/novnc-40x40.png b/app/images/icons/novnc-40.png
index 4e42a1d..4e42a1d 100644
--- a/app/images/icons/novnc-40x40.png
+++ b/app/images/icons/novnc-40.png
diff --git a/app/images/icons/novnc-48x48.png b/app/images/icons/novnc-48.png
index f24cd6c..f24cd6c 100644
--- a/app/images/icons/novnc-48x48.png
+++ b/app/images/icons/novnc-48.png
diff --git a/app/images/icons/novnc-58x58.png b/app/images/icons/novnc-58.png
index ba2564e..ba2564e 100644
--- a/app/images/icons/novnc-58x58.png
+++ b/app/images/icons/novnc-58.png
diff --git a/app/images/icons/novnc-60x60.png b/app/images/icons/novnc-60.png
index 06b0d60..06b0d60 100644
--- a/app/images/icons/novnc-60x60.png
+++ b/app/images/icons/novnc-60.png
diff --git a/app/images/icons/novnc-64x64.png b/app/images/icons/novnc-64.png
index 6d0fb34..6d0fb34 100644
--- a/app/images/icons/novnc-64x64.png
+++ b/app/images/icons/novnc-64.png
diff --git a/app/images/icons/novnc-72x72.png b/app/images/icons/novnc-72.png
index 23163a2..23163a2 100644
--- a/app/images/icons/novnc-72x72.png
+++ b/app/images/icons/novnc-72.png
diff --git a/app/images/icons/novnc-80x80.png b/app/images/icons/novnc-80.png
index 19b1488..19b1488 100644
--- a/app/images/icons/novnc-80x80.png
+++ b/app/images/icons/novnc-80.png
diff --git a/app/images/icons/novnc-87x87.png b/app/images/icons/novnc-87.png
index ed7042c..ed7042c 100644
--- a/app/images/icons/novnc-87x87.png
+++ b/app/images/icons/novnc-87.png
diff --git a/app/images/icons/novnc-96x96.png b/app/images/icons/novnc-96.png
index 1a77c53..1a77c53 100644
--- a/app/images/icons/novnc-96x96.png
+++ b/app/images/icons/novnc-96.png