diff --git a/layouts/404.html b/layouts/404.html index 6f6f3a1..a405573 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,3 +1,3 @@ -{{ define "main" }} +{{- define "main" }}
404
-{{ end }}{{/* end main */}} \ No newline at end of file +{{- end }}{{/* end main */ -}} diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 5daf2aa..f69b272 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -20,7 +20,7 @@

{{- .Key }}  {{ len .Pages }}

- {{- range .Pages }} + {{- range .Pages }} {{- if eq .Kind "page" }}

@@ -40,4 +40,4 @@ {{- end }} {{- end }} -{{- end }}{{/* end main */}} +{{- end }}{{/* end main */}} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8f17b93..20c6fbf 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -13,12 +13,11 @@ {{- print " dark" }} {{- end -}} " id="top"> - {{- partialCached "header.html" . .Page}} + {{- partialCached "header.html" . .Page -}}
- {{- block "main" . }} - {{- end }} + {{- block "main" . }}{{ end }}
- {{- partialCached "footer.html" . .Type .Layout .Params }} + {{ partialCached "footer.html" . .Type .Layout .Params -}} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a1905b5..0131412 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -20,15 +20,15 @@ {{- if .IsHome }} {{- $pages = where site.RegularPages "Type" "in" site.Params.mainSections }} -{{- end}} +{{- end }} -{{ $paginator := .Paginate $pages }} +{{- $paginator := .Paginate $pages }} {{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} {{- partial "home_info.html" . }} {{- end }} -{{ $term := .Data.Term}} +{{- $term := .Data.Term }} {{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} @@ -41,17 +41,17 @@ {{- end }}
- {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList)}} + {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList) }} {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }}

- {{ .Title }} - {{- if .Draft }}
  [draft]
{{- end }} + {{- .Title }} + {{- if .Draft }}
  [draft]
{{ end -}}

- {{- if (ne (.Param "hideSummary") true)}} + {{- if (ne (.Param "hideSummary") true) }}
-

{{ .Summary | plainify | htmlUnescape }}{{- if .Truncated }}...{{- end -}}

+

{{ .Summary | plainify | htmlUnescape }}{{ if .Truncated }}...{{ end }}

{{- end }} {{- if not (.Param "hideMeta") }} @@ -75,5 +75,7 @@ {{- end }} -{{end}}{{/* end profileMode */}} + +{{- end }}{{/* end profileMode */}} + {{- end }}{{- /* end main */ -}} diff --git a/layouts/_default/search.html b/layouts/_default/search.html index ae9ba06..e3dc7d4 100644 --- a/layouts/_default/search.html +++ b/layouts/_default/search.html @@ -17,11 +17,11 @@ - {{- end}} + {{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b3f8d46..db2374a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,7 +2,7 @@
- {{- partial "breadcrumbs.html" . }} + {{ partial "breadcrumbs.html" . }}

{{ .Title }} {{- if .Draft }}
  [draft]
{{- end }} @@ -14,13 +14,13 @@ {{- end }} {{- if not (.Param "hideMeta") }} - {{- end}} + {{- end }}

- {{- $isHidden := .Params.cover.hidden | default .Site.Params.cover.hiddenInSingle | default .Site.Params.cover.hidden}} + {{- $isHidden := .Params.cover.hidden | default .Site.Params.cover.hiddenInSingle | default .Site.Params.cover.hidden }} {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden) }} {{- if (.Param "ShowToc") }} {{- partial "toc.html" . }} @@ -41,24 +41,24 @@ {{- if and (gt (len $pages) 1) (in $pages . ) }} {{- end }} {{- end }} - {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true) ) }} - {{- partial "share_icons.html" . }} + {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true)) }} + {{- partial "share_icons.html" . -}} {{- end }} @@ -67,4 +67,4 @@ {{- end }}
-{{- end }}{{/* end main */}} +{{- end }}{{/* end main */}} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index b091987..d5a9e66 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,4 +1,4 @@ -{{ define "main" }} +{{- define "main" }} {{- if .Title }}

-
\ No newline at end of file +
diff --git a/layouts/partials/translation_list.html b/layouts/partials/translation_list.html index a2c2d86..5e807a9 100644 --- a/layouts/partials/translation_list.html +++ b/layouts/partials/translation_list.html @@ -1,9 +1,9 @@ {{- if .IsTranslated -}} -{{- if (ne .Layout "search")}} +{{- if (ne .Layout "search") }} {{- if or .Params.author $.Site.Params.author (.Param "ShowReadingTime") (not .Date.IsZero) }} | {{- end -}} {{- end }} -{{- end }} +{{- end -}}