From d0ddf5f8c5c0341eedbccd6be73b2058da4c0d20 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Fri, 13 Aug 2021 16:35:32 +1000 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=B1=20Add=20support=20for=20more=20soc?= =?UTF-8?q?ial=20icons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/icons/codepen.svg | 1 + assets/icons/dev.svg | 1 + assets/icons/discord.svg | 1 + assets/icons/dribbble.svg | 1 + assets/icons/email.svg | 1 + ...gle-solid.svg => exclamation-triangle.svg} | 0 assets/icons/facebook.svg | 1 + .../icons/{github-brands.svg => github.svg} | 0 assets/icons/gitlab.svg | 1 + assets/icons/instagram.svg | 1 + .../icons/{keybase-brands.svg => keybase.svg} | 0 assets/icons/lastfm.svg | 1 + assets/icons/link.svg | 1 + .../{linkedin-brands.svg => linkedin.svg} | 0 assets/icons/mastodon.svg | 1 + assets/icons/medium.svg | 1 + assets/icons/reddit.svg | 1 + assets/icons/slack.svg | 1 + assets/icons/snapchat.svg | 1 + assets/icons/soundcloud.svg | 1 + assets/icons/steam.svg | 1 + assets/icons/tiktok.svg | 1 + assets/icons/twitch.svg | 1 + .../icons/{twitter-brands.svg => twitter.svg} | 0 assets/icons/youtube.svg | 1 + config/_default/author.toml | 32 ++++++++--- exampleSite/config.toml | 17 +++--- layouts/partials/author.html | 54 ++++++------------- layouts/partials/head.html | 10 ++-- layouts/shortcodes/alert.html | 2 +- 30 files changed, 78 insertions(+), 57 deletions(-) create mode 100644 assets/icons/codepen.svg create mode 100644 assets/icons/dev.svg create mode 100644 assets/icons/discord.svg create mode 100644 assets/icons/dribbble.svg create mode 100644 assets/icons/email.svg rename assets/icons/{exclamation-triangle-solid.svg => exclamation-triangle.svg} (100%) create mode 100644 assets/icons/facebook.svg rename assets/icons/{github-brands.svg => github.svg} (100%) create mode 100644 assets/icons/gitlab.svg create mode 100644 assets/icons/instagram.svg rename assets/icons/{keybase-brands.svg => keybase.svg} (100%) create mode 100644 assets/icons/lastfm.svg create mode 100644 assets/icons/link.svg rename assets/icons/{linkedin-brands.svg => linkedin.svg} (100%) create mode 100644 assets/icons/mastodon.svg create mode 100644 assets/icons/medium.svg create mode 100644 assets/icons/reddit.svg create mode 100644 assets/icons/slack.svg create mode 100644 assets/icons/snapchat.svg create mode 100644 assets/icons/soundcloud.svg create mode 100644 assets/icons/steam.svg create mode 100644 assets/icons/tiktok.svg create mode 100644 assets/icons/twitch.svg rename assets/icons/{twitter-brands.svg => twitter.svg} (100%) create mode 100644 assets/icons/youtube.svg diff --git a/assets/icons/codepen.svg b/assets/icons/codepen.svg new file mode 100644 index 00000000..7a39ecd2 --- /dev/null +++ b/assets/icons/codepen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/dev.svg b/assets/icons/dev.svg new file mode 100644 index 00000000..547b4111 --- /dev/null +++ b/assets/icons/dev.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/discord.svg b/assets/icons/discord.svg new file mode 100644 index 00000000..29d8307f --- /dev/null +++ b/assets/icons/discord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/dribbble.svg b/assets/icons/dribbble.svg new file mode 100644 index 00000000..8965a0af --- /dev/null +++ b/assets/icons/dribbble.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/email.svg b/assets/icons/email.svg new file mode 100644 index 00000000..8b72d6f8 --- /dev/null +++ b/assets/icons/email.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/exclamation-triangle-solid.svg b/assets/icons/exclamation-triangle.svg similarity index 100% rename from assets/icons/exclamation-triangle-solid.svg rename to assets/icons/exclamation-triangle.svg diff --git a/assets/icons/facebook.svg b/assets/icons/facebook.svg new file mode 100644 index 00000000..649b4945 --- /dev/null +++ b/assets/icons/facebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/github-brands.svg b/assets/icons/github.svg similarity index 100% rename from assets/icons/github-brands.svg rename to assets/icons/github.svg diff --git a/assets/icons/gitlab.svg b/assets/icons/gitlab.svg new file mode 100644 index 00000000..abc7faed --- /dev/null +++ b/assets/icons/gitlab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/instagram.svg b/assets/icons/instagram.svg new file mode 100644 index 00000000..53ab3119 --- /dev/null +++ b/assets/icons/instagram.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/keybase-brands.svg b/assets/icons/keybase.svg similarity index 100% rename from assets/icons/keybase-brands.svg rename to assets/icons/keybase.svg diff --git a/assets/icons/lastfm.svg b/assets/icons/lastfm.svg new file mode 100644 index 00000000..f0302e72 --- /dev/null +++ b/assets/icons/lastfm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/link.svg b/assets/icons/link.svg new file mode 100644 index 00000000..586901d4 --- /dev/null +++ b/assets/icons/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/linkedin-brands.svg b/assets/icons/linkedin.svg similarity index 100% rename from assets/icons/linkedin-brands.svg rename to assets/icons/linkedin.svg diff --git a/assets/icons/mastodon.svg b/assets/icons/mastodon.svg new file mode 100644 index 00000000..4257e7c6 --- /dev/null +++ b/assets/icons/mastodon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/medium.svg b/assets/icons/medium.svg new file mode 100644 index 00000000..c5da4f83 --- /dev/null +++ b/assets/icons/medium.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/reddit.svg b/assets/icons/reddit.svg new file mode 100644 index 00000000..83ae62dd --- /dev/null +++ b/assets/icons/reddit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/slack.svg b/assets/icons/slack.svg new file mode 100644 index 00000000..3c8e9003 --- /dev/null +++ b/assets/icons/slack.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/snapchat.svg b/assets/icons/snapchat.svg new file mode 100644 index 00000000..6e37c24d --- /dev/null +++ b/assets/icons/snapchat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/soundcloud.svg b/assets/icons/soundcloud.svg new file mode 100644 index 00000000..01198684 --- /dev/null +++ b/assets/icons/soundcloud.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/steam.svg b/assets/icons/steam.svg new file mode 100644 index 00000000..0bfb16d8 --- /dev/null +++ b/assets/icons/steam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/tiktok.svg b/assets/icons/tiktok.svg new file mode 100644 index 00000000..0fcd7b10 --- /dev/null +++ b/assets/icons/tiktok.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/twitch.svg b/assets/icons/twitch.svg new file mode 100644 index 00000000..198dc64e --- /dev/null +++ b/assets/icons/twitch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/twitter-brands.svg b/assets/icons/twitter.svg similarity index 100% rename from assets/icons/twitter-brands.svg rename to assets/icons/twitter.svg diff --git a/assets/icons/youtube.svg b/assets/icons/youtube.svg new file mode 100644 index 00000000..f59312a0 --- /dev/null +++ b/assets/icons/youtube.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/config/_default/author.toml b/config/_default/author.toml index 3daffe10..552b5aa5 100644 --- a/config/_default/author.toml +++ b/config/_default/author.toml @@ -1,9 +1,29 @@ [author] # name = "Your name here" # image = "/img/author.jpg" - # email = "hello@your_domain.com" - - # twitter = "https://twitter.com/username" - # github = "https://github.com/username" - # keybase = "https://keybase.io/username" - # linkedin = "https://linkedin.com/in/username/" + # links = [ + # { email = "mailto:hello@your_domain.com" }, + # { link = "https://link-to-some-website.com/" }, + # { codepen = "https://codepen.io/username" }, + # { dev = "https://dev.to/username" }, + # { discord = "https://discord.gg/invitecode" }, + # { dribbble = "https://dribbble.com/username" }, + # { facebook = "https://facebook.com/username" }, + # { github = "https://github.com/username" }, + # { gitlab = "https://gitlab.com/username" }, + # { instagram = "https://instagram.com/username" }, + # { keybase = "https://keybase.io/username" }, + # { lastfm = "https://lastfm.com/user/username" }, + # { linkedin = "https://linkedin.com/in/username" }, + # { mastodon = "https://mastodon.instance/@username" }, + # { medium = "https://medium.com/username" }, + # { reddit = "https://reddit.com/user/username" }, + # { slack = "https://workspace.url/team/userid" }, + # { snapchat = "https://snapchat.com/add/username" }, + # { soundcloud = "https://soundcloud.com/username" }, + # { steam = "https://steamcommunity.com/profiles/userid" }, + # { tiktok = "https://tiktok.com/@username" }, + # { twitch = "https://twitch.tv/username" }, + # { twitter = "https://twitter.com/username" }, + # { youtube = "https://youtube.com/username" }, + # ] diff --git a/exampleSite/config.toml b/exampleSite/config.toml index a3f20fde..74556baa 100755 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -1,6 +1,6 @@ # Site configuration for the Congo demo site # -------------------------------------------------------------------------- -# NOTE: You should not use this file as a template for your configuration +# IMPORTANT: You should not use this file as a template for configuration # as it does not contain all the required theme settings! # # Refer to the theme docs for configuration instructions if you're unsure. @@ -15,9 +15,12 @@ title = "Congo" [author] name = "Freddy Blogger" image = "https://i.pravatar.cc/150?img=11" - twitter = "https://twitter.com/" - github = "https://github.com/" - linkedin = "https://linkedin.com/" + links = [ + { twitter = "https://twitter.com/" }, + { facebook = "https://facebook.com/" }, + { linkedin = "https://linkedin.com/" }, + { youtube = "https://youtube.com/" }, + ] [[menu.main]] name = "Blog" @@ -32,9 +35,9 @@ title = "Congo" url = "tags" weight = 30 -[taxonomies] - category = "categories" - tag = "tags" +[markup.goldmark] +[markup.goldmark.renderer] + unsafe = true [markup.highlight] noClasses = false diff --git a/layouts/partials/author.html b/layouts/partials/author.html index df18abad..04c9ae42 100644 --- a/layouts/partials/author.html +++ b/layouts/partials/author.html @@ -8,43 +8,21 @@ {{ . }} {{ end }} -
- {{ with .Site.Author.twitter }} - {{ partial "icon.html" "twitter-brands" }} - {{ end }} - {{ with .Site.Author.github }} - {{ partial "icon.html" "github-brands" }} - {{ end }} - {{ with .Site.Author.keybase }} - {{ partial "icon.html" "keybase-brands" }} - {{ end }} - {{ with .Site.Author.linkedin }} - {{ partial "icon.html" "linkedin-brands" }} - {{ end }} -
+ {{ with .Site.Author.links }} +
+ {{ range $links := . }} + {{ range $name, $url := $links }} + {{ partial "icon.html" $name }} + {{ end }} + {{ end }} +
+ {{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9c78cbdf..1140cc0b 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -54,11 +54,11 @@ {{ hugo.Generator }} {{/* Me */}} {{ with .Site.Author.name }}{{ end }} - {{ with .Site.Author.email }}{{ end }} - {{ with .Site.Author.twitter }}{{ end }} - {{ with .Site.Author.keybase }}{{ end }} - {{ with .Site.Author.github }}{{ end }} - {{ with .Site.Author.linkedin }}{{ end }} + {{ with .Site.Author.links }} + {{ range $links := . }} + {{ range $name, $url := $links }}{{ end }} + {{ end }} + {{ end }} {{/* Analytics */}} {{ partialCached "analytics.html" .Site }} {{/* Extend head - eg. for custom analytics scripts, etc. */}} diff --git a/layouts/shortcodes/alert.html b/layouts/shortcodes/alert.html index bf17fa4c..cd02122e 100644 --- a/layouts/shortcodes/alert.html +++ b/layouts/shortcodes/alert.html @@ -1,6 +1,6 @@
- {{ partial "icon.html" "exclamation-triangle-solid" }} + {{ partial "icon.html" "exclamation-triangle" }} {{- .Inner | markdownify -}}