aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2018-05-02 15:48:26 +0200
committerGitHub2018-05-02 15:48:26 +0200
commitdb65c0ffc7ccc76a144689ec3db43fbc2e61ee82 (patch)
tree64052e2e9d4cade0400cb5793cf6fc209c3744a8
parentfca877efdd8087959f721c2bb4af2d018e3e910a (diff)
parentae387752e9ae26a296b5d1a016cd3b53bf7f298c (diff)
downloadchouette-core-db65c0ffc7ccc76a144689ec3db43fbc2e61ee82.tar.bz2
Merge pull request #542 from af83/6627-add-chouette-favicon
6627: Add Chouette favicon
-rw-r--r--app/assets/images/favicon.icobin0 -> 1406 bytes
-rw-r--r--app/views/layouts/application.html.slim2
-rw-r--r--public/favicon.icobin0 -> 1406 bytes
3 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
new file mode 100644
index 000000000..ac6bc298d
--- /dev/null
+++ b/app/assets/images/favicon.ico
Binary files differ
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index abf39c089..596627996 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -8,6 +8,8 @@ html lang=I18n.locale
title = t('brandname')
+ = favicon_link_tag
+
= stylesheet_link_tag 'base'
= stylesheet_link_tag 'application'
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 000000000..ac6bc298d
--- /dev/null
+++ b/public/favicon.ico
Binary files differ