diff --git a/head.html.old b/head.html.old
new file mode 100644
index 0000000..92b9ac4
--- /dev/null
+++ b/head.html.old
@@ -0,0 +1,157 @@
+
+ {{/* Instant Page Script */}}
+ {{/* Optimised by A Friend */}}
+
+
+
+ {{ with .Site.Language.Params.htmlCode | default .Site.LanguageCode }}
+
+ {{ end }}
+
+
+ {{/* Title */}}
+ {{ if .IsHome -}}
+ {{ .Site.Title | emojify }}
+
+ {{- else -}}
+ {{ .Title | emojify }} · {{ .Site.Title | emojify }}
+
+ {{- end }}
+ {{/* Metadata */}}
+ {{ with .Site.Params.description -}}
+
+ {{- end }}
+ {{ with .Site.Params.keywords -}}
+
+ {{- end }}
+ {{ with .Site.Params.robots }}
+
+ {{ end }}
+ {{ with .Params.robots }}
+
+ {{ end }}
+
+ {{ range .AlternativeOutputFormats -}}
+ {{ printf `
+ ` .Rel .MediaType.Type .RelPermalink ($.Site.Title | emojify) |
+ safeHTML }}
+ {{ end -}}
+ {{/* Asset bundles */}}
+ {{ $assets := newScratch }}
+ {{ $cssScheme := resources.Get (printf "css/schemes/%s.css" (.Site.Params.colorScheme | default "blowfish")) }}
+ {{ if not $cssScheme }}
+ {{ $cssScheme = resources.Get "css/schemes/blowfish.css" }}
+ {{ end }}
+ {{ $assets.Add "css" (slice $cssScheme) }}
+ {{ $cssMain := resources.Get "css/compiled/main.css" }}
+ {{ $assets.Add "css" (slice $cssMain) }}
+ {{ $cssCustom := resources.Get "css/custom.css" }}
+ {{ if $cssCustom }}
+ {{ $assets.Add "css" (slice $cssCustom) }}
+ {{ end }}
+ {{ $bundleCSS := $assets.Get "css" | resources.Concat "css/main.bundle.css" | resources.Minify | resources.Fingerprint
+ "sha512" }}
+
+ {{ $jsAppearance := resources.Get "js/appearance.js" }}
+ {{ $jsAppearance = $jsAppearance | resources.Minify | resources.Fingerprint "sha512" }}
+
+ {{ if .Site.Params.enableSearch | default false }}
+ {{ $jsFuse := resources.Get "lib/fuse/fuse.min.js" }}
+ {{ $jsSearch := resources.Get "js/search.js" }}
+ {{ $assets.Add "js" (slice $jsFuse $jsSearch) }}
+ {{ end }}
+ {{ if .Site.Params.enableCodeCopy | default false }}
+ {{ $jsCode := resources.Get "js/code.js" }}
+ {{ $assets.Add "js" (slice $jsCode) }}
+ {{ end }}
+ {{ if .Site.Params.rtl | default false }}
+ {{ $jsRTL := resources.Get "js/rtl.js" }}
+ {{ $assets.Add "js" (slice $jsRTL) }}
+ {{ end }}
+ {{ if $assets.Get "js" }}
+ {{ $bundleJS := $assets.Get "js" | resources.Concat "js/main.bundle.js" | resources.Minify | resources.Fingerprint
+ "sha512" }}
+
+ {{ end }}
+
+ {{/* Icons */}}
+ {{ if templates.Exists "partials/favicons.html" }}
+ {{ partialCached "favicons.html" .Site }}
+ {{ else }}
+
+
+
+
+ {{ end }}
+ {{/* Site Verification */}}
+ {{ with .Site.Params.verification.google }}
+
+ {{ end }}
+ {{ with .Site.Params.verification.bing }}
+
+ {{ end }}
+ {{ with .Site.Params.verification.pinterest }}
+
+ {{ end }}
+ {{ with .Site.Params.verification.yandex }}
+
+ {{ end }}
+ {{/* Social */}}
+ {{ template "_internal/opengraph.html" . }}
+ {{ template "_internal/twitter_cards.html" . }}
+ {{/* Schema */}}
+ {{ partial "schema.html" . }}
+ {{/* Me */}}
+ {{ with .Site.Author.name }}
+ {{ end }}
+ {{ with .Site.Author.links }}
+ {{ range $links := . }}
+ {{ range $name, $url := $links }}
+ {{ end }}
+ {{ end }}
+ {{ end }}
+ {{/* Vendor */}}
+ {{ partial "vendor.html" . }}
+ {{/* Analytics */}}
+ {{ partialCached "analytics.html" .Site }}
+ {{/* Extend head - eg. for custom analytics scripts, etc. */}}
+ {{ if templates.Exists "partials/extend-head.html" }}
+ {{ partialCached "extend-head.html" .Site }}
+ {{ end }}
+
+ {{/* Firebase */}}
+ {{ with $.Site.Params.firebase }}
+ {{ if isset $.Site.Params "firebase" }}
+
+
+
+
+ {{ end }}
+ {{ end }}
+
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 92b9ac4..3567bab 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,14 +1,4 @@
- {{/* Instant Page Script */}}
- {{/* Optimised by A Friend */}}
-
-
{{ with .Site.Language.Params.htmlCode | default .Site.LanguageCode }}
@@ -24,11 +14,11 @@
{{- end }}
{{/* Metadata */}}
- {{ with .Site.Params.description -}}
+ {{ with (.Params.Summary | default .Params.Description) | default .Site.Params.description -}}
{{- end }}
- {{ with .Site.Params.keywords -}}
-
+ {{ with .Params.Tags | default .Site.Params.keywords -}}
+
{{- end }}
{{ with .Site.Params.robots }}
@@ -60,7 +50,7 @@
{{ $jsAppearance := resources.Get "js/appearance.js" }}
- {{ $jsAppearance = $jsAppearance | resources.Minify | resources.Fingerprint "sha512" }}
+ {{ $jsAppearance = $jsAppearance | resources.ExecuteAsTemplate $jsAppearance.RelPermalink . | resources.Minify | resources.Fingerprint "sha512" }}
{{ if .Site.Params.enableSearch | default false }}
@@ -83,7 +73,7 @@
integrity="{{ $bundleJS.Data.Integrity }}" data-copy="{{ i18n " code.copy" }}" data-copied="{{ i18n " code.copied"
}}">
{{ end }}
-
+
{{/* Icons */}}
{{ if templates.Exists "partials/favicons.html" }}
{{ partialCached "favicons.html" .Site }}
@@ -123,12 +113,12 @@
{{/* Vendor */}}
{{ partial "vendor.html" . }}
{{/* Analytics */}}
- {{ partialCached "analytics.html" .Site }}
+ {{ partial "analytics/main.html" .Site }}
{{/* Extend head - eg. for custom analytics scripts, etc. */}}
{{ if templates.Exists "partials/extend-head.html" }}
{{ partialCached "extend-head.html" .Site }}
{{ end }}
-
+
{{/* Firebase */}}
{{ with $.Site.Params.firebase }}
{{ if isset $.Site.Params "firebase" }}
@@ -152,6 +142,17 @@
var auth = firebase.auth();
+ {{/* Instant Page Script */}}
+ {{/* Optimised by A Friend */}}
+
+
+
{{ end }}
{{ end }}
diff --git a/themes/blowfish b/themes/blowfish
index 7df0184..aa03e67 160000
--- a/themes/blowfish
+++ b/themes/blowfish
@@ -1 +1 @@
-Subproject commit 7df01846210fb56fc8ba2bcadea53317505094bb
+Subproject commit aa03e677db8ae083906cffececb14ec1db4dc879