From 297ec66033699c984cacf3b38117f380783f5d78 Mon Sep 17 00:00:00 2001 From: Brandon Rozek Date: Tue, 22 Dec 2020 09:36:03 -0500 Subject: [PATCH] Updated blog layout --- layouts/_default/list.html | 38 ++++-------------------------------- layouts/_default/single.html | 2 +- layouts/blog/list.html | 2 +- layouts/blog/single.html | 2 ++ 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 178307d..f92bca9 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,39 +1,9 @@ {{ define "main"}}

{{ .Title }}

{{ partial "header.html" . }} - - - -
- -
- -
- -
- {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "January, 2006"}} - {{ range $index, $value := .Pages.GroupByDate $listPageDateFormat }} - {{ if (ne $index 0) }} -
- {{ end }} -

{{ .Key }}

- {{ range .Pages }} -

{{ .Title }}

- {{ end }} - {{ end }} + +
+ {{ .Content }}
{{ partial "footer.html" . }} - {{ $jquery := resources.Get "js/jquery-3.3.1.min.js" }} - {{ $mark := resources.Get "js/jquery.mark.es6.min.js" }} - {{ $lunr := resources.Get "js/lunr.js" }} - {{ $search := resources.Get "js/search.js" }} - {{ $js := slice $jquery $mark $lunr $search | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint }} - -{{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 97ea24f..8b01e81 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -5,6 +5,7 @@ {{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}}

{{ .Date.Format $singlePageDateFormat }}

+ {{ end }}
    @@ -16,7 +17,6 @@ {{ end }}
- {{ end }}
{{ .Content }} diff --git a/layouts/blog/list.html b/layouts/blog/list.html index b649b1e..77fd00f 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -29,7 +29,7 @@ {{ end }}
{{ partial "footer.html" . }} - {{ $jquery := resources.Get "js/jquery-3.3.1.min.js" }} + {{ $jquery := resources.Get "js/jquery-3.5.1.min.js" }} {{ $mark := resources.Get "js/jquery.mark.es6.min.js" }} {{ $lunr := resources.Get "js/lunr.js" }} {{ $search := resources.Get "js/search.js" }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index 7a5a0c5..e2e659d 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -2,8 +2,10 @@

{{ .Title }}

{{ partial "header.html" . }} + {{ if not .Date.IsZero }} {{ $singlePageDateFormat := .Site.Params.singlePageDateFormat | default "January 2, 2006"}}

{{ .Date.Format $singlePageDateFormat }}

+ {{ end }}