From ea54421b15c9705f86a8d25a6caaa40791d66e18 Mon Sep 17 00:00:00 2001 From: Thedro Neely Date: Tue, 19 Jul 2022 11:59:45 -0400 Subject: app: Refactor and CSS rewrite --- .../_default/_markup/render-codeblock-goat.html | 2 +- .../layouts/_default/_markup/render-codeblock.html | 17 +++ .../layouts/_default/_markup/render-heading.html | 1 - .../layouts/_default/_markup/render-image.html | 2 +- .../hugo/themes/tdro/layouts/_default/archive.html | 53 ++++--- .../hugo/themes/tdro/layouts/_default/baseof.html | 8 +- .../hugo/themes/tdro/layouts/_default/index.json | 2 +- .../hugo/themes/tdro/layouts/_default/list.html | 17 --- .../hugo/themes/tdro/layouts/_default/rss.xml | 2 +- .../hugo/themes/tdro/layouts/_default/section.html | 47 ++++--- .../hugo/themes/tdro/layouts/_default/single.html | 153 ++------------------- .../themes/tdro/layouts/_default/subsection.html | 20 +-- .../hugo/themes/tdro/layouts/_default/summary.html | 43 +++--- .../themes/tdro/layouts/_default/taxonomy.html | 121 ++++++++-------- .../tdro/layouts/_default/taxonomy_archive.html | 57 ++++---- .../themes/tdro/layouts/abstracts/section.html | 49 ++++--- .../themes/tdro/layouts/abstracts/summary.html | 33 +++-- .../themes/tdro/layouts/partials/archive-link.html | 2 - .../layouts/partials/article-archive-link.html | 6 + .../tdro/layouts/partials/article-comments.html | 14 ++ .../tdro/layouts/partials/article-meta-bottom.html | 15 ++ .../tdro/layouts/partials/article-meta-top.html | 13 ++ .../layouts/partials/article-more-content.html | 25 ++++ .../tdro/layouts/partials/article-on-web.html | 12 ++ .../tdro/layouts/partials/article-pagination.html | 77 +++++++++++ .../tdro/layouts/partials/article-syntax.html | 3 + .../layouts/partials/article-table-contents.html | 6 + .../layouts/partials/article-thumbnail-image.html | 27 ++++ .../themes/tdro/layouts/partials/base-footer.html | 4 + .../themes/tdro/layouts/partials/base-head.html | 31 +++++ .../themes/tdro/layouts/partials/base-nav.html | 1 + .../themes/tdro/layouts/partials/base-title.html | 2 + .../hugo/themes/tdro/layouts/partials/footer.html | 4 - .../tdro/layouts/partials/function-content.html | 10 ++ .../hugo/themes/tdro/layouts/partials/head.html | 31 ----- .../tdro/layouts/partials/meta-commentcount.html | 2 + .../tdro/layouts/partials/meta-feedlink.html | 2 + .../tdro/layouts/partials/meta-pagedate.html | 10 ++ .../tdro/layouts/partials/meta-pagestatus.html | 5 + .../tdro/layouts/partials/meta-pagetags.html | 6 + .../tdro/layouts/partials/meta-readtime.html | 10 ++ .../tdro/layouts/partials/meta-wordcount.html | 2 + .../hugo/themes/tdro/layouts/partials/nav.html | 1 - .../tdro/layouts/partials/page-categories.html | 2 - .../themes/tdro/layouts/partials/page-date.html | 5 - .../themes/tdro/layouts/partials/page-meta.html | 3 - .../themes/tdro/layouts/partials/page-status.html | 1 - .../themes/tdro/layouts/partials/page-tags.html | 8 -- .../themes/tdro/layouts/partials/pagination.html | 55 -------- .../themes/tdro/layouts/partials/read-time.html | 6 - .../tdro/layouts/partials/thumbnail-image.html | 17 --- .../hugo/themes/tdro/layouts/partials/title.html | 2 - .../themes/tdro/layouts/shortcodes/footer.html | 4 +- .../hugo/themes/tdro/layouts/shortcodes/image.html | 14 +- .../tdro/layouts/shortcodes/marginimage.html | 34 +++-- .../themes/tdro/layouts/shortcodes/marginnote.html | 16 ++- .../themes/tdro/layouts/shortcodes/sideimage.html | 34 +++-- .../themes/tdro/layouts/shortcodes/sidenote.html | 22 ++- .../themes/tdro/layouts/shortcodes/smallcaps.html | 4 +- .../hugo/themes/tdro/layouts/shortcodes/video.html | 2 +- generators/openring/template.html | 32 +++-- 61 files changed, 629 insertions(+), 580 deletions(-) create mode 100644 generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock.html delete mode 100644 generators/hugo/themes/tdro/layouts/_default/list.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/archive-link.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-archive-link.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-comments.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-meta-bottom.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-meta-top.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-more-content.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-on-web.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-pagination.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-syntax.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-table-contents.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/article-thumbnail-image.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/base-footer.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/base-head.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/base-nav.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/base-title.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/footer.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/function-content.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/head.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/meta-commentcount.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/meta-feedlink.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/meta-pagedate.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/meta-pagestatus.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/meta-pagetags.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/meta-readtime.html create mode 100644 generators/hugo/themes/tdro/layouts/partials/meta-wordcount.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/nav.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/page-categories.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/page-date.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/page-meta.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/page-status.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/page-tags.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/pagination.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/read-time.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/thumbnail-image.html delete mode 100644 generators/hugo/themes/tdro/layouts/partials/title.html (limited to 'generators') diff --git a/generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock-goat.html b/generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock-goat.html index d2d0753..67b004b 100644 --- a/generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock-goat.html +++ b/generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock-goat.html @@ -14,5 +14,5 @@ {{ .Inner }} {{ end }} -
{{ $caption }}
+
{{ $caption }}
diff --git a/generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock.html b/generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock.html new file mode 100644 index 0000000..7541268 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/_default/_markup/render-codeblock.html @@ -0,0 +1,17 @@ +{{- $caption := .Attributes.caption -}} +{{- $type := .Type | default "text" -}} +{{- $options := .Attributes.options | default "default=1" -}} +{{- $id := print "code-block-" (truncate 7 "" (md5 .Inner)) -}} + + +
+ + {{ $type }} + +
+ {{ highlight .Inner $type (print $options ",lineAnchors=" "code-line-" (truncate 7 "" (md5 .Inner))) }} + + +{{- with $caption -}} + +{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/_default/_markup/render-heading.html b/generators/hugo/themes/tdro/layouts/_default/_markup/render-heading.html index 10e6709..48e02c1 100644 --- a/generators/hugo/themes/tdro/layouts/_default/_markup/render-heading.html +++ b/generators/hugo/themes/tdro/layouts/_default/_markup/render-heading.html @@ -1,6 +1,5 @@ {{ .Text | safeHTML }} diff --git a/generators/hugo/themes/tdro/layouts/_default/_markup/render-image.html b/generators/hugo/themes/tdro/layouts/_default/_markup/render-image.html index 5307cc2..1b524ac 100644 --- a/generators/hugo/themes/tdro/layouts/_default/_markup/render-image.html +++ b/generators/hugo/themes/tdro/layouts/_default/_markup/render-image.html @@ -39,7 +39,7 @@ /> {{ if $.Title }} -
{{ $.Title | markdownify }}
+
{{ $.Title | markdownify }}
{{ end -}} {{- /* This comment removes trailing newlines. */ -}} diff --git a/generators/hugo/themes/tdro/layouts/_default/archive.html b/generators/hugo/themes/tdro/layouts/_default/archive.html index 7399a98..8cbd435 100644 --- a/generators/hugo/themes/tdro/layouts/_default/archive.html +++ b/generators/hugo/themes/tdro/layouts/_default/archive.html @@ -1,36 +1,29 @@ {{ define "main" }} -
-
-
-
- {{ $type := .Type }} +
+ + {{ $type := .Type }} - {{ range (.Site.RegularPages.GroupByDate "2006") }} - {{ $articles := (where .Pages "Type" $type) }} - {{ if and (gt .Key 1) (gt (where .Pages "Type" $type) 0) }} - - {{ range (first 1 $articles) }} -

{{ .Date.Format "2006" }}

- {{ end }} - - + {{ range (.Site.RegularPages.GroupByDate "2006") }} + {{ $articles := (where .Pages "Type" $type) }} + {{ if and (gt .Key 1) (gt (where .Pages "Type" $type) 0) }} + {{ range (first 1 $articles) }} +

{{ .Date.Format "2006" }}

+ {{ end }} +
-
-
-
+ + {{ end }} + {{ end }} + + {{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/baseof.html b/generators/hugo/themes/tdro/layouts/_default/baseof.html index 81c9a1e..0f84698 100644 --- a/generators/hugo/themes/tdro/layouts/_default/baseof.html +++ b/generators/hugo/themes/tdro/layouts/_default/baseof.html @@ -1,18 +1,18 @@ - + -{{ partial "head.html" . -}} +{{ partial "base-head.html" . -}} -{{ partial "nav.html" . -}} +{{ partial "base-nav.html" . -}} {{- block "main" . }}

If you are seeing this, your page content hasn't been created.

{{- end }} -{{ partial "footer.html" . -}} +{{ partial "base-footer.html" . -}} diff --git a/generators/hugo/themes/tdro/layouts/_default/index.json b/generators/hugo/themes/tdro/layouts/_default/index.json index 3cab4c6..92801bf 100644 --- a/generators/hugo/themes/tdro/layouts/_default/index.json +++ b/generators/hugo/themes/tdro/layouts/_default/index.json @@ -32,7 +32,7 @@ {{- end -}} ], "content_text": {{ $data.Plain | jsonify }}, - "content_html": {{ $data.Content | jsonify }} + "content_html": {{ partial "function-content.html" $data.Content | jsonify }} } {{- end -}} {{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/list.html b/generators/hugo/themes/tdro/layouts/_default/list.html deleted file mode 100644 index 78fec9b..0000000 --- a/generators/hugo/themes/tdro/layouts/_default/list.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ define "main" }} -
-
-
-
-
-

{{ .Title | markdownify }}

- {{ range .Paginator.Pages }} - {{ .Render "summary" }} - {{ end }} -
- {{ partial "pagination.html" . }} -
-
-
-
-{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/rss.xml b/generators/hugo/themes/tdro/layouts/_default/rss.xml index 9f94c84..47c2d70 100644 --- a/generators/hugo/themes/tdro/layouts/_default/rss.xml +++ b/generators/hugo/themes/tdro/layouts/_default/rss.xml @@ -24,7 +24,7 @@ {{ .Permalink }} {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} {{ .Permalink }} - {{ .Content | html }} + {{ partial "function-content.html" .Content | html }} {{ end }} {{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/section.html b/generators/hugo/themes/tdro/layouts/_default/section.html index 47ea0a7..10f501a 100644 --- a/generators/hugo/themes/tdro/layouts/_default/section.html +++ b/generators/hugo/themes/tdro/layouts/_default/section.html @@ -1,26 +1,25 @@ {{ define "main" }} -
-
-
-
-
-
- - See an archive of all {{ .Type }} here. - - - {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} - {{ .Render "summary" }} - {{ end }} - -
- {{ partial "pagination.html" . }} -
- - Archive of all {{ .Type }} {{ safeHTML (readFile "public/css/icons/feather/corner-down-right.svg") }} - -
-
-
-
+
+ + + + See an archive of all {{ .Type }} here. + + + + {{ if eq .Title "Posts" }}{{ end }} + {{ if eq .Title "Projects" }}{{ end }} + {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} + {{ .Render "summary" }} + {{ end }} + {{ if eq .Title "Posts" }}{{ end }} + {{ if eq .Title "Projects" }}{{ end }} + + + {{ partial "article-pagination.html" . }} + + {{ partial "article-archive-link.html" . }} + + +
{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/single.html b/generators/hugo/themes/tdro/layouts/_default/single.html index a3eaf4a..96bb02c 100644 --- a/generators/hugo/themes/tdro/layouts/_default/single.html +++ b/generators/hugo/themes/tdro/layouts/_default/single.html @@ -1,141 +1,18 @@ {{ define "main" }} -
-
-
-
-
-

{{ .Title | markdownify }}

- {{ if .Params.toc }} -
-
Table of Contents
- {{ .TableOfContents }} -
- {{ end }} - - - - {{- partial "page-status.html" . -}} - - {{- .Content | - replaceRE "

\n

" "
" | - replaceRE "

" "
" | - replaceRE "

" "

" | - replaceRE " -

-
-
+
+
+

{{ .Title | markdownify }}

+ {{- partial "article-table-contents.html" . -}} + {{- partial "article-meta-top.html" . -}} + {{- partial "function-content.html" .Content | safeHTML -}} +
+ + {{- partial "article-meta-bottom.html" . -}} + {{- partial "article-more-content.html" . -}} + {{- if fileExists "themes/tdro/layouts/partials/openring.html" -}} + {{- partial "article-on-web.html" . -}} + {{- end -}} + {{- partial "article-syntax.html" . -}} + {{- partial "article-comments.html" . -}}
- - - - - - - -{{ if .Params.syntax }} - -{{ end }} - - - {{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/subsection.html b/generators/hugo/themes/tdro/layouts/_default/subsection.html index ffaa3f9..d57c2cb 100644 --- a/generators/hugo/themes/tdro/layouts/_default/subsection.html +++ b/generators/hugo/themes/tdro/layouts/_default/subsection.html @@ -1,15 +1,9 @@ {{ define "main" }} -
-
-
-
-
-

{{ .Title | markdownify }}

- {{- partial "page-status.html" . -}} - {{- .Content | safeHTML }} -
-
-
-
-
+
+ +

{{ .Title | markdownify }}

+ {{- partial "meta-pagestatus.html" . -}} + {{- .Content | safeHTML -}} + +
{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/summary.html b/generators/hugo/themes/tdro/layouts/_default/summary.html index ae150d5..4d41046 100644 --- a/generators/hugo/themes/tdro/layouts/_default/summary.html +++ b/generators/hugo/themes/tdro/layouts/_default/summary.html @@ -1,27 +1,24 @@ -
+ + + {{ partial "article-thumbnail-image.html" . }} + -
- {{ partial "thumbnail-image.html" . }} -
+ +

{{ .Title | markdownify }}

-
-
-
+ + {{- partial "meta-pagedate.html" . -}} + {{- partial "meta-pagestatus.html" . -}} + {{- partial "meta-readtime.html" . -}} + -

- {{ .Title | markdownify }} -

- -

- {{ partial "page-date.html" . }}{{ partial "page-status.html" . }} · {{ partial "read-time.html" . }} +

+ {{ if .Params.summary }} + {{ truncate 75 "..." .Params.summary }} + {{ else }} + {{ truncate 75 "..." .Summary}} + {{ end }}

- -
-

{{ if .Params.summary }}{{ truncate 75 "..." .Params.summary }}{{ else }}{{ truncate 75 "..." .Summary}}{{ end }}

-

Continue reading ({{ .FuzzyWordCount }} words)

-
-
- -
- -
+ Continue reading ({{ .FuzzyWordCount }} words) + + diff --git a/generators/hugo/themes/tdro/layouts/_default/taxonomy.html b/generators/hugo/themes/tdro/layouts/_default/taxonomy.html index 134c19b..ec5a71f 100644 --- a/generators/hugo/themes/tdro/layouts/_default/taxonomy.html +++ b/generators/hugo/themes/tdro/layouts/_default/taxonomy.html @@ -1,63 +1,68 @@ {{ define "main" }} -{{ $sidenote := "See an archive of all taxonomies here." }} -
-
-
-
- {{ $title := .Title }} - {{ if eq $title "Tags" }} -
-

Taxonomies

- {{ safeHTML $sidenote }} - {{ range .Paginator.Pages }} - {{ $title := .Title }} -

{{ .Title | title }}

- {{ range $taxonomy := .Site.Taxonomies }} - {{ range $tag, $article := $taxonomy }} - {{ if eq $tag $title }} - + {{ $sidenote := "See an archive of all taxonomies here." }} + {{ $title := .Title }} + {{ if eq $title "Tags" }} +
+ + {{ safeHTML $sidenote }} +

Taxonomies

+
+
+ {{ range .Paginator.Pages }} + {{ $title := .Title }} +

{{ .Title | title }}

+ {{- range $taxonomy := .Site.Taxonomies -}} + {{- range $tag, $article := $taxonomy -}} + {{ if eq $tag $title }} + {{ end }} - {{ end }} - {{ end }} -
- {{ partial "pagination.html" . }} - {{ else }} - + {{- end -}} + {{- end -}} + {{- end -}} +
+ {{ partial "article-pagination.html" . }} + +
+ {{ else }} +
+ + {{ safeHTML $sidenote }} +

+ {{ if ne $title "Tags" }} + Tags + — + {{ .Title | title }} {{ end }} - - - - +

+
+
+ {{- range $taxonomy := .Site.Taxonomies -}} + {{- range $tag, $article := $taxonomy -}} + {{- if eq $tag $title -}} + + {{- end -}} + {{- end -}} + {{- end -}} +
+ +
+ {{ end }} {{ end }} diff --git a/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html b/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html index 859252f..614ef98 100644 --- a/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html +++ b/generators/hugo/themes/tdro/layouts/_default/taxonomy_archive.html @@ -1,34 +1,31 @@ {{ define "main" }} -
-
-
-
- {{ $title := .Title }} -
-

{{ .Title | markdownify }}

- {{ range $taxonomy := .Site.Taxonomies }} - {{ $title := .Title }} - {{ range $tag, $article := $taxonomy }} - {{ if ne $tag $title }} -

{{ $tag }}

- - {{ end }} +
+ + {{ $title := .Title }} +

{{ .Title | markdownify }}

+
+
+ {{ range $taxonomy := .Site.Taxonomies }} + {{ $title := .Title }} + {{ range $tag, $article := $taxonomy }} + {{ if ne $tag $title }} +

{{ $tag }}

+ {{ end }} {{ end }} -
-
-
-
-
+ {{ end }} + + + {{ end }} diff --git a/generators/hugo/themes/tdro/layouts/abstracts/section.html b/generators/hugo/themes/tdro/layouts/abstracts/section.html index f7dad6c..d06ab1e 100644 --- a/generators/hugo/themes/tdro/layouts/abstracts/section.html +++ b/generators/hugo/themes/tdro/layouts/abstracts/section.html @@ -1,28 +1,25 @@ {{ define "main" }} -
-
-
-
-
-

{{ .Type | title }}

- - See an archive of all {{ .Type }} here. - - -
- {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} - {{ .Render "summary" }} - {{ end }} -
- -
- {{ partial "pagination.html" . }} -
- - Archive of all {{ .Type }} {{ safeHTML (readFile "public/css/icons/feather/corner-down-right.svg") }} - -
-
-
-
+
+ + +

{{ .Type | title }}

+ + + See an archive of all {{ .Type }} here. + + + + + {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} + {{ .Render "summary" }} + {{ end }} + + + + {{ partial "article-pagination.html" . }} + + {{ partial "article-archive-link.html" . }} + + +
{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/abstracts/summary.html b/generators/hugo/themes/tdro/layouts/abstracts/summary.html index e81dae3..3018677 100644 --- a/generators/hugo/themes/tdro/layouts/abstracts/summary.html +++ b/generators/hugo/themes/tdro/layouts/abstracts/summary.html @@ -1,11 +1,22 @@ -
-
- {{ partial "thumbnail-image.html" . }} -

- {{ .Title | markdownify }} -

-

- {{ partial "page-date.html" . }}
{{ partial "read-time.html" .}} -

-
-
+ + + {{ partial "article-thumbnail-image.html" . }} + + +
+

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

+ +
+

{{ partial "meta-pagedate.html" . }}

+

{{ partial "meta-readtime.html" . }}

+
+ +
+ + diff --git a/generators/hugo/themes/tdro/layouts/partials/archive-link.html b/generators/hugo/themes/tdro/layouts/partials/archive-link.html deleted file mode 100644 index 8b08ba3..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/archive-link.html +++ /dev/null @@ -1,2 +0,0 @@ -/archives/{{ .Type }}/ -{{- /* Strip newline. */ -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/article-archive-link.html b/generators/hugo/themes/tdro/layouts/partials/article-archive-link.html new file mode 100644 index 0000000..0c9e6bd --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-archive-link.html @@ -0,0 +1,6 @@ + + + Archive of all {{ .Type }} + {{ safeHTML (readFile "public/css/icons/feather/corner-down-right.svg") }} + + diff --git a/generators/hugo/themes/tdro/layouts/partials/article-comments.html b/generators/hugo/themes/tdro/layouts/partials/article-comments.html new file mode 100644 index 0000000..8788254 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-comments.html @@ -0,0 +1,14 @@ + +
+

Comments

+ + +
+ diff --git a/generators/hugo/themes/tdro/layouts/partials/article-meta-bottom.html b/generators/hugo/themes/tdro/layouts/partials/article-meta-bottom.html new file mode 100644 index 0000000..d1adf5c --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-meta-bottom.html @@ -0,0 +1,15 @@ + + {{ dateFormat "2 January 2006" .Params.date }} + — Written +
+ {{ if .Params.updated }} + {{ dateFormat "2 January 2006" .Params.updated }} + {{ else }} + {{ dateFormat "2 January 2006" .Params.date }} + {{ end }} + — Updated +
+ {{ .Site.Author.name }} — Creator +
+ {{ .Slug }}.md — Article + diff --git a/generators/hugo/themes/tdro/layouts/partials/article-meta-top.html b/generators/hugo/themes/tdro/layouts/partials/article-meta-top.html new file mode 100644 index 0000000..27f069c --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-meta-top.html @@ -0,0 +1,13 @@ + + + + diff --git a/generators/hugo/themes/tdro/layouts/partials/article-more-content.html b/generators/hugo/themes/tdro/layouts/partials/article-more-content.html new file mode 100644 index 0000000..dbe5725 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-more-content.html @@ -0,0 +1,25 @@ + +
+

More Content

+ {{ $more := shuffle .Site.RegularPages | first 3 }} + {{ with $more }} + {{ range . }} + + {{ end }} + {{ end }} +
+ diff --git a/generators/hugo/themes/tdro/layouts/partials/article-on-web.html b/generators/hugo/themes/tdro/layouts/partials/article-on-web.html new file mode 100644 index 0000000..59776da --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-on-web.html @@ -0,0 +1,12 @@ + +
+ + + {{ safeHTML (readFile "public/css/icons/feather/help-circle.svg") }} + Openring + + +

On the Web

+
+ {{- partial "openring.html" . -}} + diff --git a/generators/hugo/themes/tdro/layouts/partials/article-pagination.html b/generators/hugo/themes/tdro/layouts/partials/article-pagination.html new file mode 100644 index 0000000..0d07e0e --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-pagination.html @@ -0,0 +1,77 @@ +{{- $HugoPaginator := $.Paginator -}} +{{- $Pages := $HugoPaginator.TotalNumberOfElements -}} +{{- $MyPaginator := math.Ceil (div (float $Pages) 3) -}} + +{{ if gt $HugoPaginator.TotalPages 1 }} + + + + +{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/article-syntax.html b/generators/hugo/themes/tdro/layouts/partials/article-syntax.html new file mode 100644 index 0000000..63479e9 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-syntax.html @@ -0,0 +1,3 @@ +{{ if .Params.syntax }} + +{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/article-table-contents.html b/generators/hugo/themes/tdro/layouts/partials/article-table-contents.html new file mode 100644 index 0000000..89970dc --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-table-contents.html @@ -0,0 +1,6 @@ +{{- if .Params.toc -}} + +

Table of Contents

+ {{ .TableOfContents }} + +{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/article-thumbnail-image.html b/generators/hugo/themes/tdro/layouts/partials/article-thumbnail-image.html new file mode 100644 index 0000000..8f592f9 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/article-thumbnail-image.html @@ -0,0 +1,27 @@ +{{- $imageFile := print "public/images/thumbnails/" (partial "article-image.html" .) ".png" -}} +{{- if fileExists $imageFile -}} +{{- $image := imageConfig $imageFile -}} + + + + + + {{ .Title }} + + +{{- else -}} +{{- $image := imageConfig "public/images/thumbnails/placeholder.png" -}} + + {{ .Title }} + +{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/base-footer.html b/generators/hugo/themes/tdro/layouts/partials/base-footer.html new file mode 100644 index 0000000..a39bf67 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/base-footer.html @@ -0,0 +1,4 @@ +{{ safeHTML "" }} + + + diff --git a/generators/hugo/themes/tdro/layouts/partials/base-head.html b/generators/hugo/themes/tdro/layouts/partials/base-head.html new file mode 100644 index 0000000..edce96a --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/base-head.html @@ -0,0 +1,31 @@ + +{{ partial "base-title.html" . -}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{{ safeHTML "" }} diff --git a/generators/hugo/themes/tdro/layouts/partials/base-nav.html b/generators/hugo/themes/tdro/layouts/partials/base-nav.html new file mode 100644 index 0000000..1b1829c --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/base-nav.html @@ -0,0 +1 @@ +{{ safeHTML "" }} diff --git a/generators/hugo/themes/tdro/layouts/partials/base-title.html b/generators/hugo/themes/tdro/layouts/partials/base-title.html new file mode 100644 index 0000000..874d944 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/base-title.html @@ -0,0 +1,2 @@ +{{ with .Title }}{{ . }}{{ end }} +{{- with $.Site.Title }} - {{ . }}{{ end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/footer.html b/generators/hugo/themes/tdro/layouts/partials/footer.html deleted file mode 100644 index a39bf67..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/footer.html +++ /dev/null @@ -1,4 +0,0 @@ -{{ safeHTML "" }} - - - diff --git a/generators/hugo/themes/tdro/layouts/partials/function-content.html b/generators/hugo/themes/tdro/layouts/partials/function-content.html new file mode 100644 index 0000000..6debad6 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/function-content.html @@ -0,0 +1,10 @@ +{{- $content := . -}} + +{{- + $content = $content | + replaceRE "

" "
" | + replaceRE "

\n

" "
" | + replaceRE "

" "
" | +-}} + +{{- return $content -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/head.html b/generators/hugo/themes/tdro/layouts/partials/head.html deleted file mode 100644 index a406d9e..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/head.html +++ /dev/null @@ -1,31 +0,0 @@ - -{{ partial "title.html" . -}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{ safeHTML "" }} diff --git a/generators/hugo/themes/tdro/layouts/partials/meta-commentcount.html b/generators/hugo/themes/tdro/layouts/partials/meta-commentcount.html new file mode 100644 index 0000000..d398335 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/meta-commentcount.html @@ -0,0 +1,2 @@ +{{ safeHTML (readFile "public/css/icons/feather/message-circle.svg") }} +0 Comments diff --git a/generators/hugo/themes/tdro/layouts/partials/meta-feedlink.html b/generators/hugo/themes/tdro/layouts/partials/meta-feedlink.html new file mode 100644 index 0000000..db65e0c --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/meta-feedlink.html @@ -0,0 +1,2 @@ +{{- safeHTML (readFile "public/css/icons/feather/rss.svg") -}} +RSS Feed diff --git a/generators/hugo/themes/tdro/layouts/partials/meta-pagedate.html b/generators/hugo/themes/tdro/layouts/partials/meta-pagedate.html new file mode 100644 index 0000000..0278ec6 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/meta-pagedate.html @@ -0,0 +1,10 @@ +{{ if .Params.date }} + {{ safeHTML (readFile "public/css/icons/feather/calendar.svg") }} + + {{else}} + +{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/meta-pagestatus.html b/generators/hugo/themes/tdro/layouts/partials/meta-pagestatus.html new file mode 100644 index 0000000..3d77aeb --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/meta-pagestatus.html @@ -0,0 +1,5 @@ +{{ if .Draft }} + + DRAFT + +{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/meta-pagetags.html b/generators/hugo/themes/tdro/layouts/partials/meta-pagetags.html new file mode 100644 index 0000000..41ba5c5 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/meta-pagetags.html @@ -0,0 +1,6 @@ +{{- with .Params.tags -}} + {{- range $tags, $tag := sort . -}} + {{ safeHTML (readFile "public/css/icons/feather/tag.svg") }} + {{ $tag }} + {{ end }} +{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/meta-readtime.html b/generators/hugo/themes/tdro/layouts/partials/meta-readtime.html new file mode 100644 index 0000000..c1d7449 --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/meta-readtime.html @@ -0,0 +1,10 @@ +{{- safeHTML (readFile "public/css/icons/feather/clock.svg") -}} + + + {{ $minutes := div .WordCount 150 }} + {{ if lt $minutes 1 }} + 1 minute read + {{- else -}} + {{ $minutes }} minute read + {{ end }} + diff --git a/generators/hugo/themes/tdro/layouts/partials/meta-wordcount.html b/generators/hugo/themes/tdro/layouts/partials/meta-wordcount.html new file mode 100644 index 0000000..a41a4cc --- /dev/null +++ b/generators/hugo/themes/tdro/layouts/partials/meta-wordcount.html @@ -0,0 +1,2 @@ +{{- safeHTML (readFile "public/css/icons/feather/file-text.svg") -}} +{{ .FuzzyWordCount }} words diff --git a/generators/hugo/themes/tdro/layouts/partials/nav.html b/generators/hugo/themes/tdro/layouts/partials/nav.html deleted file mode 100644 index 1b1829c..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/nav.html +++ /dev/null @@ -1 +0,0 @@ -{{ safeHTML "" }} diff --git a/generators/hugo/themes/tdro/layouts/partials/page-categories.html b/generators/hugo/themes/tdro/layouts/partials/page-categories.html deleted file mode 100644 index efd6cb7..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/page-categories.html +++ /dev/null @@ -1,2 +0,0 @@ -{{- range $i, $value := sort . -}}{{ if $i }}, {{ end -}} -{{ $value }}{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/page-date.html b/generators/hugo/themes/tdro/layouts/partials/page-date.html deleted file mode 100644 index e53e222..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/page-date.html +++ /dev/null @@ -1,5 +0,0 @@ -{{ if .Params.date }} - -{{else}} - -{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/page-meta.html b/generators/hugo/themes/tdro/layouts/partials/page-meta.html deleted file mode 100644 index 44cc4fb..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/page-meta.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ partial "page-date.html" . -}} -{{- with .Params.categories }} in {{ partial "page-categories.html" . }}{{ end }} -{{- with .Params.tags }} {{ partial "page-tags.html" . }}{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/page-status.html b/generators/hugo/themes/tdro/layouts/partials/page-status.html deleted file mode 100644 index 7cfde17..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/page-status.html +++ /dev/null @@ -1 +0,0 @@ -{{ if .Draft }}· DRAFT{{end}} diff --git a/generators/hugo/themes/tdro/layouts/partials/page-tags.html b/generators/hugo/themes/tdro/layouts/partials/page-tags.html deleted file mode 100644 index 1f99a3b..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/page-tags.html +++ /dev/null @@ -1,8 +0,0 @@ -{{- range $tags, $tag := sort . }} - · - - {{ $tag }} - -{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/pagination.html b/generators/hugo/themes/tdro/layouts/partials/pagination.html deleted file mode 100644 index 698ac6a..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/pagination.html +++ /dev/null @@ -1,55 +0,0 @@ -{{ $HugoPaginator := $.Paginator }} -{{ $Pages := $HugoPaginator.TotalNumberOfElements }} -{{ $MyPaginator := math.Ceil (div (float $Pages) 3) }} - -{{ if gt $HugoPaginator.TotalPages 1 }} - - -{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/read-time.html b/generators/hugo/themes/tdro/layouts/partials/read-time.html deleted file mode 100644 index e445068..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/read-time.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ $minutes := div .WordCount 150 }} -{{ if lt $minutes 1 }} - 1 minute read -{{- else -}} - {{ $minutes }} minute read -{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/thumbnail-image.html b/generators/hugo/themes/tdro/layouts/partials/thumbnail-image.html deleted file mode 100644 index 857e01f..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/thumbnail-image.html +++ /dev/null @@ -1,17 +0,0 @@ -{{ $imageFile := print "public/images/thumbnails/" (partial "article-image.html" .) ".png" }} -{{ if fileExists $imageFile }} -{{ $image := imageConfig $imageFile }} - - - - - - {{ .Title }} - - -{{ else }} -{{ $image := imageConfig "public/images/thumbnails/placeholder.png" }} - - {{ .Title }} - -{{ end }} diff --git a/generators/hugo/themes/tdro/layouts/partials/title.html b/generators/hugo/themes/tdro/layouts/partials/title.html deleted file mode 100644 index 874d944..0000000 --- a/generators/hugo/themes/tdro/layouts/partials/title.html +++ /dev/null @@ -1,2 +0,0 @@ -{{ with .Title }}{{ . }}{{ end }} -{{- with $.Site.Title }} - {{ . }}{{ end -}} diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/footer.html b/generators/hugo/themes/tdro/layouts/shortcodes/footer.html index 63af9fa..3e71164 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/footer.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/footer.html @@ -1 +1,3 @@ -{{ .Inner | markdownify }} + + {{ .Inner | markdownify }} + diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/image.html b/generators/hugo/themes/tdro/layouts/shortcodes/image.html index e90352d..3b211ff 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/image.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/image.html @@ -1,9 +1,15 @@ -{{ $imageFile := print "public" (.Get `source`) }} -{{ $image := imageConfig $imageFile }} +{{- $imageFile := print "public" (.Get `source`) -}} +{{- $image := imageConfig $imageFile -}}
- {{ .Get `title` }} + {{ .Get `title` }} -
{{ .Inner | markdownify }}
+
{{ .Inner | markdownify }}
diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html index 498a901..d69966f 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginimage.html @@ -1,14 +1,24 @@ -{{ $id := md5 (printf (.Get `mark`) .Inner) }} -{{ $imageFile := print "public" (.Get `source`) }} -{{ $image := imageConfig $imageFile }} +{{- $mark := (.Get `mark`) -}} +{{- $set := (.Get `set`) -}} +{{- $source := (.Get `source`) -}} +{{- $title := (.Get `title`) -}} +{{- $id := md5 (printf $mark .Inner) -}} +{{- $imageFile := print "public" $source -}} +{{- $image := imageConfig $imageFile -}} - - - - - - {{ .Inner | markdownify }} + + + + + + {{ .Inner | markdownify }} - {{ .Inner | markdownify }} - - + {{ .Inner | markdownify }} + + diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html index 96dc001..c19b9a2 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/marginnote.html @@ -1,9 +1,11 @@ -{{ $id := md5 (printf (.Get `mark`) .Inner) }} +{{- $mark := (.Get `mark`) -}} +{{- $set := (.Get `set`) -}} +{{- $id := md5 (printf $mark .Inner) -}} - - - - + + + + {{ .Inner | markdownify }} - - + + diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html index f309fdc..a2574d5 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/sideimage.html @@ -1,14 +1,24 @@ -{{ $id := md5 (printf (.Get `mark`) .Inner) }} -{{ $imageFile := print "public" (.Get `source`) }} -{{ $image := imageConfig $imageFile }} +{{- $mark := (.Get `mark`) -}} +{{- $set := (.Get `set`) -}} +{{- $source := (.Get `source`) -}} +{{- $title := (.Get `title`) -}} +{{- $id := md5 (printf $mark .Inner) -}} +{{- $imageFile := print "public" $source -}} +{{- $image := imageConfig $imageFile -}} - - - - - - {{ .Inner | markdownify }} + + + + + + {{ .Inner | markdownify }} - {{ .Inner | markdownify }} - - + {{ .Inner | markdownify }} + + diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html index d54a077..d207d68 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/sidenote.html @@ -1,13 +1,11 @@ -{{ $id := md5 (printf (.Get `mark`) .Inner) }} +{{- $mark := (.Get `mark`) -}} +{{- $set := (.Get `set`) -}} +{{- $id := md5 (printf $mark .Inner) -}} - - - - - {{ .Inner | markdownify }} - - + + + + + {{ .Inner | markdownify }} + + diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/smallcaps.html b/generators/hugo/themes/tdro/layouts/shortcodes/smallcaps.html index 147fbf2..5ca8c2d 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/smallcaps.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/smallcaps.html @@ -1 +1,3 @@ -{{ .Get `set` }} + + {{ .Get `set` }} + diff --git a/generators/hugo/themes/tdro/layouts/shortcodes/video.html b/generators/hugo/themes/tdro/layouts/shortcodes/video.html index a0bf488..745db07 100644 --- a/generators/hugo/themes/tdro/layouts/shortcodes/video.html +++ b/generators/hugo/themes/tdro/layouts/shortcodes/video.html @@ -22,5 +22,5 @@ link to the video instead.

-
{{ .Inner | markdownify }}
+
{{ .Inner | markdownify }}
diff --git a/generators/openring/template.html b/generators/openring/template.html index fdbdc8b..35110c6 100644 --- a/generators/openring/template.html +++ b/generators/openring/template.html @@ -1,16 +1,20 @@ -

On the Web

- -