summaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-02-06 22:41:04 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-02-06 22:56:13 +0000
commit52bcc40297e06e51c5cc74d5ddd66c750aefef51 (patch)
tree12c37ebdd18ed23f83861027937ab6912b5575f4 /resources
parent60f5498071e1cc25e9e1c74371c76c95b718a68f (diff)
downloadwebtrees-52bcc40297e06e51c5cc74d5ddd66c750aefef51.tar.gz
webtrees-52bcc40297e06e51c5cc74d5ddd66c750aefef51.tar.bz2
webtrees-52bcc40297e06e51c5cc74d5ddd66c750aefef51.zip
Fix: #1780 and #1123 - favicons and browseconfig.xml
Diffstat (limited to 'resources')
-rw-r--r--resources/img/webtrees-icon.pngbin0 -> 26162 bytes
-rw-r--r--resources/img/webtrees-logo.psdbin0 -> 63462 bytes
-rw-r--r--resources/views/layouts/default.phtml21
3 files changed, 18 insertions, 3 deletions
diff --git a/resources/img/webtrees-icon.png b/resources/img/webtrees-icon.png
new file mode 100644
index 0000000000..46bf667f73
--- /dev/null
+++ b/resources/img/webtrees-icon.png
Binary files differ
diff --git a/resources/img/webtrees-logo.psd b/resources/img/webtrees-logo.psd
new file mode 100644
index 0000000000..cb5e26c965
--- /dev/null
+++ b/resources/img/webtrees-logo.psd
Binary files differ
diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml
index 054a13730c..72351e42a0 100644
--- a/resources/views/layouts/default.phtml
+++ b/resources/views/layouts/default.phtml
@@ -28,9 +28,24 @@
<?php endif ?>
</title>
- <link rel="icon" href="themes/_common/css-2.0.0/favicon.png" type="image/png">
- <link rel="icon" type="image/png" href="themes/_common/css-2.0.0/favicon192.png" sizes="192x192">
- <link rel="apple-touch-icon" sizes="180x180" href="themes/_common/css-2.0.0/favicon180.png">
+ <!-- Generic favicons -->
+ <link rel="icon" sizes="32x32" href="<?= e(asset('favicon-32.png')) ?>">
+ <link rel="icon" sizes="57x57" href="<?= e(asset('favicon-57.png')) ?>">
+ <link rel="icon" sizes="76x76" href="<?= e(asset('favicon-76.png')) ?>">
+ <link rel="icon" sizes="96x96" href="<?= e(asset('favicon-96.png')) ?>">
+ <link rel="icon" sizes="128x128" href="<?= e(asset('favicon-128.png')) ?>">
+ <link rel="icon" sizes="192x192" href="<?= e(asset('favicon-192.png')) ?>">
+ <!-- Android -->
+ <link rel="shortcut icon" sizes="196x196" href=“<?= e(asset('favicon-196.png')) ?>">
+ <!-- iOS -->
+ <link rel="apple-touch-icon" sizes="120x120" href="<?= e(asset('favicon-120.png')) ?>">
+ <link rel="apple-touch-icon" sizes="152x152" href="<?= e(asset('favicon-152.png')) ?>">
+ <link rel="apple-touch-icon" sizes="180x180" href="<?= e(asset('favicon-180.png')) ?>">
+ <!-- Windows 8 IE 10 -->
+ <meta name="msapplication-TileColor" content="#FFFFFF">
+ <meta name="msapplication-TileImage" content="<?= e(asset('favicon-144.png')) ?>">
+ <!-- Windows 8.1 + IE11 and above -->
+ <meta name="msapplication-config" content="<?= e(asset('browserconfig.xml')) ?>">
<?php if (I18N::direction() === 'rtl') : ?>
<link rel="stylesheet" type="text/css" href="<?= e(Webtrees::ASSETS_PATH . 'css/vendor-rtl.css') ?>">