{{- $categories := slice -}}
{{- range .Params.categories -}}
{{- $category := partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}}
- {{- $categories = $categories | append (printf `%v` $category.RelPermalink $category.Title) -}}
+ {{- $icon := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "folder") -}}
+ {{- $categories = $categories | append (printf `%v%v` $category.RelPermalink $icon $category.Title) -}}
{{- end -}}
{{- with delimit $categories " " -}}
@@ -54,7 +55,8 @@
{{- $series := slice -}}
{{- range .Params.series -}}
{{- $singleSeries := partialCached "function/path.html" . . | printf "/series/%v" | $.Site.GetPage -}}
- {{- $series = $series | append (printf `%v` $singleSeries.RelPermalink $singleSeries.Title) -}}
+ {{- $icon := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "list-alt") -}}
+ {{- $series = $series | append (printf `%v%v` $singleSeries.RelPermalink $icon $singleSeries.Title) -}}
{{- end -}}
{{- with delimit $series " " -}}
@@ -77,7 +79,7 @@
{{ T "readMore" }}
{{- with .Params.tags -}}
\ No newline at end of file
diff --git a/layouts/partials/home/profile.html b/layouts/partials/home/profile.html
index 2342c4f9f..ecd0f6c64 100644
--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@@ -2,97 +2,98 @@
{{- $avatar := $profile.avatarURL -}}
{{- with $profile.gravatarEmail -}}
- {{- $avatar = md5 . | printf "https://www.gravatar.com/avatar/%v?s=240&d=mp" -}}
+ {{- $avatar = md5 . | printf "https://www.gravatar.com/avatar/%v?s=240&d=mp" -}}
{{- end -}}
{{- if $avatar -}}
-
- {{- $menus := $.Site.Menus.main | default slice -}}
- {{- with index $menus 0 -}}
- {{- $url := .URL | relLangURL -}}
- {{- with .Page -}}
- {{- $url = .RelPermalink -}}
- {{- end -}}
- {{- with $profile.avatarLinkURL -}}
- {{- $url = . -}}
- {{- end -}}
-
- {{- dict "Src" $avatar "Height" "100" "Width" "100" "Loading" "eager" | partial "plugin/image.html" -}}
-
- {{- else -}}
- {{- dict "Src" $avatar "Height" "100" "Width" "100" | partial "plugin/image.html" -}}
- {{- end -}}
-
+
+ {{- $menus := $.Site.Menus.main | default slice -}}
+ {{- with index $menus 0 -}}
+ {{- $url := .URL | relLangURL -}}
+ {{- with .Page -}}
+ {{- $url = .RelPermalink -}}
+ {{- end -}}
+ {{- with $profile.avatarLinkURL -}}
+ {{- $url = . -}}
+ {{- end -}}
+
+ {{- dict "Src" $avatar "Height" "100" "Width" "100" "Loading" "eager" | partial "plugin/image.html" -}}
+
+ {{- else -}}
+ {{- dict "Src" $avatar "Height" "100" "Width" "100" | partial "plugin/image.html" -}}
+ {{- end -}}
+
{{- end -}}
{{- with $profile.title -}}
-
- {{- . | safeHTML -}}
-
+
+ {{- . | safeHTML -}}
+
{{- end -}}
{{- with $profile.subtitle -}}
-
- {{- if $profile.typeit -}}
- {{- $id := dict "Content" . "Scratch" $.Scratch | partial "function/id.html" -}}
-
- {{- dict $id (slice $id) | dict "typeitMap" | merge ($.Scratch.Get "this") | $.Scratch.Set "this" -}}
- {{- else -}}
- {{- . -}}
- {{- end -}}
-
+
+ {{- if $profile.typeit -}}
+ {{- $id := dict "Content" . "Scratch" $.Scratch | partial "function/id.html" -}}
+
+ {{- dict $id (slice $id) | dict "typeitMap" | merge ($.Scratch.Get "this") | $.Scratch.Set "this" -}}
+ {{- else -}}
+ {{- . -}}
+ {{- end -}}
+
{{- end -}}
{{- if $profile.social -}}
-
- {{- $socialMap := resources.Get "data/social.yml" | transform.Unmarshal -}}
- {{- $socialArr := slice -}}
- {{- range $key, $value := .Site.Params.social -}}
- {{- $social := $key | lower | index $socialMap | default dict -}}
- {{- if $value -}}
- {{- if reflect.IsMap $value -}}
- {{- with $value.weight -}}
- {{- $social = dict "Weight" . | merge $social -}}
- {{- end -}}
- {{- with $value.prefix -}}
- {{- $social = dict "Prefix" . | merge $social -}}
- {{- end -}}
- {{- with $value.template -}}
- {{- $social = dict "Template" . | merge $social -}}
- {{- end -}}
- {{- with $value.id -}}
- {{- $social = dict "Id" . | merge $social -}}
- {{- end -}}
- {{- with $value.url -}}
- {{- $social = dict "Url" . | merge $social -}}
- {{- end -}}
- {{- with $value.title -}}
- {{- $social = dict "Title" . | merge $social -}}
- {{- end -}}
- {{- with $value.newtab -}}
- {{- $social = dict "Newtab" . | merge $social -}}
- {{- end -}}
- {{- with $value.icon -}}
- {{- $social = dict "Icon" . | merge $social -}}
- {{- end -}}
- {{- else if ne $value true -}}
- {{- $social = dict "Id" $value | merge $social -}}
- {{- end -}}
- {{- if $social.Icon.Simpleicons -}}
- {{- $prefix := ($.Scratch.Get "cdn" | default dict).simpleIconsPrefix -}}
- {{- $social = dict "Prefix" $prefix | dict "Icon" | merge $social -}}
- {{- end -}}
- {{- $socialArr = $socialArr | append $social -}}
- {{- end -}}
- {{- end -}}
- {{- range sort $socialArr "Weight" -}}
- {{- partial "plugin/social.html" . -}}
- {{- end -}}
-
+
+ {{- $socialMap := resources.Get "data/social.yml" | transform.Unmarshal -}}
+ {{- $socialArr := slice -}}
+ {{- range $key, $value := .Site.Params.social -}}
+ {{- $social := $key | lower | index $socialMap | default dict -}}
+ {{- if $value -}}
+ {{- if reflect.IsMap $value -}}
+ {{- with $value.weight -}}
+ {{- $social = dict "Weight" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.prefix -}}
+ {{- $social = dict "Prefix" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.template -}}
+ {{- $social = dict "Template" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.id -}}
+ {{- $social = dict "Id" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.url -}}
+ {{- $social = dict "Url" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.title -}}
+ {{- $social = dict "Title" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.newtab -}}
+ {{- $social = dict "Newtab" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.icon -}}
+ {{- $social = dict "Icon" . | merge $social -}}
+ {{- end -}}
+ {{- else if ne $value true -}}
+ {{- $social = dict "Id" $value | merge $social -}}
+ {{- end -}}
+ {{- if $social.Icon.Simpleicons -}}
+ {{- $prefix := ($.Scratch.Get "cdn" | default dict).simpleIconsPrefix -}}
+ {{- $social = dict "Prefix" $prefix | dict "Icon" | merge $social -}}
+ {{- end -}}
+ {{- $socialArr = $socialArr | append $social -}}
+ {{- end -}}
+ {{- end -}}
+ {{- range sort $socialArr "Weight" -}}
+ {{- partial "plugin/social.html" . -}}
+ {{- end -}}
+
{{- end -}}
{{- with $profile.disclaimer -}}
-
- {{- . | safeHTML -}}
-
+
+ {{- . | safeHTML -}}
+
{{- end -}}
-
+
\ No newline at end of file
diff --git a/layouts/partials/meta/author.html b/layouts/partials/meta/author.html
index e023e8ad9..15952e79c 100644
--- a/layouts/partials/meta/author.html
+++ b/layouts/partials/meta/author.html
@@ -1,4 +1,3 @@
-{{- $icon := dict "Class" "author fas fa-user-circle fa-fw" }}
{{- if .Params.authors -}}
{{- $lang := ( $.Params.lang | default $.Lang ) -}}
@@ -11,7 +10,7 @@
"lang" $lang
) -}}
{{- if gt $i 0 }}, {{ end -}}
- 
+
{{- .name -}}
{{- end -}}
@@ -38,7 +37,7 @@
{{- if $avatar -}}
{{- else -}}
- {{- partial "plugin/icon.html" $icon -}}
+ {{- partial "plugin/fontawesome.html" (dict "Style" "solid" "Icon" "user-circle") -}}
{{- end -}}
{{- partial "plugin/link.html" $options -}}
{{- end -}}
diff --git a/layouts/partials/plugin/fontawesome.html b/layouts/partials/plugin/fontawesome.html
index 20f40005c..f51186177 100644
--- a/layouts/partials/plugin/fontawesome.html
+++ b/layouts/partials/plugin/fontawesome.html
@@ -1,3 +1,3 @@
-{{ $path := printf "lib/fontawesome-free/svgs/%v/%v.svg" .Style .Icon }}
-{{ $resource := (resources.Get $path).Content }}
-{{ $resource | replaceRE `
+{{- with .Fontawesome -}}
+{{- partial "plugin/fontawesome.html" . -}}
+{{- else -}}
+{{- with .Simpleicons -}}
+ {{ partial "plugin/simpleicons.html" . }}
{{- else -}}
- {{- $src := .Src -}}
- {{- with .Simpleicons -}}
- {{- $prefix := $.Prefix | default "lib/simple-icons/icons" | strings.TrimSuffix "/" -}}
- {{- $src = printf "%v/%v.svg" $prefix . -}}
- {{- end -}}
- {{- if (urls.Parse $src).Host | not -}}
- {{- $src = (resources.Get $src | minify).RelPermalink -}}
- {{- end -}}
-
+{{- with .Class -}}
+ {{- errorf "Deprecated %v" . -}}
+{{- end -}}
{{- end -}}
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/plugin/share.html b/layouts/partials/plugin/share.html
index 48d821b6b..92f3a2af5 100644
--- a/layouts/partials/plugin/share.html
+++ b/layouts/partials/plugin/share.html
@@ -4,210 +4,209 @@
{{- /* 001: Twitter */ -}}
{{- if $share.Twitter -}}
{{- end -}}
{{- /* 002: Facebook */ -}}
{{- if $share.Facebook -}}
{{- end -}}
{{- /* 003: Linkedin */ -}}
{{- if $share.Linkedin -}}
{{- end -}}
{{- /* 004: WhatsApp */ -}}
{{- if $share.Whatsapp -}}
{{- end -}}
{{- /* 005: Viber */ -}}
{{- if $share.Viber -}}
{{- end -}}
{{- /* 006: Pinterest */ -}}
{{- if $share.Pinterest -}}
{{- end -}}
{{- /* 007: Tumblr */ -}}
{{- if $share.Tumblr -}}
{{- end -}}
{{- /* 008: Hacker News */ -}}
{{- if $share.Hackernews -}}
{{- end -}}
{{- /* 009: Reddit */ -}}
{{- if $share.Reddit -}}
{{- end -}}
{{- /* 010: VK */ -}}
{{- if $share.VK -}}
{{- end -}}
{{- /* 011: Buffer */ -}}
{{- if $share.Buffer -}}
{{- end -}}
{{- /* 012: Xing */ -}}
{{- if $share.Xing -}}
{{- end -}}
{{- /* 013: Line */ -}}
{{- if $share.Line -}}
{{- end -}}
{{- /* 014: Instapaper */ -}}
{{- if $share.Instapaper -}}
{{- end -}}
{{- /* 015: Pocket */ -}}
{{- if $share.Pocket -}}
{{- end -}}
{{- /* 016: Digg */ -}}
{{- if $share.Digg -}}
{{- end -}}
{{- /* 017: StumbleUpon */ -}}
{{- if $share.Stumbleupon -}}
{{- end -}}
{{- /* 018: Flipboard */ -}}
{{- if $share.Flipboard -}}
{{- end -}}
{{- /* 019: 微博 */ -}}
{{- if $share.Weibo -}}
{{- end -}}
{{- /* 020: 人人 */ -}}
{{- if $share.Renren -}}
{{- end -}}
{{- /* 021: Myspace */ -}}
{{- if $share.Myspace -}}
{{- end -}}
{{- /* 022: Blogger */ -}}
{{- if $share.Blogger -}}
{{- end -}}
{{- /* 023: 百度 */ -}}
{{- if $share.Baidu -}}
{{- end -}}
{{- /* 024: OK.RU */ -}}
{{- if $share.Odnoklassniki -}}
{{- end -}}
{{- /* 025: Evernote */ -}}
{{- if $share.Evernote -}}
{{- end -}}
{{- /* 026: Skype */ -}}
{{- if $share.Skype -}}
{{- end -}}
{{- /* 027: Trello */ -}}
{{- if $share.Trello -}}
{{- end -}}
{{- /* 028: Mix */ -}}
{{- if $share.Mix -}}
- {{- dict "Class" "fab fa-mix fa-fw" | partial "plugin/icon.html" -}}
+ {{- partial "plugin/fontawesome.html" (dict "Style" "brands" "Icon" "mix") -}}
{{- end -}}
{{- /* 029: Telegram */ -}}
{{- if $share.Telegram -}}
{{- end -}}
{{- /* 030: Weixin */ -}}
{{- if $share.Weixin -}}
{{- end -}}
@@ -231,7 +230,6 @@
}
{{- end -}}
{{- end -}}
diff --git a/layouts/partials/plugin/simpleicons.html b/layouts/partials/plugin/simpleicons.html
new file mode 100644
index 000000000..4fce44d9a
--- /dev/null
+++ b/layouts/partials/plugin/simpleicons.html
@@ -0,0 +1,3 @@
+{{- $path := printf "lib/simple-icons/icons/%v.svg" . -}}
+{{- $resource := (resources.Get $path).Content -}}
+{{- $resource | replaceRE `
{{ T "readMore" }}
{{- with .Params.tags -}}
\ No newline at end of file
diff --git a/layouts/partials/home/profile.html b/layouts/partials/home/profile.html
index 2342c4f9f..ecd0f6c64 100644
--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@@ -2,97 +2,98 @@
{{- $avatar := $profile.avatarURL -}}
{{- with $profile.gravatarEmail -}}
- {{- $avatar = md5 . | printf "https://www.gravatar.com/avatar/%v?s=240&d=mp" -}}
+ {{- $avatar = md5 . | printf "https://www.gravatar.com/avatar/%v?s=240&d=mp" -}}
{{- end -}}
{{- if $avatar -}}
-
- {{- $menus := $.Site.Menus.main | default slice -}}
- {{- with index $menus 0 -}}
- {{- $url := .URL | relLangURL -}}
- {{- with .Page -}}
- {{- $url = .RelPermalink -}}
- {{- end -}}
- {{- with $profile.avatarLinkURL -}}
- {{- $url = . -}}
- {{- end -}}
-
- {{- dict "Src" $avatar "Height" "100" "Width" "100" "Loading" "eager" | partial "plugin/image.html" -}}
-
- {{- else -}}
- {{- dict "Src" $avatar "Height" "100" "Width" "100" | partial "plugin/image.html" -}}
- {{- end -}}
-
+
+ {{- $menus := $.Site.Menus.main | default slice -}}
+ {{- with index $menus 0 -}}
+ {{- $url := .URL | relLangURL -}}
+ {{- with .Page -}}
+ {{- $url = .RelPermalink -}}
+ {{- end -}}
+ {{- with $profile.avatarLinkURL -}}
+ {{- $url = . -}}
+ {{- end -}}
+
+ {{- dict "Src" $avatar "Height" "100" "Width" "100" "Loading" "eager" | partial "plugin/image.html" -}}
+
+ {{- else -}}
+ {{- dict "Src" $avatar "Height" "100" "Width" "100" | partial "plugin/image.html" -}}
+ {{- end -}}
+
{{- end -}}
{{- with $profile.title -}}
-
- {{- . | safeHTML -}}
-
+
+ {{- . | safeHTML -}}
+
{{- end -}}
{{- with $profile.subtitle -}}
-
- {{- if $profile.typeit -}}
- {{- $id := dict "Content" . "Scratch" $.Scratch | partial "function/id.html" -}}
-
- {{- dict $id (slice $id) | dict "typeitMap" | merge ($.Scratch.Get "this") | $.Scratch.Set "this" -}}
- {{- else -}}
- {{- . -}}
- {{- end -}}
-
+
+ {{- if $profile.typeit -}}
+ {{- $id := dict "Content" . "Scratch" $.Scratch | partial "function/id.html" -}}
+
+ {{- dict $id (slice $id) | dict "typeitMap" | merge ($.Scratch.Get "this") | $.Scratch.Set "this" -}}
+ {{- else -}}
+ {{- . -}}
+ {{- end -}}
+
{{- end -}}
{{- if $profile.social -}}
-
- {{- $socialMap := resources.Get "data/social.yml" | transform.Unmarshal -}}
- {{- $socialArr := slice -}}
- {{- range $key, $value := .Site.Params.social -}}
- {{- $social := $key | lower | index $socialMap | default dict -}}
- {{- if $value -}}
- {{- if reflect.IsMap $value -}}
- {{- with $value.weight -}}
- {{- $social = dict "Weight" . | merge $social -}}
- {{- end -}}
- {{- with $value.prefix -}}
- {{- $social = dict "Prefix" . | merge $social -}}
- {{- end -}}
- {{- with $value.template -}}
- {{- $social = dict "Template" . | merge $social -}}
- {{- end -}}
- {{- with $value.id -}}
- {{- $social = dict "Id" . | merge $social -}}
- {{- end -}}
- {{- with $value.url -}}
- {{- $social = dict "Url" . | merge $social -}}
- {{- end -}}
- {{- with $value.title -}}
- {{- $social = dict "Title" . | merge $social -}}
- {{- end -}}
- {{- with $value.newtab -}}
- {{- $social = dict "Newtab" . | merge $social -}}
- {{- end -}}
- {{- with $value.icon -}}
- {{- $social = dict "Icon" . | merge $social -}}
- {{- end -}}
- {{- else if ne $value true -}}
- {{- $social = dict "Id" $value | merge $social -}}
- {{- end -}}
- {{- if $social.Icon.Simpleicons -}}
- {{- $prefix := ($.Scratch.Get "cdn" | default dict).simpleIconsPrefix -}}
- {{- $social = dict "Prefix" $prefix | dict "Icon" | merge $social -}}
- {{- end -}}
- {{- $socialArr = $socialArr | append $social -}}
- {{- end -}}
- {{- end -}}
- {{- range sort $socialArr "Weight" -}}
- {{- partial "plugin/social.html" . -}}
- {{- end -}}
-
+
+ {{- $socialMap := resources.Get "data/social.yml" | transform.Unmarshal -}}
+ {{- $socialArr := slice -}}
+ {{- range $key, $value := .Site.Params.social -}}
+ {{- $social := $key | lower | index $socialMap | default dict -}}
+ {{- if $value -}}
+ {{- if reflect.IsMap $value -}}
+ {{- with $value.weight -}}
+ {{- $social = dict "Weight" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.prefix -}}
+ {{- $social = dict "Prefix" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.template -}}
+ {{- $social = dict "Template" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.id -}}
+ {{- $social = dict "Id" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.url -}}
+ {{- $social = dict "Url" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.title -}}
+ {{- $social = dict "Title" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.newtab -}}
+ {{- $social = dict "Newtab" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.icon -}}
+ {{- $social = dict "Icon" . | merge $social -}}
+ {{- end -}}
+ {{- else if ne $value true -}}
+ {{- $social = dict "Id" $value | merge $social -}}
+ {{- end -}}
+ {{- if $social.Icon.Simpleicons -}}
+ {{- $prefix := ($.Scratch.Get "cdn" | default dict).simpleIconsPrefix -}}
+ {{- $social = dict "Prefix" $prefix | dict "Icon" | merge $social -}}
+ {{- end -}}
+ {{- $socialArr = $socialArr | append $social -}}
+ {{- end -}}
+ {{- end -}}
+ {{- range sort $socialArr "Weight" -}}
+ {{- partial "plugin/social.html" . -}}
+ {{- end -}}
+
{{- end -}}
{{- with $profile.disclaimer -}}
-
- {{- . | safeHTML -}}
-
+
+ {{- . | safeHTML -}}
+
{{- end -}}
-
+
\ No newline at end of file
diff --git a/layouts/partials/meta/author.html b/layouts/partials/meta/author.html
index e023e8ad9..15952e79c 100644
--- a/layouts/partials/meta/author.html
+++ b/layouts/partials/meta/author.html
@@ -1,4 +1,3 @@
-{{- $icon := dict "Class" "author fas fa-user-circle fa-fw" }}
{{- if .Params.authors -}}
{{- $lang := ( $.Params.lang | default $.Lang ) -}}
@@ -11,7 +10,7 @@
"lang" $lang
) -}}
{{- if gt $i 0 }}, {{ end -}}
-
+
{{- .name -}}
{{- end -}}
@@ -38,7 +37,7 @@
{{- if $avatar -}}
{{- else -}}
- {{- partial "plugin/icon.html" $icon -}}
+ {{- partial "plugin/fontawesome.html" (dict "Style" "solid" "Icon" "user-circle") -}}
{{- end -}}
{{- partial "plugin/link.html" $options -}}
{{- end -}}
diff --git a/layouts/partials/plugin/fontawesome.html b/layouts/partials/plugin/fontawesome.html
index 20f40005c..f51186177 100644
--- a/layouts/partials/plugin/fontawesome.html
+++ b/layouts/partials/plugin/fontawesome.html
@@ -1,3 +1,3 @@
-{{ $path := printf "lib/fontawesome-free/svgs/%v/%v.svg" .Style .Icon }}
-{{ $resource := (resources.Get $path).Content }}
-{{ $resource | replaceRE `
+{{- with .Fontawesome -}}
+{{- partial "plugin/fontawesome.html" . -}}
+{{- else -}}
+{{- with .Simpleicons -}}
+ {{ partial "plugin/simpleicons.html" . }}
{{- else -}}
- {{- $src := .Src -}}
- {{- with .Simpleicons -}}
- {{- $prefix := $.Prefix | default "lib/simple-icons/icons" | strings.TrimSuffix "/" -}}
- {{- $src = printf "%v/%v.svg" $prefix . -}}
- {{- end -}}
- {{- if (urls.Parse $src).Host | not -}}
- {{- $src = (resources.Get $src | minify).RelPermalink -}}
- {{- end -}}
-
+{{- with .Class -}}
+ {{- errorf "Deprecated %v" . -}}
+{{- end -}}
{{- end -}}
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/plugin/share.html b/layouts/partials/plugin/share.html
index 48d821b6b..92f3a2af5 100644
--- a/layouts/partials/plugin/share.html
+++ b/layouts/partials/plugin/share.html
@@ -4,210 +4,209 @@
{{- /* 001: Twitter */ -}}
{{- if $share.Twitter -}}
{{- end -}}
{{- /* 002: Facebook */ -}}
{{- if $share.Facebook -}}
{{- end -}}
{{- /* 003: Linkedin */ -}}
{{- if $share.Linkedin -}}
{{- end -}}
{{- /* 004: WhatsApp */ -}}
{{- if $share.Whatsapp -}}
{{- end -}}
{{- /* 005: Viber */ -}}
{{- if $share.Viber -}}
{{- end -}}
{{- /* 006: Pinterest */ -}}
{{- if $share.Pinterest -}}
{{- end -}}
{{- /* 007: Tumblr */ -}}
{{- if $share.Tumblr -}}
{{- end -}}
{{- /* 008: Hacker News */ -}}
{{- if $share.Hackernews -}}
{{- end -}}
{{- /* 009: Reddit */ -}}
{{- if $share.Reddit -}}
{{- end -}}
{{- /* 010: VK */ -}}
{{- if $share.VK -}}
{{- end -}}
{{- /* 011: Buffer */ -}}
{{- if $share.Buffer -}}
{{- end -}}
{{- /* 012: Xing */ -}}
{{- if $share.Xing -}}
{{- end -}}
{{- /* 013: Line */ -}}
{{- if $share.Line -}}
{{- end -}}
{{- /* 014: Instapaper */ -}}
{{- if $share.Instapaper -}}
{{- end -}}
{{- /* 015: Pocket */ -}}
{{- if $share.Pocket -}}
{{- end -}}
{{- /* 016: Digg */ -}}
{{- if $share.Digg -}}
{{- end -}}
{{- /* 017: StumbleUpon */ -}}
{{- if $share.Stumbleupon -}}
{{- end -}}
{{- /* 018: Flipboard */ -}}
{{- if $share.Flipboard -}}
{{- end -}}
{{- /* 019: 微博 */ -}}
{{- if $share.Weibo -}}
{{- end -}}
{{- /* 020: 人人 */ -}}
{{- if $share.Renren -}}
{{- end -}}
{{- /* 021: Myspace */ -}}
{{- if $share.Myspace -}}
{{- end -}}
{{- /* 022: Blogger */ -}}
{{- if $share.Blogger -}}
{{- end -}}
{{- /* 023: 百度 */ -}}
{{- if $share.Baidu -}}
{{- end -}}
{{- /* 024: OK.RU */ -}}
{{- if $share.Odnoklassniki -}}
{{- end -}}
{{- /* 025: Evernote */ -}}
{{- if $share.Evernote -}}
{{- end -}}
{{- /* 026: Skype */ -}}
{{- if $share.Skype -}}
{{- end -}}
{{- /* 027: Trello */ -}}
{{- if $share.Trello -}}
{{- end -}}
{{- /* 028: Mix */ -}}
{{- if $share.Mix -}}
- {{- dict "Class" "fab fa-mix fa-fw" | partial "plugin/icon.html" -}}
+ {{- partial "plugin/fontawesome.html" (dict "Style" "brands" "Icon" "mix") -}}
{{- end -}}
{{- /* 029: Telegram */ -}}
{{- if $share.Telegram -}}
{{- end -}}
{{- /* 030: Weixin */ -}}
{{- if $share.Weixin -}}
{{- end -}}
@@ -231,7 +230,6 @@
}
{{- end -}}
{{- end -}}
diff --git a/layouts/partials/plugin/simpleicons.html b/layouts/partials/plugin/simpleicons.html
new file mode 100644
index 000000000..4fce44d9a
--- /dev/null
+++ b/layouts/partials/plugin/simpleicons.html
@@ -0,0 +1,3 @@
+{{- $path := printf "lib/simple-icons/icons/%v.svg" . -}}
+{{- $resource := (resources.Get $path).Content -}}
+{{- $resource | replaceRE `
- {{- $menus := $.Site.Menus.main | default slice -}}
- {{- with index $menus 0 -}}
- {{- $url := .URL | relLangURL -}}
- {{- with .Page -}}
- {{- $url = .RelPermalink -}}
- {{- end -}}
- {{- with $profile.avatarLinkURL -}}
- {{- $url = . -}}
- {{- end -}}
-
- {{- dict "Src" $avatar "Height" "100" "Width" "100" "Loading" "eager" | partial "plugin/image.html" -}}
-
- {{- else -}}
- {{- dict "Src" $avatar "Height" "100" "Width" "100" | partial "plugin/image.html" -}}
- {{- end -}}
-
+
+ {{- $menus := $.Site.Menus.main | default slice -}}
+ {{- with index $menus 0 -}}
+ {{- $url := .URL | relLangURL -}}
+ {{- with .Page -}}
+ {{- $url = .RelPermalink -}}
+ {{- end -}}
+ {{- with $profile.avatarLinkURL -}}
+ {{- $url = . -}}
+ {{- end -}}
+
+ {{- dict "Src" $avatar "Height" "100" "Width" "100" "Loading" "eager" | partial "plugin/image.html" -}}
+
+ {{- else -}}
+ {{- dict "Src" $avatar "Height" "100" "Width" "100" | partial "plugin/image.html" -}}
+ {{- end -}}
+
{{- end -}}
{{- with $profile.title -}}
- - {{- . | safeHTML -}} -
++ {{- . | safeHTML -}} +
{{- end -}} {{- with $profile.subtitle -}} -- {{- if $profile.typeit -}} - {{- $id := dict "Content" . "Scratch" $.Scratch | partial "function/id.html" -}} - - {{- dict $id (slice $id) | dict "typeitMap" | merge ($.Scratch.Get "this") | $.Scratch.Set "this" -}} - {{- else -}} - {{- . -}} - {{- end -}} -
++ {{- if $profile.typeit -}} + {{- $id := dict "Content" . "Scratch" $.Scratch | partial "function/id.html" -}} + + {{- dict $id (slice $id) | dict "typeitMap" | merge ($.Scratch.Get "this") | $.Scratch.Set "this" -}} + {{- else -}} + {{- . -}} + {{- end -}} +
{{- end -}} {{- if $profile.social -}} -
- {{- $socialMap := resources.Get "data/social.yml" | transform.Unmarshal -}}
- {{- $socialArr := slice -}}
- {{- range $key, $value := .Site.Params.social -}}
- {{- $social := $key | lower | index $socialMap | default dict -}}
- {{- if $value -}}
- {{- if reflect.IsMap $value -}}
- {{- with $value.weight -}}
- {{- $social = dict "Weight" . | merge $social -}}
- {{- end -}}
- {{- with $value.prefix -}}
- {{- $social = dict "Prefix" . | merge $social -}}
- {{- end -}}
- {{- with $value.template -}}
- {{- $social = dict "Template" . | merge $social -}}
- {{- end -}}
- {{- with $value.id -}}
- {{- $social = dict "Id" . | merge $social -}}
- {{- end -}}
- {{- with $value.url -}}
- {{- $social = dict "Url" . | merge $social -}}
- {{- end -}}
- {{- with $value.title -}}
- {{- $social = dict "Title" . | merge $social -}}
- {{- end -}}
- {{- with $value.newtab -}}
- {{- $social = dict "Newtab" . | merge $social -}}
- {{- end -}}
- {{- with $value.icon -}}
- {{- $social = dict "Icon" . | merge $social -}}
- {{- end -}}
- {{- else if ne $value true -}}
- {{- $social = dict "Id" $value | merge $social -}}
- {{- end -}}
- {{- if $social.Icon.Simpleicons -}}
- {{- $prefix := ($.Scratch.Get "cdn" | default dict).simpleIconsPrefix -}}
- {{- $social = dict "Prefix" $prefix | dict "Icon" | merge $social -}}
- {{- end -}}
- {{- $socialArr = $socialArr | append $social -}}
- {{- end -}}
- {{- end -}}
- {{- range sort $socialArr "Weight" -}}
- {{- partial "plugin/social.html" . -}}
- {{- end -}}
-
+
+ {{- $socialMap := resources.Get "data/social.yml" | transform.Unmarshal -}}
+ {{- $socialArr := slice -}}
+ {{- range $key, $value := .Site.Params.social -}}
+ {{- $social := $key | lower | index $socialMap | default dict -}}
+ {{- if $value -}}
+ {{- if reflect.IsMap $value -}}
+ {{- with $value.weight -}}
+ {{- $social = dict "Weight" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.prefix -}}
+ {{- $social = dict "Prefix" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.template -}}
+ {{- $social = dict "Template" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.id -}}
+ {{- $social = dict "Id" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.url -}}
+ {{- $social = dict "Url" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.title -}}
+ {{- $social = dict "Title" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.newtab -}}
+ {{- $social = dict "Newtab" . | merge $social -}}
+ {{- end -}}
+ {{- with $value.icon -}}
+ {{- $social = dict "Icon" . | merge $social -}}
+ {{- end -}}
+ {{- else if ne $value true -}}
+ {{- $social = dict "Id" $value | merge $social -}}
+ {{- end -}}
+ {{- if $social.Icon.Simpleicons -}}
+ {{- $prefix := ($.Scratch.Get "cdn" | default dict).simpleIconsPrefix -}}
+ {{- $social = dict "Prefix" $prefix | dict "Icon" | merge $social -}}
+ {{- end -}}
+ {{- $socialArr = $socialArr | append $social -}}
+ {{- end -}}
+ {{- end -}}
+ {{- range sort $socialArr "Weight" -}}
+ {{- partial "plugin/social.html" . -}}
+ {{- end -}}
+
{{- end -}}
{{- with $profile.disclaimer -}}
-