From 46561a663a6a255eb561ea78e94b5e6db46f1ba0 Mon Sep 17 00:00:00 2001
From: John Feminella <jxf@jxf.me>
Date: Mon, 08 Aug 2022 22:10:32 +0000
Subject: [PATCH] Fix #708 by restoring `<head>` to `baseof.html` with template structure (#710)
---
layouts/partials/home/extensions.html | 4 ++++
layouts/_default/baseof.html | 5 ++++-
layouts/partials/home.html | 2 ++
layouts/partials/head.html | 26 +++++++++++---------------
4 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 1cd58bf..e22338d 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,6 +1,9 @@
<!DOCTYPE html>
<html lang="{{ .Site.Language.Lang }}">
-{{ partial "head.html" . }}
+ <head>
+ <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+ {{ partial "head.html" . }}
+ </head>
{{ $csClass := "colorscheme-light" }}
{{ if eq .Site.Params.colorScheme "dark" }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index a966403..9a9cc31 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,23 +1,19 @@
-<head>
- {{ partial "head/meta-tags.html" . }}
+{{ partial "head/meta-tags.html" . }}
- <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+{{ if .Permalink }}
+<link rel="canonical" href="{{ .Permalink }}">
+{{ end }}
- {{ if .Permalink }}
- <link rel="canonical" href="{{ .Permalink }}">
- {{ end }}
+{{ partialCached "head/theme-styles.html" . }}
- {{ partialCached "head/theme-styles.html" . }}
+{{ partialCached "head/color-scheme.html" . }}
- {{ partialCached "head/color-scheme.html" . }}
+{{ partialCached "head/custom-styles.html" . }}
- {{ partialCached "head/custom-styles.html" . }}
+{{ partialCached "head/custom-icons.html" . }}
- {{ partialCached "head/custom-icons.html" . }}
+{{ partial "head/alternative-output-formats.html" . }}
- {{ partial "head/alternative-output-formats.html" . }}
+{{ partialCached "head/hugo-generator.html" . }}
- {{ partialCached "head/hugo-generator.html" . }}
-
- {{ partial "head/extensions.html" . }}
-</head>
+{{ partial "head/extensions.html" . }}
diff --git a/layouts/partials/home.html b/layouts/partials/home.html
index 85ca04e..8f178c8 100644
--- a/layouts/partials/home.html
+++ b/layouts/partials/home.html
@@ -6,4 +6,6 @@
{{ partialCached "home/social.html" . }}
</div>
+
+ {{ partialCached "home/extensions.html" . }}
</section>
diff --git a/layouts/partials/home/extensions.html b/layouts/partials/home/extensions.html
new file mode 100644
index 0000000..ba42ccb
--- /dev/null
+++ b/layouts/partials/home/extensions.html
@@ -0,0 +1,4 @@
+{{/*
+You can add further theme extensions or customizations here if they should
+appear in after the "about" section.
+*/}}
--
Gitblit v1.10.0