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" }}

404: Page not found

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" }}

{{ .Title }}

{{ .Content }}
-{{- end -}} +{{ end }} -{{- define "footer" -}} -{{- end -}} +{{ define "footer" }} +{{ end }} diff --git a/layouts/index.html b/layouts/index.html index 4a5126c..8a2b521 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,10 +1,10 @@ -{{ define "header" -}} +{{ define "header" }} {{ partial "header.html" . }} -{{- end }} +{{ 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 }} diff --git a/layouts/partials/header/meta.html b/layouts/partials/header/meta.html index 7783a1d..b48b689 100644 --- a/layouts/partials/header/meta.html +++ b/layouts/partials/header/meta.html @@ -4,15 +4,15 @@ {{ "" | safeHTML }} {{ .Hugo.Generator }} -{{- if .IsHome }} - {{ $.Scratch.Set "theTitle" .Site.Title -}} +{{ if .IsHome }} + {{ $.Scratch.Set "theTitle" .Site.Title }} {{else}} {{ $.Scratch.Add "theTitle" .Title}} {{ $.Scratch.Add "theTitle" " • "}} {{ $.Scratch.Add "theTitle" .Site.Title}} -{{- end -}} +{{ end }} {{ $.Scratch.Get "theTitle" }} -{{ with .Site.Params.meta.description -}}{{- end }} -{{ with .Site.Params.meta.keywords -}}{{- end }} +{{ with .Site.Params.meta.description }}{{ end }} +{{ with .Site.Params.meta.keywords }}{{ end }} {{ template "_internal/twitter_cards.html" . }} {{ template "_internal/opengraph.html" . }} diff --git a/layouts/partials/header/styles-highlight.html b/layouts/partials/header/styles-highlight.html index 0d5ed5c..0019af2 100644 --- a/layouts/partials/header/styles-highlight.html +++ b/layouts/partials/header/styles-highlight.html @@ -1,8 +1,8 @@ -{{- if .Site.Params.highlightjs -}} +{{ if .Site.Params.highlightjs }} -{{- end -}} -{{ if .Site.Params.PygmentsUseClasses -}} +{{ end }} +{{ if .Site.Params.PygmentsUseClasses }} -{{- end }} +{{ end }} diff --git a/layouts/partials/highlight-js.html b/layouts/partials/highlight-js.html index 8baa9e7..b9a529a 100644 --- a/layouts/partials/highlight-js.html +++ b/layouts/partials/highlight-js.html @@ -1,4 +1,4 @@ -{{ if .Site.Params.highlightjs -}} +{{ if .Site.Params.highlightjs }} {{ with .Site.Params.highlightjslanguages }} @@ -7,4 +7,4 @@ hljs.configure({languages: []}); hljs.initHighlightingOnLoad(); -{{- end }} +{{ end }} diff --git a/layouts/partials/page-list/content.html b/layouts/partials/page-list/content.html index 6a4b027..e340c4f 100644 --- a/layouts/partials/page-list/content.html +++ b/layouts/partials/page-list/content.html @@ -1,6 +1,6 @@ {{ .Title }} diff --git a/layouts/partials/page-list/footer.html b/layouts/partials/page-list/footer.html index 02a8bdc..2579155 100644 --- a/layouts/partials/page-list/footer.html +++ b/layouts/partials/page-list/footer.html @@ -1,5 +1,5 @@ -{{ if .Site.GoogleAnalytics -}} +{{ if .Site.GoogleAnalytics }} - {{- template "_internal/google_analytics_async.html" . -}} -{{- end }} + {{ template "_internal/google_analytics_async.html" . }} +{{ end }} {{ partial "footer/font-awesome-js.html" . }} diff --git a/layouts/partials/page-single/content.html b/layouts/partials/page-single/content.html index 241786a..7e1e2d3 100644 --- a/layouts/partials/page-single/content.html +++ b/layouts/partials/page-single/content.html @@ -6,12 +6,12 @@ {{.}} {{ end }} - {{ partial "page-single/post-meta-top.html" . }} + {{ partial "page-single/post-meta.html" . }}
{{ .Content }}
- {{ partial "page-single/post-meta-bottom.html" . }} + {{ partial "page-single/post-navigation.html" . }} {{ partial "page-single/post-related.html" . }} - {{- partial "page-single/post-comment.html" . -}} + {{ partial "page-single/post-comment.html" . }} diff --git a/layouts/partials/page-single/footer.html b/layouts/partials/page-single/footer.html index 7eb9392..4cad938 100644 --- a/layouts/partials/page-single/footer.html +++ b/layouts/partials/page-single/footer.html @@ -1,6 +1,6 @@ -{{ if .Site.GoogleAnalytics -}} +{{ if .Site.GoogleAnalytics }} - {{- template "_internal/google_analytics_async.html" . -}} -{{- end }} + {{ template "_internal/google_analytics_async.html" . }} +{{ end }} {{ partial "footer/font-awesome-js.html" . }} {{ partial "highlight-js.html" . }} diff --git a/layouts/partials/page-single/post-comment.html b/layouts/partials/page-single/post-comment.html index 19b58df..4c942af 100644 --- a/layouts/partials/page-single/post-comment.html +++ b/layouts/partials/page-single/post-comment.html @@ -1,7 +1,7 @@ -{{- if ne .Params.showcomments false -}} - {{ if .Site.DisqusShortname -}} - {{- partial "page-single/comment/disqus.html" . -}} - {{- else if .Site.Params.GraphCommentId -}} - {{- partial "page-single/comment/graphcomment.html" . -}} - {{- end -}} -{{- end }} +{{ if ne .Params.showcomments false }} + {{ if .Site.DisqusShortname }} + {{ partial "page-single/comment/disqus.html" . }} + {{ else if .Site.Params.GraphCommentId }} + {{ partial "page-single/comment/graphcomment.html" . }} + {{ end }} +{{ end }} diff --git a/layouts/partials/page-single/post-navigation.html b/layouts/partials/page-single/post-navigation.html index 874812b..5ae2a9b 100644 --- a/layouts/partials/page-single/post-navigation.html +++ b/layouts/partials/page-single/post-navigation.html @@ -1,17 +1,17 @@ {{ $enabledPostNavigation := .Site.Params.postNavigation | default true }} {{ if $enabledPostNavigation }}
- {{ 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 }}

Related Articles

diff --git a/layouts/partials/portfolio/footer.html b/layouts/partials/portfolio/footer.html index 02a8bdc..2579155 100644 --- a/layouts/partials/portfolio/footer.html +++ b/layouts/partials/portfolio/footer.html @@ -1,5 +1,5 @@ -{{ if .Site.GoogleAnalytics -}} +{{ if .Site.GoogleAnalytics }} - {{- template "_internal/google_analytics_async.html" . -}} -{{- end }} + {{ template "_internal/google_analytics_async.html" . }} +{{ end }} {{ partial "footer/font-awesome-js.html" . }} diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 797f324..a0e6c3a 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,6 +1,6 @@