From 580e637f8a263596d65ff8dfc728f7b28570e46a Mon Sep 17 00:00:00 2001
From: Midgard <midgard@zeus.ugent.be>
Date: Thu, 18 Jun 2020 15:37:52 +0200
Subject: [PATCH] Update favicons

---
 htdocs/img/delijn-pixelperfect.svg |  20 -----
 htdocs/img/favicon-32.ico          | Bin 766 -> 0 bytes
 htdocs/img/favicon-32.png          | Bin 412 -> 532 bytes
 htdocs/img/favicon-32.svg          |  21 ++++++
 htdocs/img/favicon.ico             | Bin 766 -> 0 bytes
 htdocs/img/favicon.png             | Bin 308 -> 289 bytes
 htdocs/img/favicon.svg             | 115 +++++++++++++++++++++++++++++
 htdocs/img/makefile                |  12 +++
 htdocs/index.php                   |   7 +-
 9 files changed, 151 insertions(+), 24 deletions(-)
 delete mode 100644 htdocs/img/delijn-pixelperfect.svg
 delete mode 100644 htdocs/img/favicon-32.ico
 create mode 100644 htdocs/img/favicon-32.svg
 delete mode 100644 htdocs/img/favicon.ico
 create mode 100644 htdocs/img/favicon.svg
 create mode 100644 htdocs/img/makefile

diff --git a/htdocs/img/delijn-pixelperfect.svg b/htdocs/img/delijn-pixelperfect.svg
deleted file mode 100644
index b3ef975..0000000
--- a/htdocs/img/delijn-pixelperfect.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<path d="m6 0-0.25 2h10.23l0.019531 9v-11h-10zm10 11h-11.371l-0.62305 5h11.994v-5z" fill="#ffd800"/>
-	<path d="m0 5h16l0 6h-16z" fill="#fff"/>
-	<path d="m5.75 2h10.231l0.019191 9h-11.371z" fill="#fff"/>
-	<g fill="#576065" aria-label="De Lijn">
-		<path d="m3.5 4c0-0.75-0.25-1-0.5-1h-1v2h1c0.25 0 0.5-0.25 0.5-1zm-1 0.5v-1c0.25 0 0.5 0 0.5 0.5s-0.25 0.5-0.5 0.5z"/>
-		<path d="m4.25 4h0.5v-0.25h-0.5v-0.25h0.75v-0.5h-1.25v2h1.25v-0.5h-0.75z"/>
-		<path d="m2 9v-3h-2v4h3v-1z"/>
-		<path d="m5 6h-2v2h2z"/>
-		<path d="m5.5 9h-0.5v1h2c0.5 0 1 0 1-1v-3h-2v2.5c0 0.5-0.25 0.5-0.5 0.5z"/>
-		<path d="m11 6h-2v4h2v-2l2 2h2v-4h-2v2z"/>
-	</g>
-	<g fill="#004494">
-		<path d="m9 5v-2h-3v2z"/>
-		<path d="m10 3h2v2h-2z"/>
-		<path d="m13 3h1v2h-1z"/>
-		<path d="m15 3h1v2h-1z"/>
-	</g>
-</svg>
diff --git a/htdocs/img/favicon-32.ico b/htdocs/img/favicon-32.ico
deleted file mode 100644
index 99441b6db290d3159da56774b2fac0de6934c6f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmZQzU<5)11py$*!tjELfkBLcfk6X^6@b_Qh(Y4Gz!Vn-hSY>`hQgc_hT^<5hLVDG
zhVJ%8hUH7=Gi+MFnql*XH4F?l{xjUTewE?wom&k5|NloZYUUsZX9xg6LBTU;1O+XC
z_{?!2hVq3#{6a7vXuxSO11JrW2N?)v0Hwiv7%3<YV?pEvYf$;(5Mel317Z;dg6V>1
gfI$w#XF%|bw0jL2KMIA9t{%S)ltv#)Vi*7p0B*7>SO5S3

diff --git a/htdocs/img/favicon-32.png b/htdocs/img/favicon-32.png
index bff3cae49cceda0b8690746c5ce09e428f46f18d..546ca4bc59eb686bc657ea4eb1334fe5943069db 100644
GIT binary patch
delta 482
zcmV<80UiFF1C#`i87u<;002a!ipBr{00VPENmK|32;1RL-~a#s32;bRa{vGi!~g&e
z!~vBn4jYk1Cw~B|P)t-s07R5mU}acgW?ExtTx4lsX>Mh0a%FCEXOO>fczt<*gn@^P
zfryNTjgW_qk&cv@l$o8DoS&Am)10BCouZ|kqo%U9xVgN(xxK&1%+1o&)z#P7)!5nF
z-QMHm<>%??@9^>Q@$&KV^7#4r`}_O<*Z}|70{_|y|9{*U|K2D6;5Yx{NB`wl|LAA`
z>UaO_hX3!D|M8~(^tS)@#{c=&|NG|u{q+C;{Qv*|IGV)C0002nNkl<ZILnRF=MI8E
z3;^KPfeSY%ZbeaXZ~OjF=26Z>K&<`IUdxxzzyW>6-Ae>Sz(oQ_3G5``3*fO#0WM<G
zLW8~qgMWePRL#bOTEIc?L_rRKgSno878TRLuK=nb;xLh$q#GbZRX33{Bi+DEl>)^x
zVtL99!9Z1$;yHK;Hw0Z(ZHni5o{_D9rK%GyJg@PYCmjar0aW-jq;PA*ak%}Wq{m?J
z*i|4nW!t2;@9Xg&AL`d-i2iP00N*Y{1YA7<oGT=-m%v5<&y@gfo&e4gI7nbCfprRa
Y0VAK01V6zM+W-In07*qoM6N<$f+<?}djJ3c

