diff --git a/Makefile b/Makefile index d65598055bc..e1dc40847f0 100644 --- a/Makefile +++ b/Makefile @@ -99,3 +99,9 @@ coverage-html: cover_db/coverage.html .PHONY: coverage-check coverage-check: cover_db/coverage.html ./script/check_coverage ${COVERAGE_THRESHOLD} + +public/favicon.ico: public/images/logo.svg + for w in 16 32 64 128; do \ + inkscape -e public/images/logo-$$w.png -w $$w public/images/logo.svg ; \ + done + convert public/images/logo-16.png public/images/logo-32.png public/images/logo-64.png public/images/logo-128.png -background white -alpha remove public/favicon.ico diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 00000000000..938030f2cab Binary files /dev/null and b/public/favicon.ico differ diff --git a/public/images/logo-16.png b/public/images/logo-16.png new file mode 100644 index 00000000000..762d6008c75 Binary files /dev/null and b/public/images/logo-16.png differ diff --git a/public/images/logo.png b/public/images/logo.png deleted file mode 100644 index 0b6d705d46b..00000000000 Binary files a/public/images/logo.png and /dev/null differ diff --git a/public/images/logo.svg b/public/images/logo.svg index 9c54dae03fe..bfd0165a3be 100644 --- a/public/images/logo.svg +++ b/public/images/logo.svg @@ -7,19 +7,18 @@ 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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="64" - height="64" - viewBox="0 0 64.000001 64.000001" + width="24" + height="24" + viewBox="0 0 24 24" id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="logo.svg" - inkscape:export-filename="/home/duffy/Documents/Favors/openqa logo/1/openqa_64.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + sodipodi:docname="ticket #437_concept1_connected.svg" + inkscape:export-filename="ticket #437_concept1_final_64x64.png" + inkscape:export-xdpi="240" + inkscape:export-ydpi="240"> + inkscape:window-y="27" + inkscape:window-maximized="0"> @@ -78,40 +77,522 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-988.36216)"> + transform="translate(0,-1028.3622)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Q + Q + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + diff --git a/templates/layouts/bootstrap.html.ep b/templates/layouts/bootstrap.html.ep index 123a5383fa8..87eaca81839 100644 --- a/templates/layouts/bootstrap.html.ep +++ b/templates/layouts/bootstrap.html.ep @@ -34,8 +34,9 @@ % end + type="image/png" sizes="16x16" + href="/images/logo-16.png" /> +