diff --git a/layouts/404.html b/layouts/404.html
index e76d3fe..d748ef9 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,11 +1,11 @@
-{{ define "header" -}}
+{{ define "header" }}
{{ partial "header.html" . }}
-{{- end }}
+{{ end }}
-{{ define "content" -}}
+{{ define "content" }}
Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. Head back home to try finding it again.
-{{- end }}
+{{ end }}
-{{ define "footer" -}}
-{{- end }}
\ No newline at end of file
+{{ define "footer" }}
+{{ end }}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index fe67639..ad56dd0 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,11 +1,11 @@
- {{ block "header" . -}}{{- end }}
+ {{ block "header" . }}{{ end }}
- {{ partial "sidebar.html" . -}}
+ {{ partial "sidebar.html" . }}
- {{ block "content" . -}}{{- end }}
+ {{ block "content" . }}{{ end }}
- {{ block "footer" . -}}{{- end }}
+ {{ block "footer" . }}{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 53430a0..ae45e65 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,11 +1,11 @@
-{{ define "header" -}}
+{{ define "header" }}
{{ partial "header.html" . }}
-{{- end -}}
+{{ end }}
-{{ define "content" -}}
+{{ define "content" }}
{{ partial "page-list/content.html" . }}
-{{- end -}}
+{{ end }}
-{{ define "footer" -}}
+{{ define "footer" }}
{{ partial "page-list/footer.html" . }}
-{{- end }}
+{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 0f38911..0836e29 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,13 +1,13 @@
-{{ define "header" -}}
+{{ define "header" }}
{{ partial "page-single/variables-init.html" . }}
{{ partial "header.html" . }}
-{{- end -}}
+{{ end }}
-{{ define "content" -}}
+{{ define "content" }}
{{ partial "page-single/content.html" . }}
-{{- end -}}
+{{ end }}
-{{ define "footer" -}}
+{{ define "footer" }}
{{ partial "page-single/footer.html" . }}
{{ partial "page-single/variables-deinit.html" . }}
-{{- end -}}
+{{ end }}
diff --git a/layouts/about/single.html b/layouts/about/single.html
index 3e3aa96..74ef975 100644
--- a/layouts/about/single.html
+++ b/layouts/about/single.html
@@ -1,13 +1,13 @@
-{{- define "header" -}}
- {{- partial "header.html" . -}}
-{{- end -}}
+{{ define "header" }}
+ {{ partial "header.html" . }}
+{{ end }}
-{{- define "content" -}}
+{{ define "content" }}
- {{ range (where .Data.Pages "Type" "not in" (slice "about" "portfolio")).GroupBy "Section" -}}
+ {{ range (where .Data.Pages "Type" "not in" (slice "about" "portfolio")).GroupBy "Section" }}
{{ range .Pages }}
@@ -14,21 +14,21 @@
{{ .Date.Format (.Site.Params.dateformat | default "Jan 02, 2006") }}
{{ .Summary }}
- {{ if .Truncated -}}
+ {{ if .Truncated }}
- {{- end }}
+ {{ end }}
- {{- end -}}
- {{- end }}
+ {{ end }}
+ {{ end }}
-{{- end }}
+{{ end }}
-{{ define "footer" -}}
-{{ if .Site.GoogleAnalytics -}}
+{{ define "footer" }}
+{{ if .Site.GoogleAnalytics }}
- {{- template "_internal/google_analytics_async.html" . -}}
-{{- end }}
+ {{ template "_internal/google_analytics_async.html" . }}
+{{ end }}
{{ partial "footer/font-awesome-js.html" . }}
-{{- end }}
+{{ end }}
diff --git a/layouts/partials/header/feeds.html b/layouts/partials/header/feeds.html
index 4790ed5..f60462c 100644
--- a/layouts/partials/header/feeds.html
+++ b/layouts/partials/header/feeds.html
@@ -1,4 +1,4 @@
-{{- if .RSSLink -}}
+{{ if .RSSLink }}
- {{ with .PrevInSection -}}
+ {{ with .PrevInSection }}
{{ .Title }}
- {{- end }}
- {{ with .NextInSection -}}
+ {{ end }}
+ {{ with .NextInSection }}
{{ .Title }}
- {{- end }}
+ {{ end }}
{{ end }}
diff --git a/layouts/partials/page-single/post-related.html b/layouts/partials/page-single/post-related.html
index 2a1f726..aecfb38 100644
--- a/layouts/partials/page-single/post-related.html
+++ b/layouts/partials/page-single/post-related.html
@@ -1,6 +1,6 @@
{{ if .Site.Params.relatedPosts }}
{{ $related := .Site.RegularPages.Related . | first 5 }}
-{{ with $related -}}
+{{ with $related }}