summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/images/icons/Makefile10
-rw-r--r--app/images/icons/novnc-120.png (renamed from app/images/icons/novnc-120x120.png)bin4028 -> 4028 bytes
-rw-r--r--app/images/icons/novnc-144.png (renamed from app/images/icons/novnc-144x144.png)bin4582 -> 4582 bytes
-rw-r--r--app/images/icons/novnc-152.png (renamed from app/images/icons/novnc-152x152.png)bin5216 -> 5216 bytes
-rw-r--r--app/images/icons/novnc-16.png (renamed from app/images/icons/novnc-16x16.png)bin675 -> 675 bytes
-rw-r--r--app/images/icons/novnc-167.png (renamed from app/images/icons/novnc-167x167.png)bin5449 -> 5449 bytes
-rw-r--r--app/images/icons/novnc-180.png (renamed from app/images/icons/novnc-180x180.png)bin5825 -> 5825 bytes
-rw-r--r--app/images/icons/novnc-192.png (renamed from app/images/icons/novnc-192x192.png)bin5787 -> 5787 bytes
-rw-r--r--app/images/icons/novnc-24.png (renamed from app/images/icons/novnc-24x24.png)bin1000 -> 1000 bytes
-rw-r--r--app/images/icons/novnc-32.png (renamed from app/images/icons/novnc-32x32.png)bin1064 -> 1064 bytes
-rw-r--r--app/images/icons/novnc-40.png (renamed from app/images/icons/novnc-40x40.png)bin1478 -> 1478 bytes
-rw-r--r--app/images/icons/novnc-48.png (renamed from app/images/icons/novnc-48x48.png)bin1397 -> 1397 bytes
-rw-r--r--app/images/icons/novnc-58.png (renamed from app/images/icons/novnc-58x58.png)bin1898 -> 1898 bytes
-rw-r--r--app/images/icons/novnc-60.png (renamed from app/images/icons/novnc-60x60.png)bin1932 -> 1932 bytes
-rw-r--r--app/images/icons/novnc-64.png (renamed from app/images/icons/novnc-64x64.png)bin1946 -> 1946 bytes
-rw-r--r--app/images/icons/novnc-72.png (renamed from app/images/icons/novnc-72x72.png)bin2699 -> 2699 bytes
-rw-r--r--app/images/icons/novnc-80.png (renamed from app/images/icons/novnc-80x80.png)bin3018 -> 3018 bytes
-rw-r--r--app/images/icons/novnc-87.png (renamed from app/images/icons/novnc-87x87.png)bin3157 -> 3157 bytes
-rw-r--r--app/images/icons/novnc-96.png (renamed from app/images/icons/novnc-96x96.png)bin2351 -> 2351 bytes
-rw-r--r--vnc.html40
20 files changed, 25 insertions, 25 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/vnc.html b/vnc.html
index eae8220..4665143 100644
--- a/vnc.html
+++ b/vnc.html
@@ -18,20 +18,20 @@
<meta charset="utf-8">
<!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
- <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
- <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
- <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
- <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
- <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
- <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
- <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
- <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
- <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
+ <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
+ <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24.png">
+ <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32.png">
+ <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48.png">
+ <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64.png">
+ <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72.png">
+ <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96.png">
+ <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144.png">
+ <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192.png">
<!-- Firefox currently mishandles SVG, see #1419039
<link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
-->
<!-- Repeated last so that legacy handling will pick this -->
- <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
+ <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
<!-- Apple iOS Safari settings -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -39,17 +39,17 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<!-- @2x -->
- <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40x40.png">
- <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58x58.png">
- <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80x80.png">
- <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
- <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
- <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167x167.png">
+ <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40.png">
+ <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58.png">
+ <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80.png">
+ <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+ <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152.png">
+ <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167.png">
<!-- @3x -->
- <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
- <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87x87.png">
- <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
- <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180x180.png">
+ <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60.png">
+ <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87.png">
+ <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+ <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180.png">
<!-- Stylesheets -->
<link rel="stylesheet" href="app/styles/base.css">
View Lorry Controller Status