1
0
Fork 0
mirror of https://github.com/dillonzq/LoveIt.git synced 2025-04-05 13:40:59 +02:00

Squashed commit of the following:

commit 6430e78c16
Merge: 5855527 b13bbc3
Author: Dillon <dillonzq@outlook.com>
Date:   Wed Feb 19 19:31:28 2020 +0800

    Merge pull request  from dillonzq/fix/duplicated_typeit

    fix(typeit): fix duplicated typeit bug ()

commit b13bbc368c
Author: Dillon <dillonzq@outlook.com>
Date:   Wed Feb 19 19:25:49 2020 +0800

    fix(typeit): fix duplicated typeit bug ()

commit 58555274f5
Merge: 16320fa 02919a7
Author: Dillon <dillonzq@outlook.com>
Date:   Wed Feb 19 18:59:21 2020 +0800

    Merge pull request  from dillonzq/fix/social_link_href

    fix(social): fix social link bug ()

commit 02919a7d48
Author: Dillon <dillonzq@outlook.com>
Date:   Wed Feb 19 18:55:40 2020 +0800

    fix(social): fix social link bug ()
This commit is contained in:
Dillon 2020-02-20 11:55:52 +08:00
parent f3eb6fc520
commit 315eb094e5
6 changed files with 11 additions and 10 deletions
assets/css/_partial
exampleSite
layouts/partials
resources/_gen/assets/scss/css

View file

@ -6,7 +6,7 @@
list-style: none;
white-space: nowrap;
width: 100%;
padding-top: 1rem;
padding: 1rem 0 0;
a {
-webkit-font-smoothing: antialiased;

View file

@ -409,7 +409,7 @@ themesDir = "../.."
# Linkedin = "xxxx"
Twitter = "xxxx"
Instagram = "xxxx"
Email = "xxxx@outlook.com"
Email = "xxxx@example.com"
# Facebook = "xxxx"
# Telegram = "xxxx"
# Medium = "xxxx"
@ -461,12 +461,12 @@ themesDir = "../.."
# Vine = "xxxx"
# Googlescholar = "xxxx"
# Researchgate = "xxxx"
# Mastodon = "xxxx"
# Mastodon = "@xxxx"
# MastodonPrefix = "https://mastodon.technology/"
# Thingiverse = "xxxx"
# Devto = "xxxx"
# Gitea = "xxxx"
# XMPP = "xxxx"
# XMPP = "xxxx@example.com"
# Matrix = "xxxx"
Bilibili = "xxxx"
# 文章页面配置

View file

@ -1,3 +1,3 @@
<a href="{{ index . `href` }}" rel="me noopener noreffer" target="_blank" title="{{ index . `title` }}">
<a href="{{ index . `href` | safeURL }}" rel="me noopener noreffer" target="_blank" title="{{ index . `title` }}">
{{- partial "function/icon.html" . -}}
</a>

View file

@ -378,8 +378,8 @@
{{- /* 055: Mastodon */ -}}
{{- with .Site.Params.Social.Mastodon -}}
{{- $MastodonPrefix := $.Site.Params.Social.MastodonPrefix | default "https://mastodon.social/" -}}
{{- $options := dict "href" $MastodonPrefix "title" "Mastodon" -}}
{{- $MastodonPrefix := $.Site.Params.Social.MastodonPrefix | default "https://mastodon.social" -}}
{{- $options := dict "href" (printf "%s/%s" $MastodonPrefix .) "title" "Mastodon" -}}
{{- $options = dict "class" "fab fa-mastodon fa-fw" | merge $options -}}
{{- partial "function/icon-link.html" $options -}}
{{- end -}}

View file

@ -1,4 +1,5 @@
{{- $CDN := .Scratch.Get "CDN" -}}
{{- $localScratch := newScratch -}}
{{- /* Fork Awesome https://forkaweso.me/ */ -}}
{{- if .Scratch.Get "forkawesome" -}}
@ -41,10 +42,10 @@
{{- slice "js/lib/typeit/typeit.min.js" | $.Scratch.Add "scriptLocal" -}}
{{- end -}}
{{- range $key, $val := . -}}
{{- slice $val | $.Scratch.Add "typeitArr" -}}
{{- slice $val | $localScratch.Add "typeitArr" -}}
{{- end -}}
<script>
window.typeitArr = {{ $.Scratch.Get "typeitArr" | jsonify | safeJS }};
window.typeitArr = {{ $localScratch.Get "typeitArr" | jsonify | safeJS }};
</script>
{{- end -}}