Squashed commit of the following:
commit6430e78c16Merge:5855527b13bbc3Author: Dillon <dillonzq@outlook.com> Date: Wed Feb 19 19:31:28 2020 +0800 Merge pull request #84 from dillonzq/fix/duplicated_typeit fix(typeit): fix duplicated typeit bug (#82) commitb13bbc368cAuthor: Dillon <dillonzq@outlook.com> Date: Wed Feb 19 19:25:49 2020 +0800 fix(typeit): fix duplicated typeit bug (#82) commit58555274f5Merge:16320fa02919a7Author: Dillon <dillonzq@outlook.com> Date: Wed Feb 19 18:59:21 2020 +0800 Merge pull request #83 from dillonzq/fix/social_link_href fix(social): fix social link bug (#81) commit02919a7d48Author: Dillon <dillonzq@outlook.com> Date: Wed Feb 19 18:55:40 2020 +0800 fix(social): fix social link bug (#81)
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
list-style: none;
|
list-style: none;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding-top: 1rem;
|
padding: 1rem 0 0;
|
||||||
|
|
||||||
a {
|
a {
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
|
|||||||
@@ -409,7 +409,7 @@ themesDir = "../.."
|
|||||||
# Linkedin = "xxxx"
|
# Linkedin = "xxxx"
|
||||||
Twitter = "xxxx"
|
Twitter = "xxxx"
|
||||||
Instagram = "xxxx"
|
Instagram = "xxxx"
|
||||||
Email = "xxxx@outlook.com"
|
Email = "xxxx@example.com"
|
||||||
# Facebook = "xxxx"
|
# Facebook = "xxxx"
|
||||||
# Telegram = "xxxx"
|
# Telegram = "xxxx"
|
||||||
# Medium = "xxxx"
|
# Medium = "xxxx"
|
||||||
@@ -461,12 +461,12 @@ themesDir = "../.."
|
|||||||
# Vine = "xxxx"
|
# Vine = "xxxx"
|
||||||
# Googlescholar = "xxxx"
|
# Googlescholar = "xxxx"
|
||||||
# Researchgate = "xxxx"
|
# Researchgate = "xxxx"
|
||||||
# Mastodon = "xxxx"
|
# Mastodon = "@xxxx"
|
||||||
# MastodonPrefix = "https://mastodon.technology/"
|
# MastodonPrefix = "https://mastodon.technology/"
|
||||||
# Thingiverse = "xxxx"
|
# Thingiverse = "xxxx"
|
||||||
# Devto = "xxxx"
|
# Devto = "xxxx"
|
||||||
# Gitea = "xxxx"
|
# Gitea = "xxxx"
|
||||||
# XMPP = "xxxx"
|
# XMPP = "xxxx@example.com"
|
||||||
# Matrix = "xxxx"
|
# Matrix = "xxxx"
|
||||||
Bilibili = "xxxx"
|
Bilibili = "xxxx"
|
||||||
# 文章页面配置
|
# 文章页面配置
|
||||||
|
|||||||
@@ -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" . -}}
|
{{- partial "function/icon.html" . -}}
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -378,8 +378,8 @@
|
|||||||
|
|
||||||
{{- /* 055: Mastodon */ -}}
|
{{- /* 055: Mastodon */ -}}
|
||||||
{{- with .Site.Params.Social.Mastodon -}}
|
{{- with .Site.Params.Social.Mastodon -}}
|
||||||
{{- $MastodonPrefix := $.Site.Params.Social.MastodonPrefix | default "https://mastodon.social/" -}}
|
{{- $MastodonPrefix := $.Site.Params.Social.MastodonPrefix | default "https://mastodon.social" -}}
|
||||||
{{- $options := dict "href" $MastodonPrefix "title" "Mastodon" -}}
|
{{- $options := dict "href" (printf "%s/%s" $MastodonPrefix .) "title" "Mastodon" -}}
|
||||||
{{- $options = dict "class" "fab fa-mastodon fa-fw" | merge $options -}}
|
{{- $options = dict "class" "fab fa-mastodon fa-fw" | merge $options -}}
|
||||||
{{- partial "function/icon-link.html" $options -}}
|
{{- partial "function/icon-link.html" $options -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{{- $CDN := .Scratch.Get "CDN" -}}
|
{{- $CDN := .Scratch.Get "CDN" -}}
|
||||||
|
{{- $localScratch := newScratch -}}
|
||||||
|
|
||||||
{{- /* Fork Awesome https://forkaweso.me/ */ -}}
|
{{- /* Fork Awesome https://forkaweso.me/ */ -}}
|
||||||
{{- if .Scratch.Get "forkawesome" -}}
|
{{- if .Scratch.Get "forkawesome" -}}
|
||||||
@@ -41,10 +42,10 @@
|
|||||||
{{- slice "js/lib/typeit/typeit.min.js" | $.Scratch.Add "scriptLocal" -}}
|
{{- slice "js/lib/typeit/typeit.min.js" | $.Scratch.Add "scriptLocal" -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- range $key, $val := . -}}
|
{{- range $key, $val := . -}}
|
||||||
{{- slice $val | $.Scratch.Add "typeitArr" -}}
|
{{- slice $val | $localScratch.Add "typeitArr" -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
<script>
|
<script>
|
||||||
window.typeitArr = {{ $.Scratch.Get "typeitArr" | jsonify | safeJS }};
|
window.typeitArr = {{ $localScratch.Get "typeitArr" | jsonify | safeJS }};
|
||||||
</script>
|
</script>
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user