From f5b68c452f6df102ee2e40e638cb8988798099ef Mon Sep 17 00:00:00 2001
From: Track3 <pengliabc@live.cn>
Date: Mon, 31 Dec 2018 17:09:40 +0800
Subject: Add more customizations

---
 layouts/_default/baseof.html    | 28 +++++++++++++---------------
 layouts/partials/analytics.html |  2 +-
 layouts/partials/favicons.html  |  6 ++++++
 3 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 layouts/partials/favicons.html

(limited to 'layouts')

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6758c98..976b786 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -9,27 +9,22 @@
 	<meta name="theme-color" content="{{.}}">
 	<meta name="msapplication-TileColor" content="{{.}}">
 	{{- end }}
-	{{ template "_internal/schema.html" . -}}
-	{{ template "_internal/opengraph.html" . -}}
-	{{ template "_internal/twitter_cards.html" . -}}
-	<link rel="apple-touch-icon" sizes="180x180" href="{{"apple-touch-icon.png" | relURL}}">
-	<link rel="icon" type="image/png" sizes="32x32" href="{{"favicon-32x32.png" | relURL}}">
-	<link rel="icon" type="image/png" sizes="16x16" href="{{"favicon-16x16.png" | relURL}}">
-	<link rel="manifest" href="{{"site.webmanifest" | relURL}}">
-	<link rel="mask-icon" href="{{"safari-pinned-tab.svg" | relURL}}" color="{{.Site.Params.themeColor}}">
-	<link rel="shortcut icon" href="{{"favicon.ico" | relURL}}">
+	{{- template "_internal/schema.html" . }}
+	{{- template "_internal/opengraph.html" . }}
+	{{- template "_internal/twitter_cards.html" . }}
+	{{- partial "favicons.html" }}
 	<title>{{.Title}}</title>
 	{{ range .AlternativeOutputFormats -}}
 		{{ printf `<link rel="%s" type="%s+%s" href="%s" title="%s" />` .Rel .MediaType.Type .MediaType.Suffix .Permalink $.Site.Title | safeHTML }}
 	{{ end -}}
 	{{ $style := resources.Get "scss/style.scss" | resources.ExecuteAsTemplate "css/style.css" . | toCSS | minify | fingerprint -}}
 	<link rel="stylesheet" href="{{ $style.Permalink }}" {{ printf "integrity=%q" $style.Data.Integrity | safeHTMLAttr }}>
-	{{ block "head" . -}}{{- end }}
-	{{ range .Site.Params.CustomCSS -}}
-		<link rel="stylesheet" href="{{ . | absURL }}">
+	{{- block "head" . -}}{{- end }}
+	{{- range .Site.Params.customCSS }}
+	<link rel="stylesheet" href="{{ . | absURL }}">
 	{{- end }}
-	{{ if templates.Exists "partials/extra-headers.html" -}}
-		{{ partial "extra-headers.html" . }}
+	{{- if templates.Exists "partials/extra-head.html" -}}
+	{{ partial "extra-head.html" . }}
 	{{- end }}
 </head>
 
@@ -39,7 +34,10 @@
 	{{ block "footer" . -}}{{ end }}
 	{{ $script := resources.Get "js/main.js" | minify | fingerprint -}}
 	<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }}></script>
-	{{ partial "analytics.html" }}
+	{{- partial "analytics.html" }}
+	{{- if templates.Exists "partials/extra-foot.html" -}}
+	{{ partial "extra-foot.html" . }}
+	{{- end }}
 </body>
 
 </html>
diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
index f13b4a0..b1f9af8 100644
--- a/layouts/partials/analytics.html
+++ b/layouts/partials/analytics.html
@@ -1 +1 @@
-{{ template "_internal/google_analytics_async.html" . }}
\ No newline at end of file
+{{ template "_internal/google_analytics_async.html" . }}
diff --git a/layouts/partials/favicons.html b/layouts/partials/favicons.html
new file mode 100644
index 0000000..27f5226
--- /dev/null
+++ b/layouts/partials/favicons.html
@@ -0,0 +1,6 @@
+	<link rel="apple-touch-icon" sizes="180x180" href="{{"apple-touch-icon.png" | relURL}}">
+	<link rel="icon" type="image/png" sizes="32x32" href="{{"favicon-32x32.png" | relURL}}">
+	<link rel="icon" type="image/png" sizes="16x16" href="{{"favicon-16x16.png" | relURL}}">
+	<link rel="manifest" href="{{"site.webmanifest" | relURL}}">
+	<link rel="mask-icon" href="{{"safari-pinned-tab.svg" | relURL}}" color="{{.Site.Params.themeColor}}">
+	<link rel="shortcut icon" href="{{"favicon.ico" | relURL}}">
-- 
cgit v1.2.3