Add workaround for code icon being chopped off on side

Introduced by 16f08dce7f. Since the aspect
ratio of the icon isn't square, it's too wide and collides with the text
next to it. Would be nice to follow #82 and switch to a better
maintained icon pack.

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "assets/jam"]
 	path = assets/jam
-	url = https://github.com/michaelampr/jam.git
+	url = https://github.com/BBaoVanC/jam.git
 	branch = master

README.md

@@ -1,2 +1,4 @@
 # bobatheme
-Simple Hugo theme
+
+The (boba) best Hugo theme. Contains everything I need for bbaovanc.com and
+boba.best.

archetypes/blog/index.md

@@ -8,7 +8,10 @@ comments: true
 draft: true
 
 authors:
-  - {{ with .Site.Author.name }}{{ . }}{{ else }}John Doe{{ end }}
+  - {{ with .Site.Params.author.name }}{{ . }}{{ else }}John Doe{{ end }}
+
+categories:
+  - archetype-stuff
 
 tags:
   - awesome

archetypes/categories/_index.md

@@ -0,0 +1,15 @@
+---
+
+title: {{ replace .Name "-" " " | title }}
+
+---
+
+A short summary of what the category is about.
+
+<!--more-->
+
+Optionally provide more information about the category here. This part will only
+show on the category page, not on the category list page.
+
+If you delete this section, DO NOT delete the summary separator (`<!--more-->`)
+or else the summary won't be shown.

archetypes/default/index.md

@@ -6,7 +6,7 @@ toc: true
 comments: false
 
 authors:
-  - {{ with .Site.Author.name }}{{ . }}{{ else }}John Doe{{ end }}
+  - {{ with .Site.params.author.name }}{{ . }}{{ else }}John Doe{{ end }}
 
 ---
 

assets/css/syntax-light.css

