From 3905dee7675c99b33fa7e0b4adf93cf4df8e1780 Mon Sep 17 00:00:00 2001 From: Maksim Iakunin Date: Thu, 30 Sep 2021 18:35:35 +0300 Subject: [PATCH] #98: replacing `readFile` with `partial` for predefined icons This approach has been taken from another popular hugo-theme `ananke`: https://github.com/theNewDynamic/gohugo-theme-ananke/blob/e3f7fbe39d7b24d43e80a3c95aa3d940731ac535/layouts/partials/social-follow.html#L41 --- {static => layouts/partials}/fa-icons/email.svg | 0 {static => layouts/partials}/fa-icons/facebook.svg | 0 {static => layouts/partials}/fa-icons/github.svg | 0 {static => layouts/partials}/fa-icons/instagram.svg | 0 {static => layouts/partials}/fa-icons/linkedin.svg | 0 {static => layouts/partials}/fa-icons/patreon.svg | 0 {static => layouts/partials}/fa-icons/reddit.svg | 0 {static => layouts/partials}/fa-icons/snapchat.svg | 0 {static => layouts/partials}/fa-icons/soundcloud.svg | 0 {static => layouts/partials}/fa-icons/spotify.svg | 0 {static => layouts/partials}/fa-icons/telegram.svg | 0 {static => layouts/partials}/fa-icons/twitch.svg | 0 {static => layouts/partials}/fa-icons/twitter.svg | 0 {static => layouts/partials}/fa-icons/vk.svg | 0 {static => layouts/partials}/fa-icons/youtube.svg | 0 layouts/partials/font-awesome.html | 10 +++++----- 16 files changed, 5 insertions(+), 5 deletions(-) rename {static => layouts/partials}/fa-icons/email.svg (100%) rename {static => layouts/partials}/fa-icons/facebook.svg (100%) rename {static => layouts/partials}/fa-icons/github.svg (100%) rename {static => layouts/partials}/fa-icons/instagram.svg (100%) rename {static => layouts/partials}/fa-icons/linkedin.svg (100%) rename {static => layouts/partials}/fa-icons/patreon.svg (100%) rename {static => layouts/partials}/fa-icons/reddit.svg (100%) rename {static => layouts/partials}/fa-icons/snapchat.svg (100%) rename {static => layouts/partials}/fa-icons/soundcloud.svg (100%) rename {static => layouts/partials}/fa-icons/spotify.svg (100%) rename {static => layouts/partials}/fa-icons/telegram.svg (100%) rename {static => layouts/partials}/fa-icons/twitch.svg (100%) rename {static => layouts/partials}/fa-icons/twitter.svg (100%) rename {static => layouts/partials}/fa-icons/vk.svg (100%) rename {static => layouts/partials}/fa-icons/youtube.svg (100%) diff --git a/static/fa-icons/email.svg b/layouts/partials/fa-icons/email.svg similarity index 100% rename from static/fa-icons/email.svg rename to layouts/partials/fa-icons/email.svg diff --git a/static/fa-icons/facebook.svg b/layouts/partials/fa-icons/facebook.svg similarity index 100% rename from static/fa-icons/facebook.svg rename to layouts/partials/fa-icons/facebook.svg diff --git a/static/fa-icons/github.svg b/layouts/partials/fa-icons/github.svg similarity index 100% rename from static/fa-icons/github.svg rename to layouts/partials/fa-icons/github.svg diff --git a/static/fa-icons/instagram.svg b/layouts/partials/fa-icons/instagram.svg similarity index 100% rename from static/fa-icons/instagram.svg rename to layouts/partials/fa-icons/instagram.svg diff --git a/static/fa-icons/linkedin.svg b/layouts/partials/fa-icons/linkedin.svg similarity index 100% rename from static/fa-icons/linkedin.svg rename to layouts/partials/fa-icons/linkedin.svg diff --git a/static/fa-icons/patreon.svg b/layouts/partials/fa-icons/patreon.svg similarity index 100% rename from static/fa-icons/patreon.svg rename to layouts/partials/fa-icons/patreon.svg diff --git a/static/fa-icons/reddit.svg b/layouts/partials/fa-icons/reddit.svg similarity index 100% rename from static/fa-icons/reddit.svg rename to layouts/partials/fa-icons/reddit.svg diff --git a/static/fa-icons/snapchat.svg b/layouts/partials/fa-icons/snapchat.svg similarity index 100% rename from static/fa-icons/snapchat.svg rename to layouts/partials/fa-icons/snapchat.svg diff --git a/static/fa-icons/soundcloud.svg b/layouts/partials/fa-icons/soundcloud.svg similarity index 100% rename from static/fa-icons/soundcloud.svg rename to layouts/partials/fa-icons/soundcloud.svg diff --git a/static/fa-icons/spotify.svg b/layouts/partials/fa-icons/spotify.svg similarity index 100% rename from static/fa-icons/spotify.svg rename to layouts/partials/fa-icons/spotify.svg diff --git a/static/fa-icons/telegram.svg b/layouts/partials/fa-icons/telegram.svg similarity index 100% rename from static/fa-icons/telegram.svg rename to layouts/partials/fa-icons/telegram.svg diff --git a/static/fa-icons/twitch.svg b/layouts/partials/fa-icons/twitch.svg similarity index 100% rename from static/fa-icons/twitch.svg rename to layouts/partials/fa-icons/twitch.svg diff --git a/static/fa-icons/twitter.svg b/layouts/partials/fa-icons/twitter.svg similarity index 100% rename from static/fa-icons/twitter.svg rename to layouts/partials/fa-icons/twitter.svg diff --git a/static/fa-icons/vk.svg b/layouts/partials/fa-icons/vk.svg similarity index 100% rename from static/fa-icons/vk.svg rename to layouts/partials/fa-icons/vk.svg diff --git a/static/fa-icons/youtube.svg b/layouts/partials/fa-icons/youtube.svg similarity index 100% rename from static/fa-icons/youtube.svg rename to layouts/partials/fa-icons/youtube.svg diff --git a/layouts/partials/font-awesome.html b/layouts/partials/font-awesome.html index f1db829..646aa22 100644 --- a/layouts/partials/font-awesome.html +++ b/layouts/partials/font-awesome.html @@ -1,15 +1,15 @@ - + {{ $dict := newScratch }} -{{ if (eq .custom true) }} - {{ $dict.Set "filename" (print "static/fa-icons/" .iconName ".svg") }} +{{ if (eq .custom true) }} + {{ $dict.Set "svg" (readFile (print "static/fa-icons/" .iconName ".svg")) }} {{ else }} - {{ $dict.Set "filename" (print "themes/anubis/static/fa-icons/" .iconName ".svg") }} + {{ $dict.Set "svg" (partial (print "fa-icons/" .iconName ".svg")) }} {{ end }} {{- $path:="