From 4de188c7d96d92899feb1bf73b33fc399aba6f41 Mon Sep 17 00:00:00 2001 From: Marty Sluijtman Date: Wed, 28 Sep 2022 14:15:41 +0200 Subject: [PATCH] Cleanup and moved some site specific stuff to site --- layouts/_default/single.html | 80 ++++++++---------- layouts/partials/footer.html | 2 +- layouts/partials/menu.html | 10 +-- layouts/partials/stickers.html | 8 -- static/rss.svg | 1 - static/stickers/4nobody.gif | Bin 2977 -> 0 bytes static/stickers/80x15.png | 7 -- static/stickers/cc4.png | Bin 446 -> 0 bytes static/stickers/edited-with-vim_banner.gif | Bin 1368 -> 0 bytes static/stickers/nonazis.png | Bin 2229 -> 0 bytes static/stickers/notoweb3.gif | Bin 2601 -> 0 bytes .../same-shit-different-asshole_banner.gif | Bin 16735 -> 0 bytes static/stickers/wiby.gif | Bin 2150 -> 0 bytes static/style.css | 25 ++++-- 14 files changed, 60 insertions(+), 73 deletions(-) delete mode 100644 layouts/partials/stickers.html delete mode 100644 static/rss.svg delete mode 100644 static/stickers/4nobody.gif delete mode 100644 static/stickers/80x15.png delete mode 100644 static/stickers/cc4.png delete mode 100644 static/stickers/edited-with-vim_banner.gif delete mode 100644 static/stickers/nonazis.png delete mode 100644 static/stickers/notoweb3.gif delete mode 100644 static/stickers/same-shit-different-asshole_banner.gif delete mode 100644 static/stickers/wiby.gif diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b4266f9..1f5934d 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,53 +1,43 @@ {{ define "main" }} - {{ if eq .Type $.Site.Params.contentTypeName }} -
- {{ if .Params.Date }} - - {{ .Date.Format "2006-01-02" }} - - {{ end }} +{{ if eq .Type $.Site.Params.contentTypeName }} +
+ {{ if .Params.Date }} {{ .Date.Format "2006-01-02" }} {{ end }} + {{ with .Params.Author }} - {{ . }} {{ end }} + - {{ .ReadingTime }} min read ({{ .WordCount }} words) + - {{ with .Params.Author }} - - - {{ . }} - {{ end }} - {{ if and (.Param "readingTime") (eq (.Param "readingTime") true) }} - - {{ .ReadingTime }} min read ({{ .WordCount }} words) - {{ end }} - + {{ if .Params.tags }} + + {{ range .Params.tags }} + #{{ . }}  + {{ end }} + + {{ end }} +
+{{ end }} - {{ if .Params.tags }} - - {{ range .Params.tags }} - #{{ . }}  - {{ end }} - - {{ end }} -
- {{ end }} +{{ if (.Params.Toc | default .Site.Params.Toc) }} +
+

+ {{ (.Params.TocTitle | default .Site.Params.TocTitle) | default "Table of Contents" }} +

+ {{ .TableOfContents }} +
+{{ end }} - {{ if (.Params.Toc | default .Site.Params.Toc) }} -
-

- {{ (.Params.TocTitle | default .Site.Params.TocTitle) | default "Table of Contents" }} -

- {{ .TableOfContents }} -
- {{ end }} +{{ if eq .Type $.Site.Params.contentTypeName }} +
+ {{- with .Content -}} + {{ . | replaceRE "()" `${1} # ${3}` | safeHTML }} + {{- end -}} +
+{{ else }} +{{ .Content }} +{{ end }} - {{ if eq .Type $.Site.Params.contentTypeName }} -
- {{- with .Content -}} - {{ . | replaceRE "()" `${1} # ${3}` | safeHTML }} - {{- end -}} -
- {{ else }} - {{ .Content }} - {{ end }} - - {{ if eq .Type $.Site.Params.contentTypeName }} - {{ partial "posts_pagination.html" . }} - {{ end }} +{{ if eq .Type $.Site.Params.contentTypeName }} +{{ partial "posts_pagination.html" . }} +{{ end }} {{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 09f5276..e2d760b 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,6 +1,6 @@