diff options
| author | Thedro Neely <thedroneely@gmail.com> | 2022-07-19 11:59:45 -0400 |
|---|---|---|
| committer | Thedro Neely <thedroneely@gmail.com> | 2022-07-19 11:59:45 -0400 |
| commit | ea54421b15c9705f86a8d25a6caaa40791d66e18 (patch) | |
| tree | 546ec8892c2140a48129fd521189dc68b567c95b /generators | |
| parent | f888991f298e59933250c8d56080c1805068f5e0 (diff) | |
| download | thedroneely.com-ea54421b15c9705f86a8d25a6caaa40791d66e18.tar.gz thedroneely.com-ea54421b15c9705f86a8d25a6caaa40791d66e18.tar.bz2 thedroneely.com-ea54421b15c9705f86a8d25a6caaa40791d66e18.zip | |
app: Refactor and CSS rewrite
Diffstat (limited to 'generators')
57 files changed, 596 insertions, 547 deletions
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 }} </svg> {{ end }} - <figcaption class="has-text-grey-dark">{{ $caption }}</figcaption> + <figcaption>{{ $caption }}</figcaption> </diagram-container> 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)) -}} + +<code-block id="{{ $id }}" {{ if in (lower $options) "linenos" }}data-lines{{ end }}> + <header> + <language-label> + <a href="#{{ $id }}"><code>{{ $type }}</code></a> + </language-label> + </header> + {{ highlight .Inner $type (print $options ",lineAnchors=" "code-line-" (truncate 7 "" (md5 .Inner))) }} +</code-block> + +{{- with $caption -}} + <footer>{{- . | markdownify -}}</footer> +{{- 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 @@ <h{{ .Level }} id="{{ .Anchor | safeURL }}"> <a - class="article__heading__anchor" title="{{ .Text | safeHTML }}" href="#{{ .Anchor | safeURL }}"> {{ .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 @@ /> </a> {{ if $.Title }} -<figcaption class="has-text-grey-dark">{{ $.Title | markdownify }}</figcaption> +<figcaption>{{ $.Title | markdownify }}</figcaption> {{ end -}} </figure> {{- /* 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" }} -<section class="section is-fullheight"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - {{ $type := .Type }} +<main> + <article-archive-list> + {{ $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) }} - <h1 class="article__list title is-4 has-text-weight-normal has-margin-bottom-lg">{{ .Date.Format "2006" }}</h1> - {{ end }} - - <ul class="article__list"> - {{ range $articles }} - {{ if (ne .Params.hidden true) }} - <li> - <a title="{{ .Title }}" class="is-block" href="{{ .RelPermalink }}"> - <span class="article__list__date monospace has-text-grey-dark">{{ .Date.Format "02 Jan" }}</span> - {{- .Title | markdownify -}} - </a> - </li> - {{ end }} - {{ end }} - </ul> + {{ 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) }} + <h1>{{ .Date.Format "2006" }}</h1> + {{ end }} + <ul> + {{ range $articles }} + {{ if (ne .Params.hidden true) }} + <li> + <a title="{{ .Title }}" href="{{ .RelPermalink }}"> + <code><time datetime="{{ dateFormat "2006-01-02" .Date }}">{{ .Date.Format "02 Jan" }}</time></code> + <span>{{- .Title | markdownify -}}</span> + </a> + </li> {{ end }} {{ end }} - - </div> - </div> - </div> -</section> + </ul> + {{ end }} + {{ end }} + </article-archive-list> +</main> {{ 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 @@ <!DOCTYPE html> -<html class="has-navbar-fixed-top" lang="en-us" itemscope itemtype="http://schema.org/Article"> +<html lang="en-us" itemscope itemtype="http://schema.org/Article"> <head> -{{ partial "head.html" . -}} +{{ partial "base-head.html" . -}} </head> <body> -{{ partial "nav.html" . -}} +{{ partial "base-nav.html" . -}} {{- block "main" . }} <p>If you are seeing this, your page content hasn't been created.</p> {{- 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" }} -<section class="section"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - <article class="content"> - <h2 class="title">{{ .Title | markdownify }}</h2> - {{ range .Paginator.Pages }} - {{ .Render "summary" }} - {{ end }} - </article> - {{ partial "pagination.html" . }} - </div> - </div> - </div> -</section> -{{ 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 @@ <link>{{ .Permalink }}</link> <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate> <guid>{{ .Permalink }}</guid> - <description>{{ .Content | html }}</description> + <description>{{ partial "function-content.html" .Content | html }}</description> </item> {{ 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" }} -<section class="section is-fullheight"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - <article class="content"> - <br> - <span class="marginnote rightnote"> - See an archive of all {{ .Type }} <a href="{{ partial "archive-link.html" . }}">here.</a> - </span> - <recent-articles> - {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} - {{ .Render "summary" }} - {{ end }} - </recent-articles> - </article> - {{ partial "pagination.html" . }} - <br> - <a href="{{ partial "archive-link.html" . }}" class="front__more is-block has-text-centered"> - <span>Archive of all {{ .Type }}</span> {{ safeHTML (readFile "public/css/icons/feather/corner-down-right.svg") }} - </a> - </div> - </div> - </div> -</section> +<main> + <article-list> + + <margin-note right> + See an archive of all {{ .Type }} <a href="/archives/{{ .Type }}/">here.</a> + </margin-note> + + <recent-articles> + {{ if eq .Title "Posts" }}<recent-posts>{{ end }} + {{ if eq .Title "Projects" }}<recent-projects>{{ end }} + {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} + {{ .Render "summary" }} + {{ end }} + {{ if eq .Title "Posts" }}</recent-posts>{{ end }} + {{ if eq .Title "Projects" }}</recent-projects>{{ end }} + </recent-articles> + + {{ partial "article-pagination.html" . }} + + {{ partial "article-archive-link.html" . }} + + </article-list> +</main> {{ 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" }} -<main class="section is-block is-fullheight"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - <article class="content document"> - <h1 class="title is-2 serif">{{ .Title | markdownify }}</h1> - {{ if .Params.toc }} - <div class="tableofcontents marginnote rightnote is-inline"> - <div class="is-size-6 is-uppercase has-text-weight-bold has-spacing-widest has-margin-bottom-sm">Table of Contents</div> - {{ .TableOfContents }} - </div> - {{ end }} - - <aside class="subtitle is-6 has-text-grey-dark"> - {{- partial "page-meta.html" . -}} - <br> - <span class="isso-comments-counter"><a class="has-text-grey-dark focus-link" title="Jump to Comments" href="#isso-thread">0 Comments</a> ·</span> - {{- partial "read-time.html" . -}} · {{ .FuzzyWordCount }} words - </aside> - - {{- partial "page-status.html" . -}} - - {{- .Content | - replaceRE "<p>\n<figure>" "<figure>" | - replaceRE "</figure></p>" "</figure>" | - replaceRE "<p>" "<p class=\"serif is-size-serif\">" | - replaceRE "<h2" "<h2 class=\"serif\"" | - replaceRE "<h3" "<h3 class=\"serif\"" | - safeHTML - -}} - </article> - </div> - </div> - </div> +<main> + <article> + <h1>{{ .Title | markdownify }}</h1> + {{- partial "article-table-contents.html" . -}} + {{- partial "article-meta-top.html" . -}} + {{- partial "function-content.html" .Content | safeHTML -}} + </article> + + {{- 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" . -}} </main> - -<aside class="section"> - <div class="container"> - <div class="columns is-tablet is-centered"> - <div class="column is-7 has-text-grey-dark has-text-right"> - <p> - {{ dateFormat "2 January 2006" .Params.date }} - <code> — Written</code> - <br> - {{ if .Params.updated }} - {{ dateFormat "2 January 2006" .Params.updated }} - {{ else }} - {{ dateFormat "2 January 2006" .Params.date }} - {{ end }} - <code> — Updated</code> - <br> - {{ .Site.Author.name }}<code> — Creator</code> - <br> - <a class="has-text-grey-dark" href="{{ strings.TrimRight "/" .Permalink }}.md">{{ .Slug }}.md</a><code> — Article</code> - </p> - </div> - </div> - </div> -</aside> - -<aside class="section content article__more__content has-margin-bottom-none"> - <div class="container"> - <div class="columns is-tablet is-centered"> - <div class="column is-7"> - - <section class="section-vertical"> - <h2 class="is-uppercase is-size-5 has-spacing-widest has-margin-bottom-lg">More Content</h2> - {{ $related := shuffle .Site.RegularPages | first 3 }} - {{ with $related }} - {{ range . }} - - <ul> - <li> - <p class="has-margin-none"> - <a href="{{ .RelPermalink }}" title="{{ truncate 100 "..." .Summary }}" class="serif is-size-4"> - {{ .Title | markdownify }} - </a> - </p> - <time datetime="{{ dateFormat "2006-01-02" .Date }}"> - {{ dateFormat "02 Jan 2006" .Date }} - </time> - </li> - </ul> - - {{ end }} - {{ end }} - </section> - - </div> - </div> - </div> -</aside> - -<aside class="section content article__webring"> - <div class="container"> - <div class="columns is-tablet is-centered"> - <div class="column is-7"> - - <section class="webring section-vertical"> - <a href="https://git.sr.ht/~sircmpwn/openring" - title="Generated by Open Ring" - class="attribution is-pulled-right has-text-grey-dark"> - <span class="button item__box item__no__hover"> - {{ safeHTML (readFile "public/css/icons/feather/help-circle.svg") }} - <span>Openring</span> - </span> - </a> - {{- partial "openring.html" . -}} - </section> - - </div> - </div> - </div> -</aside> - -{{ if .Params.syntax }} -<link rel="stylesheet" href="/css/syntax-highlight.css"> -{{ end }} - -<aside class="section content container"> - <div class="columns is-centered"> - <div class="column is-7"> - - <h1 id="comments" class="is-uppercase is-size-5 has-spacing-widest">Comments</h1> - - <script - data-isso="/isso/" - data-title="{{ .Title }}" - data-isso-css="false" - data-isso-reply-notifications="true" - src="/isso/js/embed.min.js"> - </script> - - <div id="isso-thread" data-title="{{ .Title }}"></div> - - </div> - </div> -</aside> - {{ 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" }} -<section class="section is-fullheight"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - <article class="content document"> - <h1 class="title is-3">{{ .Title | markdownify }}</h1> - {{- partial "page-status.html" . -}} - {{- .Content | safeHTML }} - </article> - </div> - </div> - </div> -</section> +<main> + <article-subsection> + <h1>{{ .Title | markdownify }}</h1> + {{- partial "meta-pagestatus.html" . -}} + {{- .Content | safeHTML -}} + </article-subsection> +</main> {{ 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 @@ -<div class="columns is-mobile"> +<article-card> + <article-thumbnail> + {{ partial "article-thumbnail-image.html" . }} + </article-thumbnail> - <div class="column is-5 has-text-centered"> - {{ partial "thumbnail-image.html" . }} - </div> + <article-summary> + <h2><a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title | markdownify }}</a></h2> - <div class="column is-7"> - <article> - <header class="post-header"> + <article-summary-meta> + {{- partial "meta-pagedate.html" . -}} + {{- partial "meta-pagestatus.html" . -}} + {{- partial "meta-readtime.html" . -}} + </article-summary-meta> - <h2 class="article__title title is-5 has-text-weight-bold"> - <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title | markdownify }}</a> - </h2> - - <p class="article__date subtitle is-6"> - {{ partial "page-date.html" . }}{{ partial "page-status.html" . }} · {{ partial "read-time.html" . }} + <p> + {{ if .Params.summary }} + {{ truncate 75 "..." .Params.summary }} + {{ else }} + {{ truncate 75 "..." .Summary}} + {{ end }} </p> - - </header> - <p class="article__summary">{{ if .Params.summary }}{{ truncate 75 "..." .Params.summary }}{{ else }}{{ truncate 75 "..." .Summary}}{{ end }}</p> - <p><a href='{{ .Permalink }}'>Continue reading ({{ .FuzzyWordCount }} words)</a></p> - </article> - </div> - -</div> - -<hr class="article__divider"> + <a href='{{ .Permalink }}'>Continue reading ({{ .FuzzyWordCount }} words)</a> + </article-summary> +</article-card> 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 := "<span class=\"marginnote rightnote\">See an archive of all taxonomies <a href=\"/archives/tags/\">here.</a></span>" }} -<section class="section is-fullheight"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - {{ $title := .Title }} - {{ if eq $title "Tags" }} - <article class="content"> - <h1 class="article__list title is-3">Taxonomies</h1> - {{ safeHTML $sidenote }} - {{ range .Paginator.Pages }} - {{ $title := .Title }} - <h1 class="article__list smallcaps title">{{ .Title | title }}</h1> - {{ range $taxonomy := .Site.Taxonomies }} - {{ range $tag, $article := $taxonomy }} - {{ if eq $tag $title }} - <ul class="article__list"> - {{ range $article.Pages }} - <li> - <a title="{{ .Title }}" class="is-block" href="{{ .RelPermalink }}"> - <span class="article__list__date monospace has-text-grey-dark">{{ .Date.Format "02 Jan 2006" }}</span>{{ .Title }} - </a> - </li> - {{ end }} - </ul> + {{ $sidenote := "<margin-note right>See an archive of all taxonomies <a href=\"/archives/tags/\">here.</a></margin-note>" }} + {{ $title := .Title }} + {{ if eq $title "Tags" }} + <main> + <taxonomy-list> + {{ safeHTML $sidenote }} + <h1>Taxonomies</h1> + <hr> + <section> + {{ range .Paginator.Pages }} + {{ $title := .Title }} + <h2>{{ .Title | title }}</h2> + {{- range $taxonomy := .Site.Taxonomies -}} + {{- range $tag, $article := $taxonomy -}} + {{ if eq $tag $title }} + <ul> + {{ range $article.Pages }} + <li> + <a title="{{ .Title }}" href="{{ .RelPermalink }}"> + <code><time datetime="{{ dateFormat "2006-01-02" .Date }}">{{ .Date.Format "02 Jan 2006" }}</time></code> + <span>{{ .Title }}</span> + </a> + </li> {{ end }} + </ul> {{ end }} - {{ end }} - {{ end }} - </article> - {{ partial "pagination.html" . }} - {{ else }} - <article class="content"> - <h1 class="smallcaps title"> - {{ if ne $title "Tags" }} <a href="/{{ .Data.Plural }}/">Tags</a> <span>—</span> <span>{{ end }}{{ .Title | title }}</span> - </h1> - {{ safeHTML $sidenote }} - {{ range $taxonomy := .Site.Taxonomies }} - {{ range $tag, $article := $taxonomy }} - {{ if eq $tag $title }} - <ul class="article__list"> - {{ range $article.Pages }} - <li> - <a title="{{ .Title }}" class="is-block" href="{{ .RelPermalink }}"> - <span class="article__list__date monospace has-text-grey-dark"> - {{- .Date.Format "02 Jan 2006" -}} - </span> - {{- .Title | markdownify -}} - </a> - </li> - {{ end }} - </ul> - {{ end }} - {{ end }} - {{ end }} - </article> + {{- end -}} + {{- end -}} + {{- end -}} + </section> + {{ partial "article-pagination.html" . }} + </taxonomy-list> + </main> + {{ else }} + <main> + <taxonomy-list> + {{ safeHTML $sidenote }} + <h1> + {{ if ne $title "Tags" }} + <a href="/{{ .Data.Plural }}/">Tags</a> + <span>—</span> + <span>{{ .Title | title }}</span> {{ end }} - </div> - </div> - </div> -</section> + </h1> + <hr> + <section> + {{- range $taxonomy := .Site.Taxonomies -}} + {{- range $tag, $article := $taxonomy -}} + {{- if eq $tag $title -}} + <ul> + {{ range $article.Pages }} + <li> + <a title="{{ .Title }}" href="{{ .RelPermalink }}"> + <code><time datetime="{{ dateFormat "2006-01-02" .Date }}">{{- .Date.Format "02 Jan 2006" -}}</time></code> + <span>{{- .Title | markdownify -}}</span> + </a> + </li> + {{ end }} + </ul> + {{- end -}} + {{- end -}} + {{- end -}} + </section> + </taxonomy-list> + </main> + {{ 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" }} -<section class="section is-fullheight"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - {{ $title := .Title }} - <article class="content"> - <h1 class="article__list smallcaps title">{{ .Title | markdownify }}</h1> - {{ range $taxonomy := .Site.Taxonomies }} - {{ $title := .Title }} - {{ range $tag, $article := $taxonomy }} - {{ if ne $tag $title }} - <h1 class="article__list smallcaps title is-4">{{ $tag }}</h1> - <ul class="article__list"> - {{ range $article.Pages }} - <li> - <a title="{{ .Title }}" class="is-block" href="{{ .RelPermalink }}"> - <span class="article__list__date monospace has-text-grey-dark"> - {{- .Date.Format "02 Jan 2006" -}} - </span> - {{- .Title | markdownify -}} - </a> - </li> - {{ end }} - </ul> - {{ end }} + <main> + <taxonomy-archive-list> + {{ $title := .Title }} + <h1>{{ .Title | markdownify }}</h1> + <hr> + <section> + {{ range $taxonomy := .Site.Taxonomies }} + {{ $title := .Title }} + {{ range $tag, $article := $taxonomy }} + {{ if ne $tag $title }} + <h2>{{ $tag }}</h2> + <ul> + {{ range $article.Pages }} + <li> + <a + title="{{ .Title }}" + href="{{ .RelPermalink }}"> + <code><time>{{- .Date.Format "02 Jan 2006" -}}</time></code> + <span>{{- .Title | markdownify -}}</span> + </a> + </li> + {{ end }} + </ul> {{ end }} {{ end }} - </article> - </div> - </div> - </div> -</section> + {{ end }} + </section> + </taxonomy-archive-list> + </main> {{ 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" }} -<section class="section is-fullheight"> - <div class="container"> - <div class="columns is-centered"> - <div class="column is-7"> - <article class="content"> - <h1 class="title is-3">{{ .Type | title }}</h1> - <span class="marginnote rightnote"> - See an archive of all {{ .Type }} <a href="{{ partial "archive-link.html" . }}">here.</a> - </span> - <recent-articles> - <div class="abstract tile is-ancestor has-text-centered"> - {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} - {{ .Render "summary" }} - {{ end }} - </div> - </recent-articles> - </article> - {{ partial "pagination.html" . }} - <br> - <a href="{{ partial "archive-link.html" . }}" class="front__more is-block has-text-centered"> - <span>Archive of all {{ .Type }}</span> {{ safeHTML (readFile "public/css/icons/feather/corner-down-right.svg") }} - </a> - </div> - </div> - </div> -</section> +<main> + <abstracts-page> + <article-list> + <h1>{{ .Type | title }}</h1> + + <margin-note right> + See an archive of all {{ .Type }} <a href="/archives/{{ .Type }}/">here.</a> + </margin-note> + + <recent-articles> + <recent-abstracts> + {{ range where .Paginator.Pages ".Params.hidden" "ne" "true" }} + {{ .Render "summary" }} + {{ end }} + </recent-abstracts> + </recent-articles> + + {{ partial "article-pagination.html" . }} + + {{ partial "article-archive-link.html" . }} + </article-list> + </abstracts-page> +</main> {{ 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 @@ -<div class="tile is-parent"> - <article class="abstract tile is-child"> - {{ partial "thumbnail-image.html" . }} - <h2 class="article__title title is-5 has-text-weight-bold"> - <a href="{{ .Permalink }}" title="{{ .Title }}">{{ .Title | markdownify }}</a> - </h2> - <p class="article__date subtitle is-6"> - {{ partial "page-date.html" . }} <br> {{ partial "read-time.html" .}} - </p> - </article> -</div> +<abstract-card> + <abstract-thumbnail> + {{ partial "article-thumbnail-image.html" . }} + </abstract-thumbnail> + <abstract-summary> + <section> + <h2> + <a + href="{{ .Permalink }}" + title="{{ .Title }}"> + {{ .Title | markdownify }} + </a> + </h2> + <abstract-summary-meta> + <footer> + <p>{{ partial "meta-pagedate.html" . }}</p> + <p>{{ partial "meta-readtime.html" . }}</p> + </footer> + </abstract-summary-meta> + </section> + </abstract-summary> +</abstract-card> 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 @@ +<article-archive-link> + <a href="/archives/{{ .Type }}/"> + <span>Archive of all {{ .Type }}</span> + {{ safeHTML (readFile "public/css/icons/feather/corner-down-right.svg") }} + </a> +</article-archive-link> 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 @@ +<article-comments> + <section> + <h2 id="comments">Comments</h2> + <script + data-isso="/isso/" + data-isso-css="false" + data-title="{{ .Title }}" + data-isso-reply-notifications="true" + src="/isso/js/embed.min.js" + > + </script> + <aside id="isso-thread" data-title="{{ .Title }}"></aside> + </section> +</article-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 @@ +<article-meta-bottom> + {{ dateFormat "2 January 2006" .Params.date }} + <code> — Written</code> + <br> + {{ if .Params.updated }} + {{ dateFormat "2 January 2006" .Params.updated }} + {{ else }} + {{ dateFormat "2 January 2006" .Params.date }} + {{ end }} + <code> — Updated</code> + <br> + {{ .Site.Author.name }}<code> — Creator</code> + <br> + <a href="{{ strings.TrimRight "/" .Permalink }}.md">{{ .Slug }}.md</a><code> — Article</code> +</article-meta-bottom> 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 @@ +<article-meta-top> + <aside> + {{- partial "meta-pagedate.html" . -}} + {{- partial "meta-pagetags.html" . -}} + </aside> + <aside> + {{- partial "meta-commentcount.html" . -}} + {{- partial "meta-readtime.html" . -}} + {{- partial "meta-wordcount.html" . -}} + {{- partial "meta-feedlink.html" . -}} + {{- partial "meta-pagestatus.html" . -}} + </aside> +</article-meta-top> 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 @@ +<article-more-content> + <section> + <h2>More Content</h2> + {{ $more := shuffle .Site.RegularPages | first 3 }} + {{ with $more }} + {{ range . }} + <ul> + <li> + <h3> + <a + href="{{ .RelPermalink }}" + title="{{ truncate 100 "..." .Summary }}" + > + {{ .Title | markdownify }} + </a> + </h3> + <time datetime="{{ dateFormat "2006-01-02" .Date }}"> + {{ dateFormat "January 2, 2006" .Date }} + </time> + </li> + </ul> + {{ end }} + {{ end }} + </section> +</article-more-content> 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 @@ +<article-on-web> + <section> + <button-anchor> + <a href="https://git.sr.ht/~sircmpwn/openring" title="Generated by Open Ring"> + {{ safeHTML (readFile "public/css/icons/feather/help-circle.svg") }} + <span>Openring</span> + </a> + </button-anchor> + <h2>On the Web</h2> + </section> + {{- partial "openring.html" . -}} +</article-on-web> 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 }} + +<pagination-controller> + <nav> + + <pagination-previous> + <a {{ if $HugoPaginator.HasPrev }} + href="{{ $HugoPaginator.Prev.URL }}" + {{ end }} + title="Previous page" + {{ if not $HugoPaginator.HasPrev }} + data-disabled + {{ end }} + > + Previous + </a> + </pagination-previous> + + <ul> + + {{- $.Scratch.Set "__paginator.ellipsed" false -}} + {{- range (first $MyPaginator $HugoPaginator.Pagers) -}} + {{- $right := sub .TotalPages .PageNumber -}} + {{- $showNumber := or (le .PageNumber 1) (eq $right 0) -}} + {{- $showNumber := or $showNumber (and (gt .PageNumber (sub $HugoPaginator.PageNumber 2)) (lt .PageNumber (add $HugoPaginator.PageNumber 2))) -}} + + {{ if $showNumber }} + {{ $.Scratch.Set "__paginator.ellipsed" false }} + {{ $.Scratch.Set "__paginator.shouldEllipse" false }} + {{ else }} + {{ $.Scratch.Set "__paginator.shouldEllipse" (not ($.Scratch.Get "__paginator.ellipsed") ) }} + {{ $.Scratch.Set "__paginator.ellipsed" true }} + {{ end }} + + {{ if $showNumber }} + + <li> + <a + href="{{ .URL }}" + title="Go to page {{ .PageNumber }}" + {{ if eq . $HugoPaginator }}data-pagination-current{{ end }} + > + {{ .PageNumber }} + </a> + </li> + + {{ else if ($.Scratch.Get "__paginator.shouldEllipse") }} + + <li><pagination-ellipsis>…</pagination-ellipsis></li> + + {{ end }} + + {{ end }} + </ul> + <pagination-next> + <a + {{ if not (le (int $MyPaginator) $HugoPaginator.PageNumber) }} + {{ if $HugoPaginator.HasNext }} + href="{{ $HugoPaginator.Next.URL }}" + {{ end }} + {{ end }} + title="Next page" + {{ if le (int $MyPaginator) $HugoPaginator.PageNumber }} + data-disabled + {{ end }} + > + Next + </a> + </pagination-next> + + </nav> +</pagination-controller> +{{ 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 }} + <link rel="stylesheet" href="/css/syntax-highlight.css"> +{{ 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-contents> + <h2>Table of Contents</h2> + {{ .TableOfContents }} + </table-contents> +{{- 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 -}} +<a title="{{ .Title }}" href="{{ .Permalink }}"> + <picture> + <source srcset="/images/thumbnails/{{ partial "article-image.html" . }}.png" type="image/png"> + <source srcset="/images/thumbnails/{{ partial "article-image.html" . }}.jpg" type="image/jpeg"> + <source srcset="/images/thumbnails/{{ partial "article-image.html" . }}.webp" type="image/webp"> + <img + alt="{{ .Title }}" + src="/images/thumbnails/{{ partial "article-image.html" . }}.png" + width="{{ $image.Width }}" + height="{{ $image.Height }}" + /> + </picture> +</a> +{{- else -}} +{{- $image := imageConfig "public/images/thumbnails/placeholder.png" -}} +<a href="{{ .Permalink }}"> + <img + alt="{{ .Title }}" + src="/images/thumbnails/placeholder.png" + height="{{ $image.Height }}" + width="{{ $image.Width }}" + /> +</a> +{{- end -}} diff --git a/generators/hugo/themes/tdro/layouts/partials/footer.html b/generators/hugo/themes/tdro/layouts/partials/base-footer.html index a39bf67..a39bf67 100644 --- a/generators/hugo/themes/tdro/layouts/partials/footer.html +++ b/generators/hugo/themes/tdro/layouts/partials/base-footer.html diff --git a/generators/hugo/themes/tdro/layouts/partials/head.html b/generators/hugo/themes/tdro/layouts/partials/base-head.html index a406d9e..edce96a 100644 --- a/generators/hugo/themes/tdro/layouts/partials/head.html +++ b/generators/hugo/themes/tdro/layouts/partials/base-head.html @@ -1,7 +1,7 @@ <!-- HTML Meta Tags --> -<title>{{ partial "title.html" . -}}</title> +<title>{{ partial "base-title.html" . -}}</title> <meta name="description" content="{{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}"> -<meta name="keywords" content="{{ partial "title.html" . -}}"> +<meta name="keywords" content="{{ partial "base-title.html" . -}}"> <meta name="author" content="{{ .Site.Author.name }}"> <meta charset="utf-8"> @@ -9,12 +9,12 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <!-- Search Engine Tags --> -<meta itemprop="name" content="{{ partial "title.html" . -}}"> +<meta itemprop="name" content="{{ partial "base-title.html" . -}}"> <meta itemprop="description" content="{{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}"> <meta itemprop="image" content="{{ .Site.BaseURL }}/images/thumbnails/{{ partial "article-image.html" . }}.png"> <!-- Open Graph Meta Tags --> -<meta property="og:title" content="{{ partial "title.html" . -}}"> +<meta property="og:title" content="{{ partial "base-title.html" . -}}"> <meta property="og:description" content="{{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}"> <meta property="og:url" content="{{ .Permalink }}"> <meta property="og:image" content="{{ .Site.BaseURL }}/images/thumbnails/{{ partial "article-image.html" . }}.png"> @@ -24,7 +24,7 @@ <!-- Twitter Meta Tags --> <meta name="twitter:card" content="summary_large_image"> -<meta name="twitter:title" content="{{ partial "title.html" . -}}"> +<meta name="twitter:title" content="{{ partial "base-title.html" . -}}"> <meta name="twitter:description" content="{{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}"> <meta name="twitter:image" content="{{ .Site.BaseURL }}/images/thumbnails/{{ partial "article-image.html" . }}.png"> diff --git a/generators/hugo/themes/tdro/layouts/partials/nav.html b/generators/hugo/themes/tdro/layouts/partials/base-nav.html index 1b1829c..1b1829c 100644 --- a/generators/hugo/themes/tdro/layouts/partials/nav.html +++ b/generators/hugo/themes/tdro/layouts/partials/base-nav.html diff --git a/generators/hugo/themes/tdro/layouts/partials/title.html b/generators/hugo/themes/tdro/layouts/partials/base-title.html index 874d944..874d944 100644 --- a/generators/hugo/themes/tdro/layouts/partials/title.html +++ b/generators/hugo/themes/tdro/layouts/partials/base-title.html 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 "<p><figure>" "<figure>" | + replaceRE "<p>\n<figure>" "<figure>" | + replaceRE "</figure></p>" "</figure>" | +-}} + +{{- return $content -}} 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") }} +<a title="Jump to Comments" href="#isso-thread">0 Comments</a> 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") -}} +<a href="/{{ .Type }}/rss.xml" title="Really Simple Syndication Feed (RSS Feed)">RSS Feed</a> 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") }} + <time datetime="{{ dateFormat "2006-01-02" .Params.date }}"> + {{ dateFormat "January 2, 2006" .Params.date }} + </time> + {{else}} + <time datetime="{{ .Date.Format "2006-01-02"}}"> + {{ .Date.Format "January 2, 2006" }} + </time> +{{- 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-indicator> + <strong>DRAFT</strong> + </draft-indicator> +{{ 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") }} + <a href="{{ "tags/" | relURL }}{{ $tag | urlize }}/">{{ $tag }}</a> + {{ 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") -}} + +<span> + {{ $minutes := div .WordCount 150 }} + {{ if lt $minutes 1 }} + 1 minute read + {{- else -}} + {{ $minutes }} minute read + {{ end }} +</span> 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") -}} +<span>{{ .FuzzyWordCount }} words</span> 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 -}} -<a href="{{ "categories/" | absLangURL }}{{ $value | urlize }}/">{{ $value }}</a>{{- 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 }} -<time datetime="{{ dateFormat "2006-01-02" .Params.date }}">{{ dateFormat "2 January 2006" .Params.date }}</time> -{{else}} -<time datetime="{{ .Date.Format "2006-01-02"}}">{{ .Date.Format "2 January 2006" }}</time> -{{- 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 }}<span>·<strong class="has-text-danger"> DRAFT</strong></span>{{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 . }} - · - <a - class="has-text-grey-dark" - href="{{ "tags/" | relURL }}{{ $tag | urlize }}/"> - {{ $tag }} - </a> -{{ 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 }} - -<nav class="pagination" aria-label="pagination"> - - <a {{ if $HugoPaginator.HasPrev }} href="{{ $HugoPaginator.Prev.URL }}" {{ end }} - class="pagination-previous {{ if not $HugoPaginator.HasPrev }}disabled{{ end }}" - aria-label="Previous page" {{ if not $HugoPaginator.HasPrev }}aria-hidden="true"{{ end }}> - Previous - </a> - - <a {{ if not (le (int $MyPaginator) $HugoPaginator.PageNumber) }}{{ if $HugoPaginator.HasNext }} href="{{ $HugoPaginator.Next.URL }}" {{ end }}{{ end }} - class="pagination-next {{ if le (int $MyPaginator) $HugoPaginator.PageNumber }}disabled{{ end }}" - aria-label="Next page" {{ if le (int $MyPaginator) $HugoPaginator.PageNumber }}aria-hidden="true"{{ end }}> - Next - </a> - - <ul class="pagination-list"> - - {{ $.Scratch.Set "__paginator.ellipsed" false }} - {{ range (first $MyPaginator $HugoPaginator.Pagers) }} - {{ $right := sub .TotalPages .PageNumber }} - {{ $showNumber := or (le .PageNumber 3) (eq $right 0) }} - {{ $showNumber := or $showNumber (and (gt .PageNumber (sub $HugoPaginator.PageNumber 2)) (lt .PageNumber (add $HugoPaginator.PageNumber 2))) }} - - {{ if $showNumber }} - {{ $.Scratch.Set "__paginator.ellipsed" false }} - {{ $.Scratch.Set "__paginator.shouldEllipse" false }} - {{ else }} - {{ $.Scratch.Set "__paginator.shouldEllipse" (not ($.Scratch.Get "__paginator.ellipsed") ) }} - {{ $.Scratch.Set "__paginator.ellipsed" true }} - {{ end }} - - {{ if $showNumber }} - - <li> - <a href="{{ .URL }}" aria-label="Go to page {{ .PageNumber }}" - class="pagination-link {{ if eq . $HugoPaginator }}is-current{{ end }}"> - {{ .PageNumber }} - </a> - </li> - - {{ else if ($.Scratch.Get "__paginator.shouldEllipse") }} - - <li><span class="pagination-ellipsis" aria-hidden="true">…</span></li> - - {{ end }} - - {{ end }} - </ul> -</nav> -{{ 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 }} -<a title="{{ .Title }}" href="{{ .Permalink }}"> - <picture> - <source srcset="/images/thumbnails/{{ partial "article-image.html" . }}.png" type="image/png"> - <source srcset="/images/thumbnails/{{ partial "article-image.html" . }}.jpg" type="image/jpeg"> - <source srcset="/images/thumbnails/{{ partial "article-image.html" . }}.webp" type="image/webp"> - <img class="image__thumbnail" alt="{{ .Title }}" src="/images/thumbnails/{{ partial "article-image.html" . }}.png" width="{{ $image.Width }}" height="{{ $image.Height }}"/> - </picture> -</a> -{{ else }} -{{ $image := imageConfig "public/images/thumbnails/placeholder.png" }} -<a href="{{ .Permalink }}"> - <img class="image__thumbnail" alt="{{ .Title }}" src="/images/thumbnails/placeholder.png" height="{{ $image.Height }}" width="{{ $image.Width }}"/> -</a> -{{ 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 @@ -<span class="serif blockquote-footer has-text-right is-block">{{ .Inner | markdownify }}</span> +<blockquote-footer> + {{ .Inner | markdownify }} +</blockquote-footer> 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 -}} <figure> <a href="{{ .Get `source` }}" onclick="return false;"> - <img data-image-zoom src="{{ .Get `source` }}" alt="{{ .Get `title` }}" title="{{ .Get `title` }}" width="{{ $image.Width }}" height="{{ $image.Height }}"/> + <img data-image-zoom + src="{{ .Get `source` }}" + alt="{{ .Get `title` }}" + title="{{ .Get `title` }}" + width="{{ $image.Width }}" + height="{{ $image.Height }}" + /> </a> - <figcaption class="has-text-grey-dark">{{ .Inner | markdownify }}</figcaption> + <figcaption>{{ .Inner | markdownify }}</figcaption> </figure> 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 -}} -<span class="marginnote-container"> - <label for="{{ $id }}" class="marginnote-toggle marginnote-mark" title="{{ .Inner | replaceRE "\n" " " | markdownify }}"><span>{{ .Get `mark` | markdownify }}</span></label> - <input type="checkbox" id="{{ $id }}" class="marginnote-toggle"> - <span class="sans-serif marginnote sideimage {{ .Get `set` }}note"> - <a href="{{.Get `source`}}" onclick="return false;"> - <img data-image-zoom src="{{ .Get `source`}}" alt="{{ .Inner | markdownify }}" title="{{ .Get `title`}}" width="{{ $image.Width }}" height="{{ $image.Height }}"/> +<margin-note-aside> + <label for="{{ $id }}" title="{{ .Inner | replaceRE "\n" " " | markdownify }}"><span>{{ $mark | markdownify }}</span></label> + <input type="checkbox" id="{{ $id }}" name="toggle"> + <margin-note title="{{ $mark }}" image {{ $set }}> + <a href="{{ $source }}" onclick="return false;"> + <img data-image-zoom + src="{{ $source }}" + title="{{ $title }}" + width="{{ $image.Width }}" + height="{{ $image.Height }}" + alt="{{ .Inner | markdownify }}" + /> </a> - <span class="sideimage-footer is-block has-text-centered has-text-grey-dark"><mark>{{ .Inner | markdownify }}</mark></span> - </span> -</span> + <mark>{{ .Inner | markdownify }}</mark> + </margin-note> +</margin-note-aside> 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) -}} -<span class="marginnote-container"> - <label for="{{ $id }}" class="marginnote-toggle marginnote-mark" title="{{ .Inner | replaceRE "\n" " " | markdownify }}"><span>{{ .Get `mark` | markdownify }}</span></label> - <input type="checkbox" id="{{ $id }}" class="marginnote-toggle"> - <span class="sans-serif marginnote {{ .Get `set` }}note"> +<margin-note-aside> + <label for="{{ $id }}" title="{{ .Inner | replaceRE "\n" " " | markdownify }}"><span>{{ $mark | markdownify }}</span></label> + <input type="checkbox" id="{{ $id }}" name="toggle"> + <margin-note title="{{ $mark }}" {{ $set }}> <mark>{{ .Inner | markdownify }}</mark> - </span> -</span> + </margin-note> +</margin-note-aside> 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 -}} -<span class="sidenote-container"> - <label for="{{ $id }}" class="sidenote-toggle sidenote-mark" title="{{ .Inner | replaceRE "\n" " " | markdownify }}"><span>{{ .Get `mark` | markdownify }}</span></label> - <input type="checkbox" id="{{ $id }}" class="sidenote-toggle"> - <span class="sans-serif sidenote sideimage {{ .Get `set` }}note"> - <a href="{{.Get `source`}}" onclick="return false;"> - <img data-image-zoom src="{{ .Get `source`}}" alt="{{ .Inner | markdownify }}" title="{{ .Get `title`}}" width="{{ $image.Width }}" height="{{ $image.Height }}"/> +<side-note-aside> + <label for="{{ $id }}" title="{{ .Inner | replaceRE "\n" " " | markdownify }}"><span>{{ $mark | markdownify }}</span></label> + <input type="checkbox" id="{{ $id }}" name="toggle"> + <side-note title="{{ $mark }}" image {{ $set }}> + <a href="{{ $source }}" onclick="return false;"> + <img data-image-zoom + src="{{ $source }}" + title="{{ $title }}" + width="{{ $image.Width }}" + height="{{ $image.Height }}" + alt="{{ .Inner | markdownify }}" + /> </a> - <span class="sideimage-footer is-block has-text-centered has-text-grey-dark"><mark>{{ .Inner | markdownify }}</mark></span> - </span> -</span> + <mark>{{ .Inner | markdownify }}</mark> + </side-node> +</side-note-aside> 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) -}} -<span class="sidenote-container"> - <label - for="{{ $id }}" - class="sidenote-toggle sidenote-mark" - title="{{ .Inner | replaceRE "\n" " " | markdownify }}"> - <span>{{ .Get `mark` | markdownify }}</span></label> - <input type="checkbox" id="{{ $id }}" class="sidenote-toggle"> - <span class="sans-serif sidenote {{ .Get `set` }}note"> - <mark>{{ .Inner | markdownify }}</mark> - </span> -</span> +<side-note-aside> + <label for="{{ $id }}" title="{{ .Inner | replaceRE "\n" " " | markdownify }}"><span>{{ $mark | markdownify }}</span></label> + <input type="checkbox" id="{{ $id }}" name="toggle"> + <side-note title="{{ $mark }}" {{ $set }}> + <mark >{{ .Inner | markdownify }}</mark> + </side-note> +</side-note-aside> 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 @@ -<span class="smallcaps smallcaps{{ .Get `type` }}">{{ .Get `set` }}</span> +<small-caps {{ .Get `type` }}> + {{ .Get `set` }} +</small-caps> 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 @@ <a href="{{ $source }}">link to the video</a> instead. </p> </video> - <figcaption class="has-text-grey-dark">{{ .Inner | markdownify }}</figcaption> + <figcaption>{{ .Inner | markdownify }}</figcaption> </video-container> 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 @@ -<h2 class="is-inline is-uppercase is-size-5 has-spacing-widest">On the Web</h2> - -<ul class="articles"> +<ul> {{ range .Articles }} - - <li> - <h2> - <a href="{{ .Link }}" target="_blank" rel="noopener" title="{{ .Summary }}" class="serif is-size-4">{{ .Title }}</a> - </h2> - <div class="source is-block">by <a href="{{ .SourceLink}} ">{{ .SourceTitle }}</a></div> - <div class="is-block has-text-grey-dark">{{ .Date | date }}</div> - </li> - - {{end}} - + <li> + <h3> + <a + href="{{ .Link }}" + rel="noopener" + target="_blank" + title="{{ .Summary }}" + > + {{ .Title }} + </a> + </h3> + <p> + by <a href="{{ .SourceLink}} ">{{ .SourceTitle }}</a> + </p> + <time datetime="{{ .Date }}">{{ .Date | date }}</time> + </li> + {{ end }} </ul> |