From 72948a55f00bd4154c1d0e381a22c30e01b4bc5f Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 30 May 2017 12:24:38 +0200
Subject: [PATCH] Move link rel canonical from meta.html that is cached and add
 it directly in baseof.html

---
 layouts/_default/baseof.html | 3 ++-
 layouts/_default/full.html   | 2 --
 layouts/_default/list.html   | 2 +-
 layouts/_default/single.html | 2 +-
 layouts/partials/meta.html   | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0dc95cc..d36a352 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -4,7 +4,8 @@
 <meta charset="utf-8">
 <title>{{ block "title" . }}{{ .Title }} – {{ .Site.Title }}{{ end }}</title>
 {{ block "meta" . }}{{ end }}
-{{ partialCached "meta.html" . -}}
+{{- partialCached "meta.html" . -}}
+<link rel="canonical" href="{{ .Permalink }}">
 </head>
 
 <body class="{{ if $.Param "sidebar" | default true }}one-sidebar sidebar-second{{ else }}no-sidebars{{ end }}">
diff --git a/layouts/_default/full.html b/layouts/_default/full.html
index 321b699..b48bfeb 100644
--- a/layouts/_default/full.html
+++ b/layouts/_default/full.html
@@ -7,5 +7,3 @@
 {{ .Content }}
 </div>
 </article>
-
-
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index c66dc91..5229a93 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,5 @@
 {{ define "meta" }}
-{{ partial "section_meta.html" . -}}
+{{- partial "section_meta.html" . -}}
 {{ end }}
 
 {{ define "main" -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 80ed6fc..ebe82ff 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,5 @@
 {{ define "meta" }}
-{{ partial "single_meta.html" . -}}
+{{- partial "single_meta.html" . -}}
 {{ end }}
 
 {{ define "main" -}}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 0a0690c..8663af9 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -4,5 +4,4 @@
 {{ .Hugo.Generator }}
 {{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
 <link rel="stylesheet" href="/css/styles.css{{ if $.Param "cacheBustCSS" }}?{{ readFile "/public/css/styles.css" | sha1 }}{{ end }}">
-<link rel="canonical" href="{{ .Permalink }}">
 <link rel="apple-touch-icon" href="/apple-touch-icon.png">