From 412ab931c34399a3902f3c3cb7861f31988db368 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Mon, 15 Jun 2020 01:35:25 +0100 Subject: [PATCH] Adding series admonition --- data/panaetius-theme/assets.json | 2 +- layouts/authors/terms.html | 2 +- layouts/partials/related.html | 12 ++++----- layouts/post/single.html | 5 +++- layouts/series/list.html | 25 +++++++++++++++++++ layouts/series/terms.html | 43 ++++++++++++++++++++++++++++++++ layouts/shortcodes/img.html | 2 +- layouts/tags/terms.html | 8 +++--- src/scss/cards.scss | 5 ++++ 9 files changed, 89 insertions(+), 15 deletions(-) create mode 100644 layouts/series/list.html create mode 100644 layouts/series/terms.html diff --git a/data/panaetius-theme/assets.json b/data/panaetius-theme/assets.json index 7e02739..e158b3a 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.8112076fb5e1095426f4.min.css", + "css": "main.dd57d66cbe4e4a43f89f.min.css", "js": "main.48637aff6f96e597ae05.min.js" }, "vendors~app": { diff --git a/layouts/authors/terms.html b/layouts/authors/terms.html index 1268680..d19bcbb 100644 --- a/layouts/authors/terms.html +++ b/layouts/authors/terms.html @@ -14,7 +14,7 @@ diff --git a/layouts/partials/related.html b/layouts/partials/related.html index 391db76..05516e9 100644 --- a/layouts/partials/related.html +++ b/layouts/partials/related.html @@ -1,10 +1,8 @@ {{- $related := .Site.RegularPages.Related . | first 3 -}} {{- with $related -}} -
- {{- range . -}} -
- {{ .Render "card" }} -
- {{- end -}} -
+
+ {{- range . -}} + {{ .Render "card" }} + {{- end -}} +
{{- end -}} diff --git a/layouts/post/single.html b/layouts/post/single.html index 27e31a7..e357ccd 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -67,8 +67,12 @@ {{- end -}} + +
+ {{ partial "related.html" $page }} +
- {{ partial "related.html" $page }} {{ end }} diff --git a/layouts/series/list.html b/layouts/series/list.html new file mode 100644 index 0000000..fb8530a --- /dev/null +++ b/layouts/series/list.html @@ -0,0 +1,25 @@ +{{ define "main" }} +
+ {{- if or .Title .Content -}} +
+
+ {{ with .Title }}

{{ . }}

{{ end }} + {{- with .Content -}} +
+ {{ . }} +
+ {{- end -}} +
+
+ {{- end -}} +
+ {{ $paginator := .Paginate (where .Pages "Type" "post") }} + {{ range $paginator.Pages.ByDate }} + {{ .Render "card" }} + {{ end }} +
+
+ {{ template "_internal/pagination.html" . }} +
+
+{{ end }} diff --git a/layouts/series/terms.html b/layouts/series/terms.html new file mode 100644 index 0000000..c4ce20b --- /dev/null +++ b/layouts/series/terms.html @@ -0,0 +1,43 @@ +{{ define "main" }} +
+ {{- if or .Title .Content -}} +
+
+ {{ with .Title }}

{{ . }}

{{ end }} + {{- with .Content -}} +
+ {{ . }} +
+ {{- end -}} +
+
+
+
+

Groups of articles that form a series.

+
+
+ {{- end -}} +
+ {{ range $name, $taxonomy := .Site.Taxonomies.series }} +
+ +
+ {{ with $.Site.GetPage (printf "/%s" $name) }} +
+
{{ .Params.Title }}
+

+ {{ len $taxonomy }} articles +

+

+ {{ .Params.Description }} +

+
+ {{ end }} +
+
+ +
+ {{ end }} + +
+{{ end }} diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html index 6d167b9..7bfdf6f 100644 --- a/layouts/shortcodes/img.html +++ b/layouts/shortcodes/img.html @@ -1,5 +1,5 @@ {{ $img := $.Page.Resources.GetMatch (.Get 0)}} -
+
(.Get 1)
{{.Get 1}}
diff --git a/layouts/tags/terms.html b/layouts/tags/terms.html index ba98937..4dba934 100644 --- a/layouts/tags/terms.html +++ b/layouts/tags/terms.html @@ -14,11 +14,11 @@ {{- end -}}
{{ range $name, $taxonomy := .Site.Taxonomies.tags }} -
+
-
-
-
[{{ len $taxonomy }}] {{ $name }}
+
+
+
{{ $name }}
{{ len $taxonomy }} articles
diff --git a/src/scss/cards.scss b/src/scss/cards.scss index b7f336c..11a4186 100644 --- a/src/scss/cards.scss +++ b/src/scss/cards.scss @@ -80,6 +80,11 @@ } } +.card-series { + @include card-border; + color: $text-gray +} + @media only screen and (min-width: map-get($grid-breakpoints, "md")) { .card-regular-width { width: 30%;