From 5312ff8f52565a41e8b0fd86a533cb23b9339e6d Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Wed, 10 Jun 2020 01:59:28 +0100 Subject: [PATCH] Updating latest --- data/panaetius-theme/assets.json | 2 +- layouts/_default/list.html | 14 +++-- layouts/index.html | 88 ++++++++++++++------------------ layouts/post/single.html | 2 +- layouts/search/single.html | 1 - 5 files changed, 52 insertions(+), 55 deletions(-) diff --git a/data/panaetius-theme/assets.json b/data/panaetius-theme/assets.json index cc2c8b4..2f6bf5f 100644 --- a/data/panaetius-theme/assets.json +++ b/data/panaetius-theme/assets.json @@ -9,7 +9,7 @@ "js": "2.lazyload.1168fc21175de558d316.min.js" }, "main": { - "css": "main.056eb67e3d086eb33a6f.min.css", + "css": "main.fe1e79a2ceb1a3e11a99.min.css", "js": "main.48637aff6f96e597ae05.min.js" }, "vendors~app": { diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 806c57b..20c97f1 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -15,10 +15,18 @@
{{ range .Pages }} -
- {{ .Render "card" }} -
+
+ {{ .Render "card" }} +
{{ end }}
+
+ {{ $paginator := .Paginate (where .Pages "Type" "post") }} + {{ range $paginator.Pages }} + {{.}} + {{ end }} + {{ template "_internal/pagination.html" . }} + +
{{ end }} diff --git a/layouts/index.html b/layouts/index.html index 733e1b9..871be8d 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,62 +1,52 @@ {{ define "main" }}
-
-
-
-

{{ .Site.Title }}

- {{- with .Site.Params.description -}} -
-
-

{{ . | safeHTML }}

- {{- end -}} -
+
+
+
+

{{ .Site.Title }}

+ {{- with .Site.Params.description -}}
-
- {{- with .Site.Params.homepageImage -}} - {{/*
*/}} -
- -
+
+

{{ . | safeHTML }}

{{- end -}}
-
- - - {{- range first 1 (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) -}} - {{ $page := . }} -
-
- {{- with .Resources.Match "images/banner.svg" -}} - {{ range . }} - {{- $image := . -}} - - {{ $page.Title }} - - {{- end -}} - {{- end -}} -
-
-
{{ $page.Date.Format "January 2, 2006" }}
-

{{ $page.Title }}

- -
- {{ $page.Summary }} -
-
+
+ {{- with .Site.Params.homepageImage -}} + {{/*
*/}} +
+
{{- end -}} - - -
- {{ range after 1 (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} -
- {{ .Render "card" }} -
- {{ end }} -
+
+ + + {{- range first 1 (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) -}} + +
+ {{ .Render "card-large" }} +
+ {{- end -}} + + +
+ {{ range after 1 (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} +
+ {{ .Render "card" }} +
+ {{ end }} +
+
+
+
+ + + +
+
+
{{ end }} diff --git a/layouts/post/single.html b/layouts/post/single.html index d5674ee..27e31a7 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -23,7 +23,7 @@
{{ partial "authors.html" $page }}
-

Posted on:

+

Posted on

{{ $page.Date.Format "January 2, 2006" }}

diff --git a/layouts/search/single.html b/layouts/search/single.html index e5b7fc8..4db7c2d 100644 --- a/layouts/search/single.html +++ b/layouts/search/single.html @@ -42,7 +42,6 @@ {{ $post := dict "link" .RelPermalink "author" (index .Params.authors 0) "tags" .Params.tags "title" .Title "date" (.Params.date.Format "January 2, 2006") "image" ($.Scratch.Get "image") "content" (substr .Plain 0 200) -}} {{ $p = $p | append $post -}} {{ end }} - {{ $p | jsonify }}