delta 361
zcmbQjGKYDBq%Io+14D6D)fXVeQtadz!T|&|94Q?@K4*bPWHAGS^m-6xjFXxuGtpJO
zo>9`%#W5tJHTh3{^F#Z?3{1-!x71u=<N<=7|NsBX-^^@aja5)G>}>>sgNLtnHnw-q
zPCR?;EJy{9_OtUz2_R51x9jSH|GPJDJhixc@#l?g4#mE#hdVE)OG*I2mMd2!UY+Xh
z{3f`vAweV~bA>SwU%t+`Rads2M{L<Kuu<7&d2R08x(71!5_tSQTsavdvfTO0f{r@>
zsg-nMs(Dxw^D9G)38*S9VsoOgW2s3mQ<6+$puojLf+>~^V(w3x1nT2=JpCc#7$kCM
zUv+;4JIfEFmLI=`LfSX$Iq);)v<m9;^E<j57(C!-+;o}2US7U=_GCk5$I=!V!ziIm
t26s|q0@!&fIC`uSt}rg<lPG0ixbih-Q%0YWATab8JYD@<);T3K0RSFqg=GK$

diff --git a/htdocs/img/favicon-32.svg b/htdocs/img/favicon-32.svg
new file mode 100644
index 0000000..e4c86f2
--- /dev/null
+++ b/htdocs/img/favicon-32.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m0 0v32h32v-32z" fill="#ffd800"/>
+	<path d="m0 6h32v13h-32z" fill="#fff"/>
+	<g fill="#004494">
+		<path d="m19 9v-2h-7v2h7"/>
+		<path d="m20 7h4v2h-4v-2"/>
+		<path d="m29 7h1v2h-1v-2"/>
+		<path d="m31 7h1v2h-1v-2"/>
+		<path d="m25 7h3v2h-3v-2"/>
+	</g>
+	<path d="m14 0-6 32h-8v-32z" fill="#fff"/>
+	<g transform="matrix(2 0 -.33333 2 2.1667 -1)" fill="#576065" aria-label="De Lijn">
+		<path d="m3.5 4.25c0-0.5625-0.25111-0.75-0.5-0.75h-1v1.5h1c0.25 0 0.5-0.1875 0.5-0.75zm-1 0.25v-0.5c0.25 0 0.5 0 0.5 0.25s-0.25 0.25-0.5 0.25z"/>
+		<path d="m4.25 4.3305h0.5v-0.25h-0.5v-0.080508h0.75v-0.5h-1.25v1.5h1.25v-0.5h-0.75z"/>
+		<path d="m2.5 8.5v-3h-2v4h3v-1z"/>
+		<path d="m5.5 5.5h-2v2.5h2z"/>
+		<path d="m6 8.5h-0.5v1h2c0.5 0 1 0 1-1v-3h-2v2.5c0 0.5-0.25 0.5-0.5 0.5z"/>
+		<path d="m11.5 5.5h-2v4h2v-2l1.5 2h2v-4h-2v2z"/>
+	</g>
+</svg>
diff --git a/htdocs/img/favicon.ico b/htdocs/img/favicon.ico
deleted file mode 100644
index 99441b6db290d3159da56774b2fac0de6934c6f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmZQzU<5)11py$*!tjELfkBLcfk6X^6@b_Qh(Y4Gz!Vn-hSY>`hQgc_hT^<5hLVDG
zhVJ%8hUH7=Gi+MFnql*XH4F?l{xjUTewE?wom&k5|NloZYUUsZX9xg6LBTU;1O+XC
z_{?!2hVq3#{6a7vXuxSO11JrW2N?)v0Hwiv7%3<YV?pEvYf$;(5Mel317Z;dg6V>1
gfI$w#XF%|bw0jL2KMIA9t{%S)ltv#)Vi*7p0B*7>SO5S3

diff --git a/htdocs/img/favicon.png b/htdocs/img/favicon.png
index c2672603f7d1d6496ad57e87e93a0ec3061fdbbb..10a7de5284e166e354547ca1437194ef76e724ec 100644
GIT binary patch
delta 236
zcmV<I02BYT0-*ws87u<;001a04^sdD00VPENmK|32;1RL-~a#s32;bRa{vGi!~g&e
z!~vBn4jYk1D1SUqOjJbxM3h%xWpjFdcz=U|hl`e*o~5d-r>m{2ud=bVxAyk;|JVTk
z+Y$fXC;#6u|Kmsh<Wc|WasTd+|NsBHTWKNy0037>L_t&-({0X+3V<*O1yJq1tXAFs
z|JQVDv`H6HI4DR+iBdutb`M_^`gs5m!OEJ#*n&G@Mm4F)Mh(2Y0IUfDXHa48Y$+K0
m`~ln|?WdQA)5GCmtKb2MVGKI($A$#}0000<MNUMnLSTYKPi7|o

delta 255
zcmZ3;w1sJcq%Io+1B3kM|A|0~rP#?cgaZg_I8r)*e9i)o$YKTt-s>RD=%g{bVxp@?
z{YFn0#}JF&<UjSz5AB&*8#;x~@&G~4|NsA&pJ3H7aC3F$Zr;}?cKEIJcZpY8UJ??q
z%MXeEy+4=t`QaM|Qir)0DIHST*^s1f(5AlRUwT49LWE(xn6pcg6ti7f$9{chj|TlN
z8E&)S!bVeR^W=_&5*w2K>97Go+xz?V3GSu}NA8Os7N}4-H0S7n0|zF|n0g#Y9aykv
xNk^7LgT6D+h%O1yO9y@3yuJj_o6_FM$k35v7c@_eXFJeO44$rjF6*2UngB(pVP60M

diff --git a/htdocs/img/favicon.svg b/htdocs/img/favicon.svg
new file mode 100644
index 0000000..8fea8af
--- /dev/null
+++ b/htdocs/img/favicon.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg34"
+   sodipodi:docname="favicon.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata40">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview36"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="0.52203606"
+     inkscape:cy="8.0385631"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg34"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid42" />
+  </sodipodi:namedview>
+  <rect
+     width="16"
+     height="16"
+     fill="#fff"
+     id="rect2" />
+  <path
+     d="m 6.3389831,0 -0.25,2 H 15.98 l 0.01953,9 V 0 H 6.3385141 Z M 16,11 H 4.629 l -0.62305,5 h 11.994 v -5 z"
+     id="path4"
+     style="fill:#ffd800;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccc" />
+  <path
+     d="m0 5h16l0 6h-16z"
+     fill="#fff"
+     id="path6" />
+  <path
+     d="m 0,2 h 15.981 l 0.01919,9 H 0 Z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff"
+     sodipodi:nodetypes="ccccc" />
+  <g
+     fill="#576065"
+     aria-label="De Lijn"
+     id="g22">
+    <path
+       d="m3.5 4c0-0.75-0.25-1-0.5-1h-1v2h1c0.25 0 0.5-0.25 0.5-1zm-1 0.5v-1c0.25 0 0.5 0 0.5 0.5s-0.25 0.5-0.5 0.5z"
+       id="path10" />
+    <path
+       d="m4.25 4h0.5v-0.25h-0.5v-0.25h0.75v-0.5h-1.25v2h1.25v-0.5h-0.75z"
+       id="path12" />
+    <path
+       d="m2 9v-3h-2v4h3v-1z"
+       id="path14" />
+    <path
+       d="m5 6h-2v2h2z"
+       id="path16" />
+    <path
+       d="m5.5 9h-0.5v1h2c0.5 0 1 0 1-1v-3h-2v2.5c0 0.5-0.25 0.5-0.5 0.5z"
+       id="path18" />
+    <path
+       d="m11 6h-2v4h2v-2l2 2h2v-4h-2v2z"
+       id="path20" />
+  </g>
+  <g
+     fill="#004494"
+     id="g32">
+    <path
+       d="m9 5v-2h-3v2z"
+       id="path24" />
+    <path
+       d="m10 3h2v2h-2z"
+       id="path26" />
+    <path
+       d="m13 3h1v2h-1z"
+       id="path28" />
+    <path
+       d="m15 3h1v2h-1z"
+       id="path30" />
+  </g>
+</svg>
diff --git a/htdocs/img/makefile b/htdocs/img/makefile
new file mode 100644
index 0000000..99d286b
--- /dev/null
+++ b/htdocs/img/makefile
@@ -0,0 +1,12 @@
+TARGETS = favicon.png favicon-32.png
+
+.PHONEY: clean all
+
+all: $(TARGETS)
+
+%.png: %.svg
+	inkscape -e $@ $<
+	optipng $@
+
+clean: $(TARGETS)
+	rm $^
diff --git a/htdocs/index.php b/htdocs/index.php
index f934d34..7077623 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -40,15 +40,14 @@
 	}
 	
 	
-?>
-
-<!DOCTYPE html>
+?><!DOCTYPE html>
 <html>
 <head>
 	<meta charset="utf-8" />
 	<meta name="viewport" content="width=240, initial-scale=1" />
 	<meta name="format-detection" content="telephone=no" />
-	<link rel="shortcut icon" href="img/favicon.ico" />
+	<link rel="shortcut icon" href="img/favicon.png" sizes="16x16" />
+	<link rel="shortcut icon" href="img/favicon-32.png" sizes="32x32" />
 	<title><?php $title = $ui->title(); if ($title) echo $title . ' – '; ?>De Lijn Reisinformatie lite</title>
 	<style>
 		@import url('css/main.css');