From 48b4b22ccac5c971b8239da7abe5ca9de03c2bf0 Mon Sep 17 00:00:00 2001 From: Tunghsiao Liu Date: Fri, 6 Jan 2017 22:25:18 +0800 Subject: [PATCH] feat(template): smarter way to handle favicons --- _app/_includes/_amsf.html | 27 ++++++++++++++++++ .../themes/curtana/includes/top.html | 9 +----- _app/favicon.ico | Bin 9662 -> 16958 bytes _app/favicon.png | Bin 0 -> 5318 bytes _app/favicon.svg | 2 +- _app/mask-icon.svg | 1 + 6 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 _app/favicon.png create mode 100644 _app/mask-icon.svg diff --git a/_app/_includes/_amsf.html b/_app/_includes/_amsf.html index 7859632ed..36b98a3a8 100644 --- a/_app/_includes/_amsf.html +++ b/_app/_includes/_amsf.html @@ -61,9 +61,36 @@ Favicons {% endcomment %} {% capture amsf_favicon %}{{ '/favicon.ico' | prepend: site.base }}{% endcapture %} +{% capture amsf_favicon_png %}{{ '/favicon.png' | prepend: site.base }}{% endcapture %} {% capture amsf_favicon_svg %}{{ '/favicon.svg' | prepend: site.base }}{% endcapture %} +{% capture amsf_mask_icon %}{{ '/mask-icon.svg' | prepend: site.base }}{% endcapture %} {% capture amsf_apple_touch_icon %}{{ '/apple-touch-icon.png' | prepend: site.base }}{% endcapture %} +{% capture amsf_favicons %} + {% if site.base != "" %} + + {% endif %} + + {% for static_file in site.static_files %} + {% if static_file.path == '/favicon.png' %} + + {% endif %} + + {% if static_file.path == '/favicon.svg' %} + + {% endif %} + + {% if static_file.path == '/mask-icon.svg' %} + + {% endif %} + + {% if static_file.path == '/apple-touch-icon.png' %} + + {% endif %} + {% endfor %} +{% endcapture %} + + {% comment %} Feed URL {% endcomment %} diff --git a/_app/_includes/themes/curtana/includes/top.html b/_app/_includes/themes/curtana/includes/top.html index ae47241a5..3aebe3ab8 100644 --- a/_app/_includes/themes/curtana/includes/top.html +++ b/_app/_includes/themes/curtana/includes/top.html @@ -15,14 +15,7 @@ -{% if site.base != "" %} - - - -{% endif %} - - - +{{ amsf_favicons }} diff --git a/_app/favicon.ico b/_app/favicon.ico index d2b48b7d083216c7dbfc60e47e119c272edc993f..33ba841757e0cac59474939100cce2d20e92aff7 100644 GIT binary patch literal 16958 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 diff --git a/_app/favicon.png b/_app/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..9c92c235cb0032d5e9347079e329520ade39061e GIT binary patch literal 5318 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 Y0Cf}IShr~z(f|Me07*qoM6N<$f`Ci`zyJUM literal 0 HcmV?d00001 diff --git a/_app/favicon.svg b/_app/favicon.svg index 9fa422001..b5f314f70 100644 --- a/_app/favicon.svg +++ b/_app/favicon.svg @@ -1 +1 @@ -logo-black-mask-icon@1x \ No newline at end of file +Almace Scaffolding diff --git a/_app/mask-icon.svg b/_app/mask-icon.svg new file mode 100644 index 000000000..9fa422001 --- /dev/null +++ b/_app/mask-icon.svg @@ -0,0 +1 @@ +logo-black-mask-icon@1x \ No newline at end of file