diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 5941551..f09577e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,21 +1,22 @@ {{ define "main" }} -
- {{ .Content }} -
-
- -
+
+ {{ .Content }} +
+
+ +
{{ end }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 21511de..367c35a 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -1,21 +1,22 @@ {{ define "title" }} -

{{ .Data.Singular | humanize }}: {{ lower .Title | markdownify }}

+

{{ .Data.Singular | humanize }}: {{ lower .Title | markdownify }}

{{ end }} {{ define "main" }} -
- -
+
+ +
{{ end }} diff --git a/layouts/blog/list.html b/layouts/blog/list.html index d3aea07..e652c3d 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -1,31 +1,32 @@ {{ define "main" }} -
- {{ .Content }} -
-
- {{ if .Site.Params.home.showLatest | default true }} -

{{ i18n "index_blog_latestPosts" . }}

- {{ range first 1 .Pages.ByPublishDate.Reverse }} -
{{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}{{ end }} -

- - {{ .Title | markdownify }} - -

-
- {{ .Summary }} - {{ if .Truncated }} - {{ i18n "index_blog_readMore" . }} - {{ end }} -
-
+
+ {{ .Content }} +
+
+ {{ if .Site.Params.home.showLatest | default true }} +

{{ i18n "index_blog_latestPosts" . }}

+ {{ range first 1 .Pages.ByPublishDate.Reverse }} +
+ {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}{{ end }} +

+ + {{ .Title | markdownify }} + +

+
+ {{ .Summary }} + {{ if .Truncated }} + {{ i18n "index_blog_readMore" . }} {{ end }} - {{ end }} -

{{ i18n "index_blog_allPosts" . }}

- {{if .Site.Params.home.allPostsArchiveFormat}} - {{ partialCached "blog/archive.html" .}} - {{else}} - {{ partialCached "blog/li.html" . }} - {{end}} +
+ {{ end }} + {{ end }} +

{{ i18n "index_blog_allPosts" . }}

+ {{if .Site.Params.home.allPostsArchiveFormat}} + {{ partialCached "blog/archive.html" .}} + {{else}} + {{ partialCached "blog/li.html" . }} + {{end}} +
{{ end }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index fa1f646..219f3b6 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -10,29 +10,34 @@ {{ .Title | markdownify }}
- {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}{{ end }} - {{ if .Site.Params.showReadingTime | default true }} - {{ if .Params.date }} | {{ end }} - {{ i18n "blog_readingTime" .ReadingTime }} + {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}{{ end }} + {{ if .Site.Params.showReadingTime | default true }} + {{ if .Params.date }} | {{ end }} + {{ i18n "blog_readingTime" .ReadingTime }} {{ end }}
{{ if or .Site.Params.share.twitter .Site.Params.share.facebook .Site.Params.share.pinterest }}
{{ i18n "blog_shareThis" . }}: {{ if .Site.Params.share.twitter }} - {{ end }} {{ if .Site.Params.share.facebook }} - + {{ end }} {{ if .Site.Params.share.pinterest }} - + @@ -40,16 +45,16 @@
{{ end }} {{ range $taxonomy_term, $taxonomy := .Params }} - {{ with $.Site.GetPage $taxonomy_term }} - {{ $len := (len $taxonomy) }} -

- {{ $taxonomy_term | title }}: - {{ range $key, $value := $taxonomy }} - - {{ $value }}{{ if ne (add $key 1) $len }},{{ end }} - {{ end }} -

- {{ end }} + {{ with $.Site.GetPage $taxonomy_term }} + {{ $len := (len $taxonomy) }} +

+ {{ $taxonomy_term | title }}: + {{ range $key, $value := $taxonomy }} + + {{ $value }}{{ if ne (add $key 1) $len }},{{ end }} + {{ end }} +

+ {{ end }} {{ end }}
diff --git a/layouts/partials/blog/archive.html b/layouts/partials/blog/archive.html index 21e1a4a..a98b97b 100644 --- a/layouts/partials/blog/archive.html +++ b/layouts/partials/blog/archive.html @@ -1,24 +1,27 @@
- {{ $prev := now.Format "2006"}} - {{ range first 1 .Pages.ByPublishDate.Reverse }} - {{if .Date}} - {{if eq $prev (.Date.Format "2006")}}

{{ $prev }}

{{end}} + {{ $prev := now.Format "2006"}} + + {{ range first 1 .Pages.ByPublishDate.Reverse }} + {{if .Date}} + + {{if eq $prev (.Date.Format "2006")}} +

{{ $prev }}

{{end}} + {{end}} {{end}} - {{end}} - {{range .Pages.ByPublishDate.Reverse}} + {{range .Pages.ByPublishDate.Reverse}} {{if .Date}} {{$curr := .Date.Format "2006"}} - {{if lt $curr $prev }} -

{{ $curr }}

- {{end}} -
  • - {{ if .Params.date }} - {{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }} - - {{ end }} - {{ .Title | markdownify }} -
    • - {{ $prev = $curr}} + {{if lt $curr $prev }} +

    {{ $curr }}

    {{end}} - {{end}} -
    \ No newline at end of file +
  • + {{ if .Params.date }} + {{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }} - + {{ end }} + {{ .Title | markdownify }} +
    • + {{ $prev = $curr}} + {{end}} + {{end}} + diff --git a/layouts/partials/blog/li.html b/layouts/partials/blog/li.html index e72f1cd..36e7830 100644 --- a/layouts/partials/blog/li.html +++ b/layouts/partials/blog/li.html @@ -1,5 +1,6 @@ {{ range .Pages.ByPublishDate.Reverse }} -
  • - {{ .Title | markdownify }}{{ if .Params.date }} - {{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}{{ end }} -
    • +
  • + {{ .Title | markdownify }}{{ if .Params.date }} - + {{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}{{ end }} +
    • {{ end }} diff --git a/layouts/partials/home/blog.html b/layouts/partials/home/blog.html index 9f6cd59..0c6b9fb 100644 --- a/layouts/partials/home/blog.html +++ b/layouts/partials/home/blog.html @@ -4,40 +4,43 @@
    {{ if .Site.Params.home.showLatest | default true }}

    {{ i18n "index_blog_latestPosts" . }}

    - {{ range first 1 .Pages.ByPublishDate.Reverse }} -
    {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default "Jan 02, 2006") }}{{ end }} -

    {{ .Title | markdownify }}

    -
    - {{ .Summary }} - {{ if .Truncated }} - {{ i18n "index_blog_readMore" . }} - {{ end }} -
    + {{ range first 1 .Pages.ByPublishDate.Reverse }} +
    + {{ if .Params.date }}{{ .Date.Format (.Site.Params.dateFormat | default ":date_medium") }}{{ end }} +

    {{ .Title | markdownify }}

    +
    + {{ .Summary }} + {{ if .Truncated }} + {{ i18n "index_blog_readMore" . }} + {{ end }}
    - {{ end }} +
    + {{ end }} {{ end }}
    - {{ if .Site.Params.home.showAllPosts }} -
    -
    -

    {{ i18n "index_blog_allPosts" . }}

    - {{if .Site.Params.home.allPostsArchiveFormat}} - {{ partialCached "blog/archive.html" .}} - {{else}} - {{ partialCached "blog/li.html" . }} +{{ if .Site.Params.home.showAllPosts }} +
    +
    +

    {{ i18n "index_blog_allPosts" . }}

    + {{if .Site.Params.home.allPostsArchiveFormat}} + {{ partialCached "blog/archive.html" .}} + {{else}} + {{ partialCached "blog/li.html" . }} {{end}} -
    - {{ else }} -
    - {{ i18n "index_blog_allPosts" . }} -
    - {{ end }} +
    +{{ else }} +
    + {{ i18n "index_blog_allPosts" . }} +
    +{{ end }} {{ partial "top-icon.html" . }} -
    +
    +
    +
    {{ end }}