Merge pull request #776 from os-autoinst/replaced_logo

Replace the broken PNGed SVG with the real one
os-autoinst · Jul 6, 2016 · df5f866 · df5f866
2 parents aa0ef10 + ac4fcf0
commit df5f866
Show file tree

Hide file tree

Showing 6 changed files with 532 additions and 44 deletions.
diff --git 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
diff --git a/public/images/logo-16.png b/public/images/logo-16.png
diff --git a/public/images/logo.png b/public/images/logo.png
diff --git a/public/images/logo.svg b/public/images/logo.svg
diff --git a/templates/layouts/bootstrap.html.ep b/templates/layouts/bootstrap.html.ep
@@ -34,8 +34,9 @@
       % end
 
       <link rel="icon"
-            type="image/png" sizes="24x24"
-            href="/images/logo.png" />
+            type="image/png" sizes="16x16"
+            href="/images/logo-16.png" />
+      <link rel="icon" href="/images/logo.svg" sizes="any" type="image/svg+xml">
 
   </head>
   <body>