@@ -1,14 +1,22 @@
+/* tango style */
+
 @media print, (prefers-color-scheme: light) {
   .chroma {
     color: black;
   }
+
+/* Background */ .bg { background-color: #f8f8f8; }
+/* PreWrapper */ .chroma { background-color: #f8f8f8; }
 /* Other */ .chroma .x { color: #000000 }
 /* Error */ .chroma .err { color: #a40000 }
+/* CodeLine */ .chroma .cl {  }
+/* LineLink */ .chroma .lnlinks { outline: none; text-decoration: none; color: inherit }
 /* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; }
-/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; }
-/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc }
-/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
-/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
+/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; }
+/* LineHighlight */ .chroma .hl { background-color: #dfdfdf }
+/* LineNumbersTable */ .chroma .lnt { white-space: pre; -webkit-user-select: none; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
+/* LineNumbers */ .chroma .ln { white-space: pre; -webkit-user-select: none; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
+/* Line */ .chroma .line { display: flex; }
 /* Keyword */ .chroma .k { color: #204a87; font-weight: bold }
 /* KeywordConstant */ .chroma .kc { color: #204a87; font-weight: bold }
 /* KeywordDeclaration */ .chroma .kd { color: #204a87; font-weight: bold }
@@ -83,6 +91,7 @@
 /* GenericTraceback */ .chroma .gt { color: #a40000; font-weight: bold }
 /* GenericUnderline */ .chroma .gl { color: #000000; text-decoration: underline }
 /* TextWhitespace */ .chroma .w { color: #f8f8f8; text-decoration: underline }
+
 }
 
 @media (prefers-color-scheme: light) {

assets/css/syntax.css

@@ -1,11 +1,17 @@
-/* Background */ .chroma { color: #d0d0d0; background-color: #202020 }
+/* native style */
+
+/* Background */ .bg { color: #d0d0d0; background-color: #202020; }
+/* PreWrapper */ .chroma { color: #d0d0d0; background-color: #202020; }
 /* Other */ .chroma .x {  }
 /* Error */ .chroma .err { color: #a61717; background-color: #e3d2d2 }
+/* CodeLine */ .chroma .cl {  }
+/* LineLink */ .chroma .lnlinks { outline: none; text-decoration: none; color: inherit }
 /* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; }
-/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; }
-/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #363636 }
-/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 }
-/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 }
+/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; }
+/* LineHighlight */ .chroma .hl { background-color: #363636 }
+/* LineNumbersTable */ .chroma .lnt { white-space: pre; -webkit-user-select: none; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 }
+/* LineNumbers */ .chroma .ln { white-space: pre; -webkit-user-select: none; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 }
+/* Line */ .chroma .line { display: flex; }
 /* Keyword */ .chroma .k { color: #6ab825; font-weight: bold }
 /* KeywordConstant */ .chroma .kc { color: #6ab825; font-weight: bold }
 /* KeywordDeclaration */ .chroma .kd { color: #6ab825; font-weight: bold }

assets/js/back-to-top.js

@@ -1,8 +0,0 @@
-const backToTop = document.getElementById("back-to-top");
-window.onscroll = function() {
-    if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
-        backToTop.style.display = "block";
-    } else {
-        backToTop.style.display = "none";
-    }
-}

assets/js/bobatheme.js

@@ -0,0 +1,25 @@
+// code block copy to clipboard
+window.onload = () => {
+    document.querySelectorAll(".code-block").forEach(codeBlock => {
+        const button = codeBlock.querySelector(".code-header > .code-copy-button");
+
+        // lang will not be unset because we default it to text
+        // clone it so it doesn't change the actual DOM element
+        const codeElem = codeBlock.querySelector("code[data-lang]").cloneNode(true);
+        // bashsession: remove command output lines
+        codeElem.querySelectorAll(".go").forEach(e => e.parentNode.removeChild(e));
+        // bashsession: remove prompt symbol
+        codeElem.querySelectorAll(".gp").forEach(e => e.parentNode.removeChild(e));
+        const rawCode = codeElem.innerText;
+
+        const originalCopyText = button.innerHTML;
+        button.onclick = event => {
+            navigator.clipboard.writeText(rawCode);
+            // TODO: maybe we could add a fancier indicator, like a flash or something
+            event.target.innerHTML = "Copied!";
+            setTimeout(() => {
+                event.target.innerHTML = originalCopyText;
+            }, 3000);
+        }
+    });
+}

assets/js/share-event.js

@@ -1,3 +0,0 @@
-function share_event(service) {
-    // this function does nothing by default
-}

data/meses.yml

@@ -1,12 +0,0 @@
-1: "enero"
-2: "febrero"
-3: "marzo"
-4: "abril"
-5: "mayo"
-6: "julio"
-7: "junio"
-8: "agosto"
-9: "septiembre"
-10: "octubre"
-11: "noviembre"
-12: "diciembre"

exampleSite/config.yaml

@@ -1,65 +0,0 @@
-baseURL: https://example.com
-theme: bobatheme
-defaultContentLanguage: en
-copyright: '&copy; 2021 bbaovanc <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>'
-sectionPagesMenu: main
-enableRobotsTXT: true
-paginate: 5
-enableGitInfo: true
-
-taxonomies:
-  _merge: deep
-
-author:
-  name: bbaovanc
-
-markup: # this just keeps the bobatheme markup styling
-  _merge: deep
-
-params:
-  # these are for the OpenGraph/Twitter embeds in Hugo
-  description: Example website for bobatheme
-
-  # these are for favicons in bobatheme (disabled by default)
-  # faviconSVG: favicon.svg
-  # appleTouchPNG: apple-touch-icon.png
-
-  # show reading time (enabled by default)
-  # readingtime: true
-
-  # used for "View source" (unset by default)
-  # gitFileURL: https://github.com/BBaoVanC/bobatheme/blob/master
-  # gitFileIcon: github-circle
-
-  # display a "Latest Posts" section on the homepage below its content
-  homepageLatestPosts: true
-
-  # social media share icons
-  # shareButtons:
-  #   twitter: true
-  #   facebook: true
-  #   linkedin: true
-  #   reddit: true
-  #   telegram: true
-
-  # footer: >-
-  #   Some example text for the footer.
-
-
-# see https://gohugo.io/about/hugo-and-gdpr/#all-privacy-settings
-# you probably want to keep this default
-privacy:
-  _merge: deep
-
-languages:
-  en:
-    languageName: English
-    title: Example Website
-    weight: 1
-
-  es:
-    languageName: Español
-    title: Sitio web ejemplo
-    weight: 2
-    params:
-      description: Sitio web ejemplo para bobatheme

hugo.yaml

@@ -2,20 +2,36 @@ markup:
   highlight:
     noClasses: false
     lineNos: true
+  goldmark:
+    parser:
+      attribute:
+        block: true
+        # this is enabled by default already
+        #title: true
 
 params:
   readingtime: true
 
 taxonomies:
+  category: categories
   tag: tags
   author: authors
   series: series
 
+outputs:
+  page:
+    - html
+    - markdown
+
+outputFormats:
+  markdown:
+    ugly: true
+
 privacy:
   googleAnalytics:
     disable: true
 
-  twitter:
+  x:
     enableDNT: true
 
   vimeo:

i18n/en.yaml

@@ -11,11 +11,14 @@ browser_no_video_support:
 latest_posts:
   other: "Latest Posts"
 
+see_also:
+  other: "SEE ALSO:"
+
+copy_to_clipboard:
+  other: "Copy"
+
 
 # Meta items
-long_date:
-  other: "{{ .Date.Format `January 2, 2006` }}"
-
 wordcount:
   one: "{{ . }} word"
   other: "{{ . }} words"
@@ -24,6 +27,12 @@ readingtime:
   one: "{{ . }} min"
   other: "{{ . }} mins"
 
+edit_history:
+  other: "Edit history"
+
+view_markdown:
+  other: "View raw"
+
 
 # Post count
 no_posts:
@@ -39,7 +48,7 @@ read_more:
   other: "Read more"
 
 related_posts:
-  other: "Related posts"
+  other: "Related Posts"
 
 older_post:
   other: "Older"
@@ -49,8 +58,8 @@ newer_post:
 
 
 # ARIA labels
-aria_header_link:
-  other: "header link"
+aria_heading_link:
+  other: "heading link"
 
 aria_back_to_top_button:
   other: "back to top button"
@@ -58,11 +67,14 @@ aria_back_to_top_button:
 aria_rss_link:
   other: "RSS feed link"
 
-aria_post_meta_view_source:
-  other: "link to page source"
+aria_post_meta_edit_history:
+  other: "link to page edit history"
 
-aria_post_meta_translations:
-  other: "translations"
+aria_post_meta_view_markdown:
+  other: "link to view raw markdown code of page"
+
+aria_post_meta_categories:
+  other: "categories"
 
 aria_post_meta_tags:
   other: "tags"
@@ -85,6 +97,9 @@ aria_post_metadata:
 aria_author_metadata:
   other: "author metadata"
 
+aria_taxonomy_metadata:
+  other: "taxonomy metadata"
+
 aria_post_meta_date:
   other: "date"
 
@@ -97,17 +112,32 @@ aria_author_post_count:
 aria_author_word_count:
   other: "word count"
 
+aria_taxonomy_post_count:
+  other: "post count"
+
 aria_series_metadata:
   other: "series metadata"
 
 aria_navbar:
   other: "navigation bar"
 
-aria_langpicker:
-  other: "language picker"
-
-aria_langpicker_list:
-  other: "language list"
-
 aria_table_of_contents:
   other: "table of contents"
+
+aria_share_twitter:
+  other: "share to twitter button"
+
+aria_share_facebook:
+  other: "share to facebook button"
+
+aria_share_linkedin:
+  other: "share to linkedin button"
+
+aria_share_reddit:
+  other: "share to reddit button"
+
+aria_share_telegram:
+  other: "share to telegram button"
+
+aria_share_print:
+  other: "print article button"

i18n/es.yaml

@@ -1,110 +0,0 @@
-# Misc
-credit_comment:
-  other: "<!-- bobatheme está disponible en GitHub basado en la licensia MIT: https://github.com/BBaoVanC/bobatheme. -->"
-
-table_of_contents:
-  other: "Índice"
-
-browser_no_video_support:
-  other: "Tu navegador de internet no admite video."
-
-
-# Meta items
-long_date:
-  other: "{{ .Date.Day }} de {{ index .Data.meses (printf `%d` .Date.Month) }} de {{ .Date.Year }}"
-
-wordcount:
-  one: "{{ . }} palabra"
-  other: "{{ . }} palabras"
-
-readingtime:
-  one: "{{ . }} min"
-  other: "{{ . }} mins"
-
-
-# Post count
-no_posts:
-  other: "¡No hay contenido para mostrar!"
-
-# post_count:
-#   one: "{{ . }} post"
-#   other: "{{ . }} posts"
-
-
-# Navigation
-read_more:
-  other: "Leer más"
-
-related_posts:
-  other: "Publicaciones similares"
-
-older_post:
-  other: "Más antiguo"
-
-newer_post:
-  other: "Más nuevo"
-
-
-# ARIA labels
-# aria_header_link:
-#   other: "header link"
-
-# aria_back_to_top_button:
-#   other: "back to top button"
-
-# aria_rss_link:
-#   other: "RSS feed link"
-
-# aria_post_meta_view_source:
-#   other: "link to page source"
-
-# aria_post_meta_translations:
-#   other: "translations"
-
-# aria_post_meta_tags:
-#   other: "tags"
-
-# aria_post_meta_reading_time:
-#   other: "reading time"
-
-# aria_post_meta_authors:
-#   other: "authors"
-
-# aria_post_meta_series:
-#   other: "series"
-
-# aria_breadcrumbnav:
-#   other: "breadcrumb navigation bar"
-
-# aria_post_metadata:
-#   other: "post metadata"
-
-# aria_author_metadata:
-#   other: "author metadata"
-
-# aria_post_meta_date:
-#   other: "date"
-
-# aria_post_meta_modified_date:
-#   other: "last modified date"
-
-# aria_author_post_count:
-#   other: "post count"
-
-# aria_author_word_count:
-#   other: "word count"
-
-# aria_series_metadata:
-#   other: "series metadata"
-
-# aria_navbar:
-#   other: "navigation bar"
-
-# aria_langpicker:
-#   other: "language picker"
-
-# aria_langpicker_list:
-#   other: "language list"
-
-# aria_table_of_contents:
-#   other: "table of contents"

layouts/_default/_markup/render-heading.html

@@ -1,8 +0,0 @@
-<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="section-header">
-    {{ .Text | safeHTML }}
-    <a href="#{{ .Anchor | safeURL }}">
-        <span class="section-header-link" aria-label="{{ i18n "aria_header_link" }}">
-            {{ partial "icon.html" "link" }}
-        </span>
-    </a>
-</h{{ .Level }}>

layouts/_default/baseof.html

@@ -1,50 +0,0 @@
-{{ partial "credit.html" }}
-<!DOCTYPE html>
-<html lang="{{ .Language.Lang }}">
-    {{ partial "head.html" . }}
-
-    <body>
-        <a id="top" name="top" aria-hidden="true"></a>
-
-        <div class="top">
-            {{ partial "top.html" . }}
-        </div>
-
-        {{ if not .IsHome }}
-            {{ partial "breadcrumb.html" . }}
-        {{ end }}
-
-        <main>
-            {{ block "main" . }}
-                THIS TEXT SHOULD NOT SHOW. YUZSIQGHE (that string is so I can grep for it)
-            {{ end }}
-        </main>
-
-        {{ if or .Site.Copyright .Site.Params.footer }}
-            <hr>
-            <footer>
-                <small>
-                    {{ with .Site.Copyright }}
-                        <p>{{ . | safeHTML }}</p>
-                    {{ end }}
-
-                    {{ with .Site.Params.footer }}
-                        {{ . | $.RenderString (dict "display" "block") }}
-                    {{ end }}
-                </small>
-            </footer>
-        {{ end }}
-
-        <a id="back-to-top" href="#top" aria-label="{{ i18n "aria_back_to_top_button" }}">
-            {{ partial "icon.html" "chevron-up" }}
-        </a>
-        <noscript>
-            <style>
-                #back-to-top {
-                    display: block;
-                }
-            </style>
-        </noscript>
-    </body>
-
-</html>

layouts/_default/list.html

@@ -1,33 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ with .Params.icon }}{{ partial "icon.html" . }}{{ end }}
-        {{ .Title | markdownify }}
-        {{ partial "rss-link.html" . }}
-    </h1>
-
-    <div class="list-page-content">
-        {{ with .Sections }}
-            <div class="sections">
-                {{ range . }}
-                    {{ .Render "summary/section" }}
-                {{ end }}
-            </div>
-        {{ end }}
-
-        <div class="page-list">
-            {{ with .Paginator.Pages }}
-                <ul>
-                    {{ range . }}
-                        <li>{{ .Render "summary/post" }}</li>
-                    {{ end }}
-                </ul>
-            {{ else }}
-                <div>
-                    {{ i18n "no_posts" }}
-                </div>
-            {{ end }}
-        </div>
-    </div>
-
-    {{ partial "pagination.html" . }}
-{{ end }}

layouts/_default/summary/author.html

@@ -1,16 +0,0 @@
-<div class="author">
-    <h2 class="author-name">
-        <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
-        {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
-    </h2>
-
-    {{ partial "post-metadata/author.html" . }}
-
-    <div class="author-description">
-        {{ partial "description-or-summary.html" . }}
-    </div>
-
-    <div class="readmore">
-        <a href="{{ .Permalink }}">{{ i18n "read_more" }} &rarr;</a>
-    </div>
-</div>

layouts/_default/summary/post.html

@@ -1,23 +0,0 @@
-<div class="post">
-    <h2 class="post-title">
-        {{ with .Parent.Params.icon }}{{ partial "icon.html" . }}{{ end }}
-        <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
-        {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
-    </h2>
-
-    {{ partial "post-metadata/short.html" . }}
-
-    {{ with .Resources.GetMatch "feature" }}
-        <div class="post-media">
-            {{ partial "figure.html" (dict "src" . "border" true) }}
-        </div>
-    {{ end }}
-
-    <div class="post-description">
-        {{ partial "description-or-summary.html" . }}
-    </div>
-
-    <div class="readmore">
-        <a href="{{ .Permalink }}">{{ i18n "read_more" }} &rarr;</a>
-    </div>
-</div>

layouts/_default/summary/series.html

@@ -1,26 +0,0 @@
-<div class="post">
-    <h2 class="post-title">
-        {{ with .Parent.Params.icon }}{{ partial "icon.html" . }}{{ end }}
-        <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
-        {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
-    </h2>
-
-    {{ partial "post-metadata/series.html" . }}
-
-    <div class="post-description">
-        {{ partial "description-or-summary.html" . }}
-    </div>
-
-    <div class="series-pages">
-        <ul>
-            {{ $i := 0 }}
-            {{ $total := len .Data.Pages }}
-            {{ range .Data.Pages.Reverse }}
-                {{ $i = add 1 $i }}
-                {{ .Scratch.Set "series_position" $i }}
-                {{ .Scratch.Set "series_total" $total }}
-                <li>{{ .Render "summary/series_post" }}</li>
-            {{ end }}
-        </ul>
-    </div>
-</div>

layouts/_default/summary/series_post.html

@@ -1,29 +0,0 @@
-<div class="post">
-    <div class="post-series-position">
-        {{ if .Scratch.Get "series_position" }}
-            ({{ .Scratch.Get "series_position" }}/{{ .Scratch.Get "series_total" }})
-        {{ end }}
-    </div>
-
-    <h2 class="post-title">
-        {{ with .Parent.Params.icon }}{{ partial "icon.html" . }}{{ end }}
-        <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
-        {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
-    </h2>
-
-    {{ partial "post-metadata/short.html" . }}
-
-    {{ with .Resources.GetMatch "feature" }}
-        <div class="post-media">
-            {{ partial "figure.html" (dict "src" . "border" true) }}
-        </div>
-    {{ end }}
-
-    <div class="post-description">
-        {{ partial "description-or-summary.html" . }}
-    </div>
-
-    <div class="readmore">
-        <a href="{{ .Permalink }}">{{ i18n "read_more" }} &rarr;</a>
-    </div>
-</div>

layouts/_markup/render-codeblock.html

@@ -0,0 +1,15 @@
+{{ $type := "text" }}
+{{ with .Type }}
+    {{ $type = . }}
+{{ end }}
+<div class="code-block">
+    <div class="code-header">
+        <pre class="code-type">{{ $type }}</pre>
+        <a href="javascript:void(0)" class="code-copy-button">
+            {{ i18n "copy_to_clipboard" }}
+        </a>
+    </div>
+
+    {{/* a div.highlight is already created by highlight function */}}
+    {{ highlight .Inner $type }}
+</div>

layouts/_markup/render-heading.html

@@ -0,0 +1,8 @@
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="section-heading">
+    {{ .Text | safeHTML }}
+    <a class="heading-link" href="#{{ .Anchor | safeURL }}">
+        <span aria-label="{{ i18n "aria_heading_link" }}">
+            {{ partial "icon.html" "link" }}
+        </span>
+    </a>
+</h{{ .Level }}>

layouts/_partials/_internal/pagination.html

@@ -0,0 +1,154 @@
+{{- $validFormats := slice "default" "terse" }}
+
+{{- $msg1 := "When passing a map to the internal pagination template, one of the elements must be named 'page', and it must be set to the context of the current page." }}
+{{- $msg2 := "The 'format' specified in the map passed to the internal pagination template is invalid. Valid choices are: %s." }}
+
+{{- $page := . }}
+{{- $format := "default" }}
+
+{{- if reflect.IsMap . }}
+  {{- with .page }}
+    {{- $page = . }}
+  {{- else }}
+    {{- errorf $msg1 }}
+  {{- end }}
+  {{- with .format }}
+    {{- $format = lower . }}
+  {{- end }}
+{{- end }}
+
+{{- if in $validFormats $format }}
+  {{- if gt $page.Paginator.TotalPages 1 }}
+    <ul class="pagination pagination-{{ $format }}">
+      {{- partial (printf "inline/pagination/%s.html" $format) $page }}
+    </ul>
+  {{- end }}
+{{- else }}
+  {{- errorf $msg2 (delimit $validFormats ", ") }}
+{{- end -}}
+
+{{/* Format: default
+{{/* --------------------------------------------------------------------- */}}
+{{- define "_partials/inline/pagination/default.html" }}
+  {{- with .Paginator }}
+    {{- $currentPageNumber := .PageNumber }}
+
+    {{- with .First }}
+      {{- if ne $currentPageNumber .PageNumber }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="First" class="page-link" role="button"><span aria-hidden="true">&laquo;&laquo;</span></a>
+      </li>
+      {{- else }}
+      <li class="page-item disabled">
+        <a aria-disabled="true" aria-label="First" class="page-link" role="button" tabindex="-1"><span aria-hidden="true">&laquo;&laquo;</span></a>
+      </li>
+      {{- end }}
+    {{- end }}
+
+    {{- with .Prev }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="Previous" class="page-link" role="button"><span aria-hidden="true">&laquo;</span></a>
+      </li>
+    {{- else }}
+      <li class="page-item disabled">
+        <a aria-disabled="true" aria-label="Previous" class="page-link" role="button" tabindex="-1"><span aria-hidden="true">&laquo;</span></a>
+      </li>
+    {{- end }}
+
+    {{- $slots := 5 }}
+    {{- $start := math.Max 1 (sub .PageNumber (math.Floor (div $slots 2))) }}
+    {{- $end := math.Min .TotalPages (sub (add $start $slots) 1) }}
+    {{- if lt (add (sub $end $start) 1) $slots }}
+      {{- $start = math.Max 1 (add (sub $end $slots) 1) }}
+    {{- end }}
+
+    {{- range $k := seq $start $end }}
+      {{- if eq $.Paginator.PageNumber $k }}
+      <li class="page-item active">
+        <a aria-current="page" aria-label="Page {{ $k }}" class="page-link" role="button">{{ $k }}</a>
+      </li>
+      {{- else }}
+      <li class="page-item">
+        <a href="{{ (index $.Paginator.Pagers (sub $k 1)).URL }}" aria-label="Page {{ $k }}" class="page-link" role="button">{{ $k }}</a>
+      </li>
+      {{- end }}
+    {{- end }}
+
+    {{- with .Next }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="Next" class="page-link" role="button"><span aria-hidden="true">&raquo;</span></a>
+      </li>
+    {{- else }}
+      <li class="page-item disabled">
+        <a aria-disabled="true" aria-label="Next" class="page-link" role="button" tabindex="-1"><span aria-hidden="true">&raquo;</span></a>
+      </li>
+    {{- end }}
+
+    {{- with .Last }}
+      {{- if ne $currentPageNumber .PageNumber }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="Last" class="page-link" role="button"><span aria-hidden="true">&raquo;&raquo;</span></a>
+      </li>
+      {{- else }}
+      <li class="page-item disabled">
+        <a aria-disabled="true" aria-label="Last" class="page-link" role="button" tabindex="-1"><span aria-hidden="true">&raquo;&raquo;</span></a>
+      </li>
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+
+{{/* Format: terse
+{{/* --------------------------------------------------------------------- */}}
+{{- define "_partials/inline/pagination/terse.html" }}
+  {{- with .Paginator }}
+    {{- $currentPageNumber := .PageNumber }}
+
+    {{- with .First }}
+      {{- if ne $currentPageNumber .PageNumber }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="First" class="page-link" role="button"><span aria-hidden="true">&laquo;&laquo;</span></a>
+      </li>
+      {{- end }}
+    {{- end }}
+
+    {{- with .Prev }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="Previous" class="page-link" role="button"><span aria-hidden="true">&laquo;</span></a>
+      </li>
+    {{- end }}
+
+    {{- $slots := 3 }}
+    {{- $start := math.Max 1 (sub .PageNumber (math.Floor (div $slots 2))) }}
+    {{- $end := math.Min .TotalPages (sub (add $start $slots) 1) }}
+    {{- if lt (add (sub $end $start) 1) $slots }}
+      {{- $start = math.Max 1 (add (sub $end $slots) 1) }}
+    {{- end }}
+
+    {{- range $k := seq $start $end }}
+      {{- if eq $.Paginator.PageNumber $k }}
+      <li class="page-item active">
+        <a aria-current="page" aria-label="Page {{ $k }}" class="page-link" role="button">{{ $k }}</a>
+      </li>
+      {{- else }}
+      <li class="page-item">
+        <a href="{{ (index $.Paginator.Pagers (sub $k 1)).URL }}" aria-label="Page {{ $k }}" class="page-link" role="button">{{ $k }}</a>
+      </li>
+      {{- end }}
+    {{- end }}
+
+    {{- with .Next }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="Next" class="page-link" role="button"><span aria-hidden="true">&raquo;</span></a>
+      </li>
+    {{- end }}
+
+    {{- with .Last }}
+      {{- if ne $currentPageNumber .PageNumber }}
+      <li class="page-item">
+        <a href="{{ .URL }}" aria-label="Last" class="page-link" role="button"><span aria-hidden="true">&raquo;&raquo;</span></a>
+      </li>
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end -}}

layouts/_partials/figure.html

@@ -9,7 +9,7 @@
     {{ with index . "src" }}
         {{ $media := . }}
         {{ if eq .MediaType.MainType "image" }}
-            <img src="{{ $media.Permalink }}" alt="{{ $media.Title }}" />
+            <img src="{{ $media.Permalink }}" alt="{{ $media.Title }}" loading="lazy" />
         {{ else if eq .MediaType.MainType "video" }}
             <video controls preload="metadata">
                 <source src="{{ $media.Permalink }}" alt="{{ $media.Title }}">

layouts/_partials/head.html

@@ -7,17 +7,14 @@
         <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
     {{ end }}
     {{ with resources.Get "css/syntax.css" | fingerprint "sha512" }}
-        <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+        <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous" media="print" onload="this.media='all'">
     {{ end }}
     {{ with resources.Get "css/syntax-light.css" | fingerprint "sha512" }}
-        <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+        <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous" media="print" onload="this.media='all'">
     {{ end }}
 
-    {{ with resources.Get "js/back-to-top.js" | fingerprint "sha512" }}
-        <script defer src="{{ .Permalink }}" type="text/javascript" integrity="{{ .Data.Integrity }}" crossorigin="anonymous"></script>
-    {{ end }}
-    {{ with resources.Get "js/share-event.js" | fingerprint "sha512" }}
-        <script defer src="{{ .Permalink }}" type="text/javascript" integrity="{{ .Data.Integrity }}" crossorigin="anonymous"></script>
+    {{ with resources.Get "js/bobatheme.js" | fingerprint "sha512" }}
+        <script defer src="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous"></script>
     {{ end }}
 
     {{ with .Site.Params.faviconSVG }}
@@ -40,7 +37,7 @@
     {{ partial "seo-tags/author.html" . }}
 
     <meta name="language" content="{{ .Language.Lang }}">
-    <meta name="description" content="{{ (partial "seo-tags/description.html" .) | plainify }}">
+    <meta name="description" content="{{ (partial "seo-description.html" .) | plainify }}">
 
     {{ partial "additional-head.html" . }}
 </head>

layouts/_partials/icon_code.html

@@ -1,6 +1,6 @@
 {{- $icon_resource := resources.Get (printf "jam/icons/%s.svg" .) -}}
 {{- $icon := $icon_resource.Content -}}
-{{- $icon = replaceRE `<svg` `<svg class="icon"` $icon -}}
+{{- $icon = replaceRE `<svg` (printf `<svg class="icon icon-%s"` .) $icon -}}
 {{- $icon = replaceRE `</svg>` (printf `<title>%s icon</title></svg>` .) $icon -}}
 {{- $icon = replaceRE `(width|height)="[0-9]*"` "" $icon -}}
 {{- $icon | safeHTML -}}

layouts/_partials/page-list.html

@@ -0,0 +1,13 @@
+<div class="page-list">
+    {{ with . }}
+        {{ range . }}
+            <article class="page">
+                {{ .Render "summary" }}
+            </article>
+        {{ end }}
+    {{ else }}
+        <div>
+            {{ i18n "no_posts" }}
+        </div>
+    {{ end }}
+</div>

layouts/_partials/page-metadata/author.html

@@ -1,16 +1,16 @@
-<div class="author-metadata" aria-label="{{ i18n "aria_author_metadata" }}">
+<div class="page-metadata" aria-label="{{ i18n "aria_author_metadata" }}">
     {{/* Calculate the total word count */}}
     {{ $total_words := 0 }}
     {{ range .Data.Pages }}
         {{ $total_words = add $total_words .WordCount }}
     {{ end }}
 
-    <span class="author-meta-item" aria-label="{{ i18n "aria_author_post_count" }}">
+    <span class="page-metadata-item" aria-label="{{ i18n "aria_author_post_count" }}">
         {{ partial "icon.html" "newspaper" }}
         {{ i18n "post_count" (len .Data.Pages) }}
     </span>
 
-    <span class="author-meta-item" aria-label="{{ i18n "aria_author_word_count" }}">
+    <span class="page-metadata-item" aria-label="{{ i18n "aria_author_word_count" }}">
         {{ partial "icon.html" "align-left" }}
         {{ i18n "wordcount" $total_words }}
     </span>

layouts/_partials/page-metadata/custom-full.html

@@ -0,0 +1 @@
+<!-- Placeholder for website to add custom post metadata to summaries -->

layouts/_partials/page-metadata/item/authors.html

@@ -1,14 +1,14 @@
 {{ with .Params.authors }}
-    <span class="post-meta-item" aria-label="{{ i18n "aria_post_meta_authors" }}">
+    <span class="page-metadata-item" aria-label="{{ i18n "aria_post_meta_authors" }}">
         {{ partial "icon.html" "user-circle" }}
 
         {{ if index $.Site.Taxonomies "authors" }}
             {{ $authors := slice }}
             {{ range . }}
                 {{ $url := (printf "authors/%s" (. | anchorize)) | absLangURL }}
-                {{ $authors = $authors | append (printf `<a href="%s">%s</a>` $url . | safeHTML) }}
+                {{ $authors = $authors | append (printf `<a href="%s">%s</a>` $url .) }}
             {{ end }}
-            {{ delimit $authors ", " }}
+            {{ delimit $authors ", " | safeHTML }}
         {{ else }}
             {{ delimit . ", " }}
         {{ end }}

layouts/_partials/page-metadata/item/categories.html

@@ -0,0 +1,11 @@
+{{ with (.GetTerms "categories") }}
+    {{ $categories := slice }}
+    {{ range . }}
+        {{ $categories = $categories | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
+    {{ end }}
+
+    <div class="page-metadata-section categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
+        {{ partial "icon.html" "folder" }}
+        {{ delimit $categories ", " | safeHTML }}
+    </div>
+{{ end }}

layouts/_partials/page-metadata/item/edithistory.html

@@ -0,0 +1,8 @@
+{{ if and .Site.Params.gitHistoryURL .File.Path }}
+    <span class="page-metadata-item post-meta-edit-history" aria-label="{{ i18n "aria_post_meta_edit_history" }}">
+        {{ partial "icon.html" "history" }}
+        <a href="{{ printf "%s/content/%s" .Site.Params.gitHistoryURL .File.Path }}" target="_blank" rel="noopener">
+            {{- i18n "edit_history" -}}
+        </a>
+    </span>
+{{ end }}

layouts/_partials/page-metadata/item/readingtime.html

@@ -1,5 +1,5 @@
 {{ if ne .Site.Params.readingtime false }}
-    <span class="post-meta-item" aria-label="{{ i18n "aria_post_meta_reading_time" }}">
+    <span class="page-metadata-item" aria-label="{{ i18n "aria_post_meta_reading_time" }}">
         {{ partial "icon.html" "clock" }}
         {{ i18n "readingtime" .ReadingTime }}
     </span>

layouts/_partials/page-metadata/item/series.html

@@ -4,8 +4,8 @@
         {{ $series = $series | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
     {{ end }}
 
-    <div class="series" aria-label="{{ i18n "aria_post_meta_series" }}">
+    <div class="page-metadata-section series" aria-label="{{ i18n "aria_post_meta_series" }}">
         {{ partial "icon.html" "files" }}
-        {{ delimit $series ", " }}
+        {{ delimit $series ", " | safeHTML }}
     </div>
 {{ end }}

layouts/_partials/page-metadata/item/tags.html

@@ -4,8 +4,8 @@
         {{ $tags = $tags | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
     {{ end }}
 
-    <div class="tags" aria-label="{{ i18n "aria_post_meta_tags" }}">
+    <div class="page-metadata-section tags" aria-label="{{ i18n "aria_post_meta_tags" }}">
         {{ partial "icon.html" "tag" }}
-        {{ delimit $tags ", " }}
+        {{ delimit $tags ", " | safeHTML }}
     </div>
 {{ end }}

layouts/_partials/page-metadata/item/viewraw.html

@@ -0,0 +1,8 @@
+{{ with .OutputFormats.Get "markdown" }}
+    <span class="page-metadata-item post-meta-view-markdown" aria-label="{{ i18n "aria_post_meta_view_markdown" }}">
+        {{ partial "icon.html" "code" }}
+        <a href="{{ .Permalink }}" target="_blank">
+            {{- i18n "view_markdown" -}}
+        </a>
+    </span>
+{{ end }}

layouts/_partials/page-metadata/post-full.html

@@ -0,0 +1,31 @@
+{{ if or .Date .Params.authors .Site.Params.readingtime .Site.Params.gitFileURL }}
+    <div class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
+        {{ if .Date }}
+            <span class="page-metadata-item" aria-label="{{ i18n "aria_post_meta_date" }}">
+                {{ partial "icon.html" "calendar" }}
+                {{ partial "time-element.html" .Date }}
+            </span>
+
+            {{/* TODO: make this be a tooltip */}}
+            {{/* DISABLED
+            {{ if ne (time.Format "2006-01-02" .Lastmod) (time.Format "2006-01-02" .Date) }}
+                <span class="page-metadata-item" aria-label="{{ i18n "aria_post_meta_modified_date" }}">
+                    {{ partial "icon.html" "pencil" }}
+                    {{ partial "time-element.html" .Lastmod }}
+                    {{ end }}
+                </span>
+            */}}
+        {{ end }}
+
+        {{ partial "page-metadata/item/authors.html" . }}
+        {{ partial "page-metadata/item/readingtime.html" . }}
+        {{ partial "page-metadata/item/edithistory.html" . }}
+        {{ partial "page-metadata/item/viewraw.html" . }}
+
+        {{ partial "page-metadata/custom-full.html" . }}
+
+        {{ partial "page-metadata/item/categories.html" . }}
+
+        {{ partial "page-metadata/item/tags.html" . }}
+    </div>
+{{ end }}

layouts/_partials/page-metadata/post-short.html

@@ -0,0 +1,17 @@
+{{ if or .Date .Params.authors .Site.Params.readingtime }}
+    <div class="page-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
+        {{ if .Date }}
+            <span class="page-metadata-item" aria-label="date">
+                {{ partial "icon.html" "calendar" }}
+                {{ partial "time-element.html" .Date }}
+            </span>
+        {{ end }}
+
+        {{ partial "page-metadata/item/authors.html" . }}
+        {{ partial "page-metadata/item/readingtime.html" . }}
+
+        {{ partial "page-metadata/item/series.html" . }}
+        {{ partial "page-metadata/item/categories.html" . }}
+        {{ partial "page-metadata/item/tags.html" . }}
+    </div>
+{{ end }}

layouts/_partials/page-metadata/series.html

@@ -1,11 +1,11 @@
-<div class="post-metadata" aria-label="{{ i18n "aria_series_metadata" }}">
-    <span class="post-meta-item">
+<div class="page-metadata" aria-label="{{ i18n "aria_series_metadata" }}">
+    <span class="page-metadata-item">
         {{ partial "icon.html" "newspaper" }}
         {{ i18n "post_count" (len .Data.Pages) }}
     </span>
 
     {{ if ne .Site.Params.readingtime false }}
-        <span class="post-meta-item">
+        <span class="page-metadata-item">
             {{ partial "icon.html" "clock" }}
             {{ $readingtime := 0 }}
             {{ range .Data.Pages }}
@@ -14,9 +14,4 @@
             {{ i18n "readingtime" $readingtime }}
         </span>
     {{ end }}
-
-    {{ partial "post-meta-item/translations.html" . }}
-    {{ if .File }}
-        {{ partial "post-meta-item/viewsource.html" . }}
-    {{ end }}
 </div>

layouts/_partials/page-metadata/taxonomy.html

@@ -0,0 +1,6 @@
+<div class="taxonomy-metadata" aria-label="{{ i18n "aria_taxonomy_metadata" }}">
+    <span class="taxonomy-meta-item" aria-label="{{ i18n "aria_taxonomy_post_count" }}">
+        {{ partial "icon.html" "newspaper" }}
+        {{ i18n "post_count" (len .Data.Pages) }}
+    </span>
+</div>

layouts/_partials/pagination.html

@@ -0,0 +1,6 @@
+{{ if gt .Paginator.TotalPages 1 }}
+    <nav class="pagination">
+        {{/* https://github.com/gohugoio/hugo/blob/a88b488181279befd50e1d127f9f67604f2f9854/tpl/tplimpl/embedded/templates/_partials/pagination.html */}}
+        {{ partial "_internal/pagination.html" . }}
+    </nav>
+{{ end }}

layouts/_partials/remote_figure.html

@@ -10,7 +10,7 @@
 {{ end }}
 
     {{ if eq $type "image" }}
-        <img src="{{ $src }}" alt="{{ $alt }}" />
+        <img src="{{ $src }}" alt="{{ $alt }}" loading="lazy" />
     {{ else if eq $type "video" }}
         <video controls preload="metadata">
             <source src="{{ $src }}" alt="{{ $alt }}">

layouts/_partials/seo-tags/opengraph.html

@@ -1,5 +1,5 @@
 <meta property="og:title" content="{{ .Title | plainify }}">
-<meta property="og:description" content="{{ (partial "seo-tags/description.html" .) | plainify }}">
+<meta property="og:description" content="{{ (partial "seo-description.html" .) | plainify }}">
 <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
 <meta property="og:url" content="{{ .Permalink }}">
 

layouts/_partials/seo-tags/schema.html

@@ -1,5 +1,5 @@
 <meta itemprop="name" content="{{ .Title | plainify }}">
-<meta itemprop="description" content="{{ (partial "seo-tags/description.html" .) | plainify }}">
+<meta itemprop="description" content="{{ (partial "seo-description.html" .) | plainify }}">
 
 {{ $format := "2006-01-02T15:04:05-07:00" }}
 {{ with .Date }}
@@ -21,6 +21,14 @@
     <meta itemprop="image" content="{{ $featured.Permalink }}">
 {{ end }}
 
-{{ with .Params.tags }}
+{{ with .Keywords }}
     <meta itemprop="keywords" content="{{ delimit . ", " }}">
+{{ else }}
+    {{ with (.GetTerms "tags") }}
+        {{ $tags := slice }}
+        {{ range . }}
+            {{ $tags = $tags | append .LinkTitle }}
+        {{ end }}
+        <meta itemprop="keywords" content="{{ delimit $tags ", " }}">
+    {{ end }}
 {{ end }}

layouts/_partials/seo-tags/twitter-cards.html

@@ -22,8 +22,8 @@
 {{ end }}
 
 <meta name="twitter:title" content="{{ .Title | plainify }}">
-<meta name="twitter:description" content="{{ (partial "seo-tags/description.html" .) | plainify }}">
+<meta name="twitter:description" content="{{ (partial "seo-description.html" .) | plainify }}">
 
-{{ with .Site.Social.twitter }}
+{{ with .Site.Params.social.twitter }}
     <meta name="twitter:site" content="@{{ . }}">
 {{ end }}

layouts/_partials/series-box.html

@@ -12,6 +12,6 @@
             This post is part of a series:
         {{ end }}
 
-        {{ delimit $series ", " }}
+        {{ delimit $series ", " | safeHTML }}
     </div>
 {{ end }}

layouts/_partials/share.html

@@ -3,6 +3,7 @@
         <a class="twitter-share"
            target="_blank"
            rel="noopener"
+           aria-label="{{ i18n "aria_share_twitter" }}"
            onclick="share_event('Twitter');"
            href="https://twitter.com/intent/tweet?url={{ .Permalink }}&text={{ .Title }}&via=bbaovanc">
             {{- partial "icon.html" "twitter" -}}
@@ -13,6 +14,7 @@
         <a class="facebook-share"
            target="_blank"
            rel="noopener"
+           aria-label="{{ i18n "aria_share_facebook" }}"
            onclick="share_event('Facebook');"
            href="https://www.facebook.com/sharer.php?u={{ .Permalink }}">
             {{- partial "icon.html" "facebook" -}}
@@ -23,6 +25,7 @@
         <a class="linkedin-share"
            target="_blank"
            rel="noopener"
+           aria-label="{{ i18n "aria_share_linkedin" }}"
            onclick="share_event('LinkedIn');"
            href="https://www.linkedin.com/sharing/share-offsite/?url={{ .Permalink }}">
             {{- partial "icon.html" "linkedin" -}}
@@ -33,6 +36,7 @@
         <a class="reddit-share"
            target="_blank"
            rel="noopener"
+           aria-label="{{ i18n "aria_share_reddit" }}"
            onclick="share_event('Reddit');"
            href="https://reddit.com/submit?url={{ .Permalink }}&title={{ .Title }}">
             {{- partial "icon.html" "reddit" -}}
@@ -46,10 +50,20 @@
         <a class="telegram-share"
            target="_blank"
            rel="noopener"
+           aria-label="{{ i18n "aria_share_telegram" }}"
            onclick="share_event('Telegram');"
            href="https://t.me/share/url?url={{ .Permalink }}&text={{ .Title }}">
             {{- partial "icon.html" "telegram" -}}
         </a>
     {{ end }}
     */}}
+
+    {{ if .Site.Params.shareButtons.print }}
+        <a class="print-share"
+           aria-label="{{ i18n "aria_share_print" }}"
+           href="javascript:void(0)"
+           onclick="window.print(); share_event('Print');">
+            {{- partial "icon.html" "printer" -}}
+        </a>
+    {{ end }}
 </div>

layouts/_partials/time-element.html

@@ -0,0 +1,3 @@
+<time datetime="{{ .Format "2006-01-02T15:04:05Z07:00" }}" title="{{ . }}">
+    {{ .Format "January 2, 2006" }}
+</time>

layouts/_partials/top.html

@@ -0,0 +1,24 @@
+<div class="top">
+    <header class="header">
+        <a class="heading-link" href="{{ .Site.Home.Permalink | absLangURL }}">
+            {{ .Site.Title | markdownify }}
+        </a>
+    </header>
+
+    <nav class="navbar" aria-label="{{ i18n "aria_navbar" }}">
+        {{ with .Site.Home }}
+            <a class="navbar-item{{ if $.IsHome }} active{{ end }}" href="{{ .Permalink | absLangURL }}">{{ .Title | markdownify }}</a>
+        {{ end }}
+
+        {{ range .Site.Menus.main }}
+            {{ $isActive := false }}
+            {{/* https://discourse.gohugo.io/t/ismenucurrent-not-working-with-using-sectionpagesmenu/46687/2?u=bbaovanc */}}
+            {{ if or ($.HasMenuCurrent .Menu .) (eq .Page $) }}
+                {{ $isActive = true }}
+            {{ end }}
+            <a class="navbar-item{{ if $isActive }} active{{ end }}"
+               {{ if strings.HasPrefix .URL "http" }}target="_blank" rel="noopener"{{ end }}
+               href="{{ .URL }}">{{ .Name }}</a>
+        {{ end }}
+    </nav>
+</div>

layouts/_shortcodes/abbr.html

@@ -0,0 +1,5 @@
+{{ if .IsNamedParams }}
+    <abbr title="{{ .Get "title" }}">{{ .Inner }}</abbr>
+{{ else }}
+    <abbr title="{{ .Get 0 }}">{{ .Inner }}</abbr>
+{{ end }}

layouts/_shortcodes/aside.html

@@ -0,0 +1,28 @@
+{{ $type := "" }}
+{{ if .IsNamedParams }}
+    {{ $type = .Get "type" | default "note" }}
+{{ else }}
+    {{ $type = .Get 0 | default "note" }}
+{{ end }}
+
+{{/* This idea comes from the LoveIt theme:
+     https://github.com/dillonzq/LoveIt/blob/aa834e89af8349f6c18d4c7ad50a73fd5f1e40e0/layouts/shortcodes/admonition.html#L3-L14
+*/}}
+
+{{ $icons := dict "note" "pencil" }}
+{{ $icons  = dict "info" "info" | merge $icons }}
+{{ $icons  = dict "tip" "lightbulb" | merge $icons }}
+{{ $icons  = dict "warning" "info" | merge $icons }}
+{{ $icons  = dict "example" "flask" | merge $icons }}
+{{ $icons  = dict "quote" "quote" | merge $icons }}
+
+<aside class="{{ $type }}">
+    <div class="aside-title">
+        {{ partial "icon.html" (index $icons $type) }}
+        {{ title $type }}
+    </div>
+
+    <div class="aside-content">
+        {{ .Inner | .Page.RenderString (dict "display" "block") }}
+    </div>
+</aside>

layouts/_shortcodes/figure.html

@@ -1,4 +1,4 @@
-{{ $resource := $.Page.Resources.GetMatch (.Get "src") }}
+{{ $resource := .Page.Resources.GetMatch (.Get "src") }}
 
 {{ $noborder := false }}
 {{ if .Get "noborder" }}

layouts/_shortcodes/full-width-hr.html

@@ -0,0 +1 @@
+<hr class="full-width-hr">

layouts/_shortcodes/include.html

@@ -0,0 +1,14 @@
+{{/* https://github.com/gohugoio/hugo/issues/13823#issuecomment-3015270202 */}}
+{{ with .Get 0 -}}
+    {{ with $.Page.GetPage . -}}
+        {{ .RenderShortcodes -}}
+    {{ else with $.Page.Resources.Get . -}}
+        {{ .RenderShortcodes -}}
+    {{ else with resources.Get . -}}
+        {{ .Content -}}
+    {{ else -}}
+        {{ errorf "The %q shortcode was unable to find %q. See %s" $.Name . $.Position -}}
+    {{ end -}}
+{{ else -}}
+    {{ errorf "The %q shortcode requires a positional parameter indicating the logical path of the file to include. See %s" .Name .Position -}}
+{{ end -}}

layouts/_shortcodes/remote-figure.html

@@ -9,5 +9,5 @@
 {{ end }}
 
 <p>
-    {{ partial "remote_figure.html" (dict "src" (.Get "src") "border" $border "hidecaption" $hidecaption "type" "video" "alt" (.Get "alt")) }}
+    {{ partial "remote_figure.html" (dict "src" (.Get "src") "border" $border "hidecaption" $hidecaption "type" (.Get "type") "alt" (.Get "alt")) }}
 </p>

layouts/_shortcodes/see-also.html

@@ -1,6 +1,6 @@
 <div class="see-also">
     {{ with .Site.GetPage (.Get 0) }}
-        <p>SEE ALSO: <a href="{{ .Permalink }}">{{ .Title }}</a></p>
+        <p>{{ i18n "see_also" }} <a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></p>
     {{ else }}
         {{ errorf "Page could not be found for see-also shortcode: %s" .Position }}
     {{ end }}

layouts/authors/list.html

@@ -4,13 +4,17 @@
         {{ .Title | markdownify }}
     </h1>
 
+    {{ with .Content }}
+        {{ . }}
+    {{ end }}
+
     <div class="page-list">
         {{ with .Paginator.Pages }}
-            <ul>
             {{ range . }}
-                    <li>{{ .Render "summary/author" }}</li>
+                <article class="page">
+                    {{ .Render "summary" }}
+                </article>
             {{ end }}
-            </ul>
         {{ else }}
             <div>
                 {{ i18n "no_posts" }}

layouts/authors/summary.html

@@ -0,0 +1,14 @@
+<h2 class="page-title">
+    <a class="heading-link" href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+    {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
+</h2>
+
+{{ partial "page-metadata/author.html" . }}
+
+<div class="page-description">
+    {{ partial "description-or-summary.html" . }}
+</div>
+
+<div class="readmore">
+    <a href="{{ .Permalink }}">{{ i18n "read_more" }} &rarr;</a>
+</div>

layouts/authors/term.html

@@ -1,27 +1,19 @@
 {{ define "main" }}
+    <div class="page-title">
         <h1>
             {{ partial "icon.html" "user-circle" }}
             {{ .Title | markdownify }}
             {{ partial "rss-link.html" . }}
         </h1>
-
-    {{ partial "post-metadata/author.html" . }}
-
-    {{ .Content }}
-
-    <div class="page-list">
-        {{ with .Paginator.Pages }}
-            <ul>
-                {{ range . }}
-                    <li>{{ .Render "summary/post" }}</li>
-                {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
     </div>
+
+    {{ partial "page-metadata/author.html" . }}
+
+    {{ with .Content }}
+        {{ . }}
     {{ end }}
-    </div>
+
+    {{ partial "page-list.html" .Paginator.Pages }}
 
     {{ partial "pagination.html" . }}
 {{ end }}

layouts/baseof.html

@@ -0,0 +1,46 @@
+{{ i18n "credit_comment" | safeHTML }}
+<!DOCTYPE html>
+<html lang="{{ .Language.Lang }}">
+    {{ partial "head.html" . }}
+
+    <body>
+        <a id="skip-to-main" href="#main-content">Skip to main content</a>
+
+        {{ partial "top.html" . }}
+
+        {{ if hugo.IsServer -}}
+            <div style="position: fixed; bottom: 25px; right: 25px;">
+                {{ templates.Current.Name }}
+            </div>
+        {{ end -}}
+
+        <div class="main-container">
+            {{ if not .IsHome }}
+                {{ partial "breadcrumb.html" . }}
+            {{ end }}
+
+            <main id="main-content">
+                {{ block "main" . }}
+                    THIS TEXT SHOULD NOT SHOW. YUZSIQGHE (that string is so I can grep for it)
+                {{ end }}
+            </main>
+        </div>
+
+        {{ block "post-body" . }}
+            {{/* currently this is only used for related posts */}}
+        {{ end }}
+
+        {{ if or .Site.Copyright .Site.Params.footer }}
+            <footer>
+                {{ with .Site.Copyright }}
+                    {{ . | safeHTML }}
+                {{ end }}
+
+                {{ with .Site.Params.footer }}
+                    {{ . | $.RenderString (dict "display" "block") }}
+                {{ end }}
+            </footer>
+        {{ end }}
+    </body>
+
+</html>

layouts/home.html

@@ -0,0 +1,21 @@
+{{ define "main" }}
+    {{ with .Content }}
+        <article class="homepage-content">
+            {{ . }}
+        </article>
+        <hr>
+    {{ end }}
+
+    {{ if .Site.Params.homepageLatestPosts }}
+        <div class="homepage-latest-posts">
+            <h1>
+                {{ i18n "latest_posts" }}
+                {{ partial "rss-link.html" . }}
+            </h1>
+
+            {{ partial "page-list.html" (.Paginate .Site.RegularPages).Pages }}
+
+            {{ partial "pagination.html" . }}
+        </div>
+    {{ end }}
+{{ end }}

layouts/index.html

@@ -1,33 +0,0 @@
-{{ define "main" }}
-    {{ with .Content }}
-        <div class="homepage-content">
-            {{ . }}
-        </div>
-    {{ end }}
-
-    {{ if .Site.Params.homepageLatestPosts }}
-        <div class="hompage-latest-posts">
-            <hr>
-            <h1>
-                {{ i18n "latest_posts" }}
-                {{ partial "rss-link.html" . }}
-            </h1>
-
-            {{ with (.Paginate .Site.RegularPages).Pages }}
-                <div class="page-list">
-                    <ul>
-                        {{ range . }}
-                            <li>{{ .Render "summary/post" }}</li>
-                        {{ end }}
-                    </ul>
-                </div>
-            {{ else }}
-                <div>
-                    {{ i18n "no_posts" }}
-                </div>
-            {{ end }}
-
-            {{ partial "pagination.html" . }}
-        </div>
-    {{ end }}
-{{ end }}

layouts/list.html

@@ -0,0 +1,25 @@
+{{ define "main" }}
+    <h1>
+        {{ with .Params.icon }}{{ partial "icon.html" . }}{{ end }}
+        {{ .Title | markdownify }}
+        {{ partial "rss-link.html" . }}
+    </h1>
+
+    {{ with .Content }}
+        {{ . }}
+    {{ end }}
+
+    <div class="list-page-container">
+        {{ with .Sections }}
+            <div class="sections">
+                {{ range . }}
+                    {{ .Render "summary" }}
+                {{ end }}
+            </div>
+        {{ end }}
+
+        {{ partial "page-list.html" .Paginator.Pages }}
+    </div>
+
+    {{ partial "pagination.html" . }}
+{{ end }}

layouts/partials/credit.html

@@ -1 +0,0 @@
-{{ i18n "credit_comment" | safeHTML }}

layouts/partials/pagination.html

@@ -1,5 +0,0 @@
-{{ if gt .Paginator.TotalPages 1 }}
-    <div class="pagination">
-        {{ template "_internal/pagination.html" . }}
-    </div>
-{{ end }}

layouts/partials/post-meta-item/translations.html

@@ -1,8 +0,0 @@
-{{ if .IsTranslated }}
-    <span class="post-meta-item" aria-label="{{ i18n "aria_post_meta_translations" }}">
-        {{ partial "icon.html" "world" }}
-        {{ range .Translations }}
-            <a href="{{ .Permalink }}">{{ .Language }}</a>
-        {{ end }}
-    </span>
-{{ end }}

layouts/partials/post-meta-item/viewsource.html

@@ -1,13 +0,0 @@
-{{ if and .Site.Params.gitFileURL .File.Path }}
-    <span class="post-meta-item" aria-label="{{ i18n "aria_post_meta_view_source" }}">
-        {{ with .Site.Params.gitFileIcon }}
-            {{ partial "icon.html" . }}
-        {{ else }}
-            {{ partial "icon.html" "file" }}
-        {{ end }}
-
-        <a href="{{ printf "%s/content/%s" .Site.Params.gitFileURL .File.Path }}" target="_blank" rel="noopener">
-            View source
-        </a>
-    </span>
-{{ end }}

layouts/partials/post-metadata/full.html

@@ -1,30 +0,0 @@
-{{ if or .Date .Params.authors .IsTranslated .Site.Params.readingtime .Site.Params.gitFileURL }}
-    <div class="post-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
-        {{ if .Date }}
-            <span class="post-meta-item" aria-label="{{ i18n "aria_post_meta_date" }}">
-                {{ partial "icon.html" "calendar" }}
-                <time datetime="{{ .Date.Format "2006-01-02" }}" pubdate>
-                    {{ i18n "long_date" (dict "Date" .Date "Data" .Site.Data) }}
-                </time>
-            </span>
-
-            {{/* TODO: make this be a tooltip */}}
-            {{/* DISABLED
-            {{ if ne (time.Format "2006-01-02" .Lastmod) (time.Format "2006-01-02" .Date) }}
-                <span class="post-meta-item" aria-label="{{ i18n "aria_post_meta_modified_date" }}">
-                    {{ partial "icon.html" "pencil" }}
-                    <time datetime="{{ .Lastmod.Format "2006-01-02" }}" pubdate>
-                        {{ i18n "long_date" (dict "Date" .Lastmod "Data" .Site.Data) }}
-                    </time>
-                    {{ end }}
-                </span>
-            */}}
-        {{ end }}
-
-        {{ partial "post-meta-item/authors.html" . }}
-        {{ partial "post-meta-item/translations.html" . }}
-        {{ partial "post-meta-item/readingtime.html" . }}
-        {{ partial "post-meta-item/viewsource.html" . }}
-        {{ partial "post-meta-item/tags.html" . }}
-    </div>
-{{ end }}

layouts/partials/post-metadata/short.html

@@ -1,18 +0,0 @@
-{{ if or .Date .Params.authors .IsTranslated .Site.Params.readingtime }}
-    <div class="post-metadata" aria-label="{{ i18n "aria_post_metadata" }}">
-        {{ if .Date }}
-            <span class="post-meta-item" aria-label="date">
-                {{ partial "icon.html" "calendar" }}
-                <time datetime="{{ .Date.Format "2006-01-02" }}" pubdate>
-                    {{ i18n "long_date" (dict "Date" .Date "Data" .Site.Data) }}
-                </time>
-            </span>
-        {{ end }}
-
-        {{ partial "post-meta-item/authors.html" . }}
-        {{ partial "post-meta-item/translations.html" . }}
-        {{ partial "post-meta-item/readingtime.html" . }}
-        {{ partial "post-meta-item/series.html" . }}
-        {{ partial "post-meta-item/tags.html" . }}
-    </div>
-{{ end }}

layouts/partials/top.html

@@ -1,52 +0,0 @@
-<h2 class="header">
-    <a href="{{ .Site.Home.Permalink | absLangURL }}">{{ .Site.Title | markdownify }}</a>
-</h2>
-
-<div class="topbar">
-    <nav class="navbar" aria-label="{{ i18n "aria_navbar" }}">
-        {{ with .Site.Home }}
-            <a class="navbar-item{{ if $.IsHome }} active{{ end }}" href="{{ .Permalink | absLangURL }}">{{ .Title | markdownify }}</a>
-        {{ end }}
-
-        {{ range .Site.Menus.main }}
-            {{ $isActive := false }}
-            {{ if or ($.HasMenuCurrent .Menu .) ($.IsMenuCurrent .Menu .) }}
-                {{ $isActive = true }}
-            {{ end }}
-            <a class="navbar-item{{ if $isActive }} active{{ end }}"
-               {{ if strings.HasPrefix .URL "http" }}target="_blank" rel="noopener"{{ end }}
-               href="{{ .URL }}">{{ .Name }}</a>
-        {{ end }}
-    </nav>
-
-    {{ if .Site.IsMultiLingual }}
-        <details class="langpicker" aria-label="{{ i18n "aria_langpicker" }}">
-            <summary>
-                {{- partial "icon.html" "world" -}}
-            </summary>
-            <ul class="languages" aria-label="{{ i18n "aria_langpicker_list" }}">
-                {{ range .AllTranslations }}
-                    <li>
-                        <a class="langpicker-item{{ if eq .Language $.Site.Language }} active{{ end }}" href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
-                    </li>
-                {{ end }}
-
-                {{ $site_translations := slice }}
-                {{ range .Site.Languages }}
-                    {{ $site_translations = $site_translations | append .LanguageName }}
-                {{ end }}
-
-                {{ $translation_codes := slice }}
-                {{ range .AllTranslations }}
-                    {{ $translation_codes = $translation_codes | append .Language }}
-                {{ end }}
-
-                {{ range (.Site.Languages | complement $translation_codes) }}
-                    <li>
-                        <a class="langpicker-item unavailable" aria-disabled="true">{{ .LanguageName }}</a>
-                    </li>
-                {{ end }}
-            </ul>
-        </details>
-    {{ end }}
-</div>

layouts/series/list.html

@@ -4,13 +4,17 @@
         {{ .Title | markdownify }}
     </h1>
 
-    <div class="series-taxonomy">
-        {{ with .Pages }}
-            <ul>
-                {{ range . }}
-                    <li>{{ .Render "summary/series" }}</li>
+    {{ with .Content }}
+        {{ . }}
+    {{ end }}
+
+    <div class="page-list series">
+        {{ with .Paginator.Pages }}
+            {{ range . }}
+                <div class="page series">
+                    {{ .Render "summary" }}
+                </div>
             {{ end }}
-            </ul>
         {{ else }}
             <div>
                 {{ i18n "no_posts" }}

layouts/series/summary.html

@@ -0,0 +1,19 @@
+<h2 class="page-title">
+    {{ with .Parent.Params.icon }}{{ partial "icon.html" . }}{{ end }}
+    <a class="heading-link" href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+    {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
+</h2>
+
+{{ partial "page-metadata/series.html" . }}
+
+<div class="page-description">
+    {{ partial "description-or-summary.html" . }}
+</div>
+
+<div class="page-list series-inner">
+    {{ range .Data.Pages.Reverse }}
+        <article class="page">
+            {{ .Render "summary" }}
+        </article>
+    {{ end }}
+</div>

layouts/series/term.html

@@ -5,28 +5,16 @@
         {{ partial "rss-link.html" . }}
     </h1>
 
-    {{ partial "post-metadata/series.html" . }}
+    {{ partial "page-metadata/series.html" . }}
 
-    {{ partial "description-or-summary.html" . }}
+    {{ with .Content }}
+        {{ . }}
+    {{ end }}
 
-    <div class="page-list">
     {{ with .Paginator.Pages.Reverse }}
-            <ul>
-                {{ $i := 0 }}
-                {{ $total := len $.Pages }}
-                {{ range . }}
-                    {{ $i = add 1 $i }}
-                    {{ .Scratch.Set "series_position" $i }}
-                    {{ .Scratch.Set "series_total" $total }}
-                    <li>{{ .Render "summary/post" }}</li>
+        {{ partial "page-list.html" . }}
     {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
-        {{ end }}
-    </div>
+
 
     {{ partial "pagination.html" . }}
 {{ end }}

layouts/shortcodes/abbr.html

@@ -1 +0,0 @@
-<abbr title="{{ .Get "title" }}">{{ .Inner }}</abbr>

layouts/shortcodes/aside.html

@@ -1,7 +0,0 @@
-<aside>
-    {{ with .Inner }}
-        {{ . | markdownify }}
-    {{ else }}
-        {{ errorf "The aside shortcode needs to be a closing one (similar to the highlight shortcode, see https://gohugo.io/templates/shortcode-templates/#inner" }}
-    {{ end }}
-</aside>

layouts/shortcodes/image.html

@@ -1,13 +0,0 @@
-{{ $border := false }}
-{{ if .Get "border" }}
-    {{ $border = true }}
-{{ end }}
-
-{{ $hidecaption := false }}
-{{ if .Get "hidecaption" }}
-    {{ $hidecaption = true }}
-{{ end }}
-
-<p>
-    {{ partial "remote_figure.html" (dict "src" (.Get "src") "border" $border "hidecaption" $hidecaption "type" "image" "alt" (.Get "alt")) }}
-</p>

layouts/shortcodes/table.html

@@ -1,10 +0,0 @@
-{{/* See https://willschenk.com/articles/2020/styling_tables_with_hugo/ */}}
-
-{{ $class := "markdown" }}
-{{ with .Get "class" }}
-    {{ $class = delimit (slice $class .) " " }}
-{{ end }}
-
-{{ $htmlTable := .Inner | markdownify }}
-{{ $new := printf `<table class="%s">` $class }}
-{{ (replace $htmlTable "<table>" $new) | safeHTML }}

layouts/single.html

@@ -1,12 +1,12 @@
 {{ define "main" }}
-    <div class="post-title">
+    <div class="page-title">
         <h1>
             {{ .Title | markdownify }}
             {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
         </h1>
     </div>
 
-    {{ partial "post-metadata/full.html" . }}
+    {{ partial "page-metadata/post-full.html" . }}
     {{ partial "series-box.html" . }}
 
     {{ if .Params.Toc }}
@@ -24,13 +24,13 @@
 
     {{ with .Resources.GetMatch "feature" }}
         <div class="post-media">
-            {{ partial "figure.html" (dict "src" . "border" true) }}
+            {{ partial "figure.html" (dict "src" .) }}
         </div>
     {{ end }}
 
-    <div class="post-content">
+    <article class="post-content">
         {{ .Content }}
-    </div>
+    </article>
 
     {{ partial "series-box.html" . }}
 
@@ -68,23 +68,21 @@
         {{ partial "share.html" . }}
     {{ end }}
 
-    {{ $related := .Site.RegularPages.Related . | first 10 }}
-    {{ with $related }}
-        <div class="related">
-            <hr>
-            <h2>{{ i18n "related_posts" }}</h2>
-            <div class="related-posts">
-                {{ range . }}
-                    {{ .Render "summary/post" }}
-                {{ end }}
-            </div>
-            <hr>
-        </div>
-    {{ end }}
-
     {{ if .Params.comments }}
         <div class="comments">
             {{ partial "comments.html" . }}
         </div>
     {{ end }}
 {{ end }}
+
+
+{{ define "post-body" }}
+    {{ $related := .Site.RegularPages.Related . | first 10 }}
+    {{ with $related }}
+        <div class="related-posts">
+            <hr>
+            <h1>{{ i18n "related_posts" }}</h1>
+            {{ partial "page-list.html" . }}
+        </div>
+    {{ end }}
+{{ end }}

layouts/single.markdown.md

@@ -0,0 +1,9 @@
+{{ with .File -}}
+  {{ with (.Path | readFile) -}}
+    {{ . -}}
+  {{ else -}}
+    {{ errorf "file not found: %s" .Path -}}
+  {{ end -}}
+{{ else -}}
+  {{ errorf "no file available for markdown template?" -}}
+{{ end -}}

layouts/summary.html

@@ -0,0 +1,21 @@
+<h2 class="page-title">
+    {{ with .Parent.Params.icon }}{{ partial "icon.html" . }}{{ end }}
+    <a class="heading-link" href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+    {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
+</h2>
+
+{{ partial "page-metadata/post-short.html" . }}
+
+{{ with .Resources.GetMatch "feature" }}
+    <div class="post-media">
+        {{ partial "figure.html" (dict "src" .) }}
+    </div>
+{{ end }}
+
+<div class="page-description">
+    {{ partial "description-or-summary.html" . }}
+</div>
+
+<div class="readmore">
+    <a href="{{ .Permalink }}">{{ i18n "read_more" }} &rarr;</a>
+</div>

layouts/tags/list.html

@@ -1,22 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ partial "icon.html" "tag" }}
-        {{ .Title | markdownify }}
-    </h1>
-
-    <div class="tag-list">
-        {{ with .Data.Terms.Alphabetical }}
-            <ul>
-                {{ range . }}
-                    <a href="{{ .Page.Permalink }}">
-                        <li>{{ .Page.Title | markdownify }}</li>
-                    </a>
-                {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
-        {{ end }}
-    </div>
-{{ end }}

layouts/tags/term.html

@@ -1,24 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ partial "icon.html" "tag" }}
-        {{ .Title | markdownify }}
-        {{ partial "rss-link.html" . }}
-    </h1>
-
-    {{ partial "description-or-summary.html" . }}
-    <div class="page-list">
-        {{ with .Paginator.Pages }}
-            <ul>
-                {{ range . }}
-                    <li>{{ .Render "summary/post" }}</li>
-                {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
-        {{ end }}
-    </div>
-
-    {{ partial "pagination.html" . }}
-{{ end }}

layouts/taxonomy.html

@@ -0,0 +1,41 @@
+{{ define "main" }}
+    <div class="page-title">
+        <h1>
+            {{ if eq .Data.Singular "tag" }}
+                {{ partial "icon.html" "tag" }}
+            {{ else if eq .Data.Singular "category" }}
+                {{ partial "icon.html" "folder" }}
+            {{ else }}
+                {{ partial "icon.html" "filter" }}
+            {{ end }}
+
+            {{ .Title | markdownify }}
+        </h1>
+    </div>
+
+    {{ with .Content }}
+        {{ . }}
+    {{ end }}
+
+    <div class="taxonomy-list">
+        {{ with .Data.Terms.Alphabetical }}
+            {{ range . }}
+                {{ with .Page }}
+                    <article class="taxonomy-term">
+                        <div class="taxonomy-list-left">
+                            <a href="{{ .Permalink }}">
+                                <p>{{ .Title | markdownify }}</p>
+                            </a>
+                            {{ partial "page-metadata/taxonomy.html" . }}
+                        </div>
+                        {{ partial "description-or-summary.html" . }}
+                    </article>
+                {{ end }}
+            {{ end }}
+        {{ else }}
+            <div>
+                {{ i18n "no_posts" }}
+            </div>
+        {{ end }}
+    </div>
+{{ end }}

layouts/taxonomy/list.html

@@ -1,27 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ if eq .Data.Singular "tag" }}
-            {{ partial "icon.html" "tag" }}
-        {{ else }}
-            {{ partial "icon.html" "filter" }}
-        {{ end }}
-
-        {{ .Title | markdownify }}
-    </h1>
-
-    <div class="taxonomy">
-        {{ with .Data.Terms.Alphabetical }}
-            <ul>
-                {{ range . }}
-                    <li>
-                        <a href="{{ .Page.Permalink }}">{{ .Page.Title | markdownify }}</a>
-                    </li>
-                {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
-        {{ end }}
-    </div>
-{{ end }}

layouts/taxonomy/term.html

@@ -1,29 +0,0 @@
-{{ define "main" }}
-    <h1>
-        {{ if eq .Data.Singular "tag" }}
-            {{ partial "icon.html" "tag" }}
-        {{ else }}
-            {{ partial "icon.html" "filter" }}
-        {{ end }}
-
-        {{ .Title | markdownify }}
-        {{ partial "rss-link.html" . }}
-    </h1>
-
-    {{ partial "description-or-summary.html" . }}
-    <div class="page-list">
-        {{ with .Paginator.Pages }}
-            <ul>
-                {{ range . }}
-                    <li>{{ .Render "summary/post" }}</li>
-                {{ end }}
-            </ul>
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
-        {{ end }}
-    </div>
-
-    {{ partial "pagination.html" . }}
-{{ end }}

layouts/term.html

@@ -0,0 +1,26 @@
+{{ define "main" }}
+    <div class="page-title">
+        <h1>
+            {{ if eq .Data.Singular "tag" }}
+                {{ partial "icon.html" "tag" }}
+            {{ else if eq .Data.Singular "category" }}
+                {{ partial "icon.html" "folder" }}
+            {{ else }}
+                {{ partial "icon.html" "filter" }}
+            {{ end }}
+
+            {{ .Title | markdownify }}
+            {{ partial "rss-link.html" . }}
+        </h1>
+    </div>
+
+    {{ partial "page-metadata/taxonomy.html" . }}
+
+    {{ with .Content }}
+        {{ . }}
+    {{ end }}
+
+    {{ partial "page-list.html" .Paginator.Pages }}
+
+    {{ partial "pagination.html" . }}
+{{ end }}