feat: improve configuration (#245)

* feat: improve configuration * fix: fix partials/footer.html error
2020-04-21 22:55:06 +08:00
parent 8a0e61085c
commit f14301c395
62 changed files with 1548 additions and 1669 deletions
--- a/layouts/partials/plugin/icon.html
+++ b/layouts/partials/plugin/icon.html
@@ -12,14 +12,14 @@
    {{- end -}}
    {{- $classList = $newClassList -}}
    {{- with .scratch -}}
-        {{- .Set "forkawesome" true -}}
+        {{- dict "forkawesome" true | merge (.Get "this") | .Set "this" -}}
    {{- end -}}

 {{- /* default is Font Awesome */ -}}
 {{- /* Others */ -}}
 {{- else if ne $type "fa" -}}
    {{- with .scratch -}}
-        {{- .Set "iconfont" true -}}
+        {{- dict "iconfont" true | merge (.Get "this") | .Set "this" -}}
    {{- end -}}
 {{- end -}}
 <i class="{{ delimit $classList ` ` }}"></i>