WIP body-module and smarter usage of container divs

I think this version has the newest features that I'm using. Hopefully I
didn't miss/forget about something when skimming through the Hugo
release history just now.

archetypes/blog/index.md

@@ -24,7 +24,17 @@ series:
 resources:
   - name: feature
     src: something.webp
-    title: Some image (image format can be anything; webp is just an example)
+    title: >-
+      Fallback title if one is not provided when calling figure shortcode with
+      this listed as the src
+    params:
+      alt: Write an accessible description of this image. Don't over-write.
+
+  - src: demonstration.webp
+    params:
+      alt: >-
+        Annotate an image without giving it an explicit name (the filename is
+        simply used as the `name` instead).
 
 ---
 

assets/css/bobastyle.css

@@ -293,17 +293,35 @@ body {
   color: var(--text-0);
   overflow-wrap: break-word;
   margin: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: var(--page-margin);
 }
 
-.main-container {
-  margin: var(--page-margin) auto;
-  /* use padding because otherwise there's no way to have margin be both auto, and a minimum value */
-  padding: 0 var(--page-margin);
-  max-width: calc(720px + 2 * var(--page-margin)); /* padding is included in the element's width */
+.body-module {
+  width: 100%; /* without, it collapses inside flexbox for some reason TODO: figure out why */
+}
+
+.body-module--marginless {
+  margin: 0;
+}
+
+.body-module--full-width {
+  margin: 0 var(--page-margin);
+  /*
+  margin-left: var(--page-margin);
+  margin-right: var(--page-margin);
+  */
+}
+.body-module--wide {
+  margin-left: var(--page-margin);
+  margin-right: var(--page-margin);
+  max-width: 720px;
 }
 
 footer {
-  margin: var(--page-margin) 0;
+  margin-bottom: var(--page-margin);
   text-align: center;
   font-size: smaller;
 }
@@ -312,6 +330,20 @@ footer p {
   margin: 0;
 }
 
+#skip-to-main {
+  position: absolute;
+  padding: 8px;
+  background-color: var(--text-0);
+  color: var(--background-0);
+  transform: translateY(-100%);
+}
+#skip-to-main:focus {
+  transform: translateY(0%);
+}
+#main-content:target {
+  animation: none; /* prevent it from turning yellow */
+}
+
 /* }}} */
 
 /* Top bar formatting {{{ */
@@ -326,7 +358,7 @@ footer p {
    * or it will need its hover background to be chopped off on the left */
 }
 
-.header {
+.brand {
   flex-grow: 1;
   margin: 8px var(--page-margin);
   font-size: 1.25em;
@@ -334,7 +366,7 @@ footer p {
   align-items: center;
 }
 
-.header a {
+.brand a {
   color: inherit;
   font-weight: bold;
 }
@@ -360,28 +392,8 @@ footer p {
 
 /* }}} */
 
-/* Skip to main content {{{ */
-#skip-to-main {
-  position: absolute;
-  padding: 8px;
-  background-color: var(--text-0);
-  color: var(--background-0);
-  transform: translateY(-100%);
-}
-#skip-to-main:focus {
-  transform: translateY(0%);
-}
-#main-content:target {
-  animation: none; /* prevent it from turning yellow */
-}
-/* }}} */
-
 /* Breadcrumb navigation {{{ */
 
-.breadcrumb {
-  margin: var(--page-margin) 0;
-}
-
 .breadcrumb ul {
   margin: 0;
   padding: 0;
@@ -508,6 +520,14 @@ footer p {
   margin-top: 10px;
 }
 
+:is(
+  .page-metadata-section:is(.categories, .tags, .series),
+  .page-metadata-item.authors
+) > a:not(:last-child):after {
+  color: var(--text-0);
+  content: ",";
+}
+
 .post-media {
   margin-top: 15px;
 }
@@ -634,10 +654,6 @@ footer p {
   margin-bottom: 5px;
 }
 
-.view-section {
-  margin-top: 5px;
-}
-
 /* }}} */
 
 
@@ -705,19 +721,6 @@ footer p {
 }
 */
 
-/* See also formating */
-.see-also {
-  background-color: var(--background-1);
-  color: var(--text-1);
-  padding: 8px 12px;
-  border-radius: 8px;
-  margin: 10px 0;
-}
-
-.see-also p {
-  margin: 0;
-}
-
 /* Previous and next page buttons {{{ */
 
 .prevnext {
@@ -768,6 +771,45 @@ footer p {
 
 /* }}} */
 
+/* Related posts section {{{ */
+
+/* set the margins on the contents instead of the parent .related-posts
+ * so that the posts in the list clip off the edge of the screen,
+ * which makes a more obvious indicator that it's scrollable
+ */
+
+.related-posts > hr,
+.related-posts > h1 {
+  margin: var(--page-margin);
+}
+
+.related-posts .page {
+  min-width: 300px;
+  max-width: 300px;
+
+}
+
+.related-posts .page:first-child {
+  margin-left: var(--page-margin);
+}
+.related-posts .page:last-child {
+  margin-right: var(--page-margin);
+}
+
+.related-posts .page-list {
+  display: flex;
+  flex-direction: row;
+  gap: 20px;
+  overflow-x: auto;
+  margin-bottom: var(--page-margin);
+}
+
+/* }}} */
+
+/* }}} */
+
+/* Content components (can appear both in single and list pages) {{{ */
+
 /* Code & code blocks {{{ */
 .code-block {
   display: flex;
@@ -784,10 +826,13 @@ footer p {
   padding: 4px 8px;
   border-top-left-radius: 8px;
   border-top-right-radius: 8px;
+  height: 2em;
+}
+.code-block > .code-header > * {
+  margin: auto 0;
 }
 .code-block > .code-header > .code-type {
   border-top-left-radius: 8px;
-  margin: auto 0;
 }
 /* TODO: make the code copy button prettier */
 .code-block > .code-header > .code-copy-button {
@@ -881,42 +926,21 @@ aside.quote {
 
 /* }}} */
 
-/* Related posts section {{{ */
-
-/* set the margins on the contents instead of the parent .related-posts
- * so that the posts in the list clip off the edge of the screen,
- * which makes a more obvious indicator that it's scrollable
- */
-
-.related-posts > hr,
-.related-posts > h1 {
-  margin: var(--page-margin);
+/* See also formating */
+.see-also {
+  background-color: var(--background-1);
+  color: var(--text-1);
+  padding: 8px 12px;
+  border-radius: 8px;
+  margin: 10px 0;
 }
 
-.related-posts .page {
-  min-width: 300px;
-  max-width: 300px;
-
-}
-
-.related-posts .page:first-child {
-  margin-left: var(--page-margin);
-}
-.related-posts .page:last-child {
-  margin-right: var(--page-margin);
-}
-
-.related-posts .page-list {
-  display: flex;
-  flex-direction: row;
-  gap: 20px;
-  overflow-x: auto;
-  margin-bottom: var(--page-margin);
+.see-also p {
+  margin: 0;
 }
 
 /* }}} */
 
-/* }}} */
 
 
 /* @media specializations {{{ */

assets/css/comments.css

@@ -1,3 +1,14 @@
+.comments > h2 {
+    margin-bottom: 0;
+}
+.comments .email-address-notice {
+    margin: 0;
+    font-size: smaller;
+}
+.comments .enable-javascript-notice {
+    font-style: italic;
+}
+
 /* Isso styling */
 h4.isso-thread-heading {
     color: var(--text-0);

assets/css/noscript.css

@@ -0,0 +1,4 @@
+.page-meta-comments-counter,
+.code-copy-button {
+  display: none;
+}

layouts/_partials/breadcrumb.html

@@ -1,4 +1,4 @@
-<nav class="breadcrumb" aria-label="{{ i18n "aria_breadcrumbnav" }}">
+<nav class="body-module body-module--wide breadcrumb" aria-label="{{ i18n "aria_breadcrumbnav" }}">
     <ul>
         {{ template "breadcrumbnav" (dict "p1" . "p2" .) }}
     </ul>

layouts/_partials/comments.html

@@ -1,15 +1,20 @@
+{{/* put comments CSS here instead of in <head> so that it doesn't get
+   * loaded unnecessarily on regular pages
+   */}}
 {{ with resources.Get "css/comments.css" | fingerprint "sha512" }}
     <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
 {{ end }}
 
-<h2 style="margin-bottom: 0;">Comments</h2>
-<p style="margin: 0; font-size: smaller;">
+<h2>Comments</h2>
+<p class="email-address-notice">
     If you provide an email address, you can enable notifications for
     replies to your comment. It will not be shown publicly.
 </p>
 
 <noscript>
-    <i>Enable JavaScript to see the comment section.</i>
+    <p class="enable-javascript-notice">
+        Enable JavaScript to see the comment section.
+    </p>
 </noscript>
 
 <section id="isso-thread" data-title="{{ .Title }}"></section>

layouts/_partials/head.html

@@ -6,6 +6,12 @@
     {{ with resources.Get "css/bobastyle.css" | fingerprint "sha512" }}
         <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
     {{ end }}
+    {{ with resources.Get "css/noscript.css" | fingerprint "sha512" }}
+        <noscript>
+            <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+        </noscript>
+    {{ end }}
+
     {{ with resources.Get "css/syntax.css" | fingerprint "sha512" }}
         <link rel="stylesheet" type="text/css" href="{{ .Permalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous" media="print" onload="this.media='all'">
     {{ end }}

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

@@ -1,16 +1,9 @@
-{{ with .Params.authors }}
-    <span class="page-metadata-item" data-pagefind-meta="authors" aria-label="{{ i18n "aria_post_meta_authors" }}">
+{{ with .GetTerms "authors" }}
+    <span class="page-metadata-item authors" 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 .) }}
-            {{ end }}
-            {{ delimit $authors ", " | safeHTML }}
-        {{ else }}
-            {{ delimit . ", " }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="author">{{ .LinkTitle }}</a>
         {{ end }}
     </span>
 {{ end }}

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

@@ -4,8 +4,10 @@
         {{ $categories = $categories | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
     {{ end }}
 
-    <div class="page-metadata-section categories" data-pagefind-meta="categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
+    <div class="page-metadata-section categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
         {{ partial "icon.html" "folder" }}
-        {{ delimit $categories ", " | safeHTML }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="category">{{ .LinkTitle }}</a>
+        {{ end }}
     </div>
 {{ end }}

layouts/_partials/page-metadata/item/comments-counter.html

@@ -1,4 +1,4 @@
-<span class="page-metadata-item" aria-label="comments counter">
+<span class="page-metadata-item page-meta-comments-counter" aria-label="comments counter">
     {{ partial "icon.html" "message" }}
     {{/* TODO: figure out if there's a nicer way to generate this URL
        * the current issue is that we can't use RelRef, since content view means that we don't

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

@@ -1,11 +1,8 @@
 {{ with (.GetTerms "series") }}
-    {{ $series := slice }}
-    {{ range . }}
-        {{ $series = $series | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
-    {{ end }}
-
-    <div class="page-metadata-section series" data-pagefind-meta="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 ", " | safeHTML }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="series">{{ .LinkTitle }}</a>
+        {{ end }}
     </div>
 {{ end }}

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

@@ -1,11 +1,10 @@
 {{ with (.GetTerms "tags") }}
     {{ $tags := slice }}
-    {{ range . }}
-        {{ $tags = $tags | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
-    {{ end }}
 
-    <div class="page-metadata-section tags" data-pagefind-meta="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 ", " | safeHTML }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="tag">{{ .LinkTitle }}</a>
+        {{ end }}
     </div>
 {{ end }}

layouts/_partials/seo-tags/opengraph.html

@@ -3,16 +3,6 @@
 <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
 <meta property="og:url" content="{{ .Permalink }}">
 
-{{ $images := $.Resources.ByType "image" }}
-{{ $featured := $images.GetMatch "*feature*" }}
-{{ if not $featured }}
-    {{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}
-{{ end }}
-
-{{ with $featured }}
-    <meta property="og:image" content="{{ $featured.Permalink }}">
-{{ end }}
-
 {{ with .Section }}
     <meta property="article:section" content="{{ . }}">
 {{ end }}
@@ -37,12 +27,38 @@
     <meta property="og:site_name" content="{{ . }}">
 {{ end }}
 
+{{ $images := $.Resources.ByType "image" }}
+{{ $featured := $images.GetMatch "*feature*" }}
+{{ if not $featured }}
+    {{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}
+{{ end }}
+
+{{ with $featured }}
+    <meta property="og:image" content="{{ $featured.Permalink }}">
+    {{ with .Params.alt }}
+        <meta property="og:image:alt" content="{{ . }}">
+    {{ end }}
+    {{ with .MediaType }}
+        <meta property="og:image:type" content="{{ . }}">
+    {{ end }}
+    {{ with .Width }}
+        <meta property="og:image:width" content="{{ . }}">
+    {{ end }}
+    {{ with .Height }}
+        <meta property="og:image:height" content="{{ . }}">
+    {{ end }}
+{{ end }}
+
 {{ $videos := $.Resources.ByType "video" }}
 {{ $featured_video := $videos.GetMatch "*feature*" }}
 {{ if not $featured_video }}
     {{ $featured_video = $videos.GetMatch "{*cover*,*thumbnail*}" }}
 {{ end }}
 
+
 {{ with $featured_video }}
     <meta property="og:video" content="{{ $featured_video.Permalink | absURL }}">
+    {{ with .MediaType }}
+        <meta property="og:video:type" content="{{ . }}">
+    {{ end }}
 {{ end }}

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

@@ -31,6 +31,8 @@
    */}}
 {{ with .Site.Params.social.twitter }}
     <meta name="twitter:site" content="@{{ . }}">
+{{ else }}
+    {{ errorf "a twitter username is required for twitter cards to work" }}
 {{ end }}
 {{ with .GetTerms "authors" }}
     {{ range . }}

layouts/_partials/top.html

@@ -1,9 +1,9 @@
-<div class="top">
-    <header class="header">
+<header class="body-module body-module--marginless top">
+    <div class="brand">
         <a href="{{ .Site.Home.Permalink | absLangURL }}">
             {{ .Site.Title | markdownify }}
         </a>
-    </header>
+    </div>
 
     <nav class="navbar" aria-label="{{ i18n "aria_navbar" }}">
         {{ with .Site.Home }}
@@ -21,4 +21,4 @@
                href="{{ .URL }}">{{ .Name }}</a>
         {{ end }}
     </nav>
-</div>
+</header>

layouts/baseof.html

@@ -8,29 +8,29 @@
 
         {{ partial "top.html" . }}
 
-        <div class="main-container">
-            {{ if not .IsHome }}
-                {{ partial "breadcrumb.html" . }}
-            {{ end }}
+        {{ 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)
+        {{ block "pre-body" . }}{{ end }}
+
+        <main id="main-content">
+            {{ 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 }}
+            <footer class="body-module body-module--wide">
+                {{ with .Site.Copyright }}
+                    {{ . | safeHTML }}
                 {{ end }}
-            </main>
 
-            {{ if or .Site.Copyright .Site.Params.footer }}
-                <footer>
-                    {{ with .Site.Copyright }}
-                        {{ . | safeHTML }}
-                    {{ end }}
-
-                    {{ with .Site.Params.footer }}
-                        {{ . | $.RenderString (dict "display" "block") }}
-                    {{ end }}
-                </footer>
-            {{ end }}
-        </div>
+                {{ with .Site.Params.footer }}
+                    {{ . | $.RenderString (dict "display" "block") }}
+                {{ end }}
+            </footer>
+        {{ end }}
 
         {{ block "post-body" . }}
             {{/* currently this is only used for related posts */}}

layouts/home.html

@@ -1,13 +1,13 @@
 {{ define "main" }}
     {{ with .Content }}
-        <article class="homepage-content">
+        <article class="body-module body-module--wide">
             {{ . }}
         </article>
-        <hr>
+        <hr class="body-module body-module--wide">
     {{ end }}
 
     {{ if .Site.Params.homepageLatestPosts }}
-        <div class="homepage-latest-posts">
+        <div class="body-module body-module--wide">
             <h1>
                 {{ i18n "latest_posts" }}
                 {{ partial "rss-link.html" . }}

layouts/page.html

@@ -1,84 +1,86 @@
 {{ define "main" }}
-    <div class="page-title">
-        <h1>
-            {{ .Title | markdownify }}
-            {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
-        </h1>
-    </div>
+    <article class="body-module body-module--wide">
+        <div class="page-title">
+            <h1>
+                {{ .Title | markdownify }}
+                {{ if .Draft }}{{ partial "icon.html" "write" }}{{ end }}
+            </h1>
+        </div>
 
-    {{ partial "page-metadata/post-full.html" . }}
-    {{ partial "series-box.html" . }}
+        {{ partial "page-metadata/post-full.html" . }}
+        {{ partial "series-box.html" . }}
 
-    {{ if .Params.Toc }}
-        <div class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
-            <details>
-                <summary>{{ i18n "table_of_contents" }}</summary>
+        {{ if .Params.Toc }}
+            <div class="table-of-contents" aria-label="{{ i18n "aria_table_of_contents" }}">
+                <details>
+                    <summary>{{ i18n "table_of_contents" }}</summary>
+                    {{ .TableOfContents }}
+                </details>
+            </div>
+            <div class="table-of-contents print">
+                {{ i18n "table_of_contents" }}
                 {{ .TableOfContents }}
-            </details>
-        </div>
-        <div class="table-of-contents print">
-            {{ i18n "table_of_contents" }}
-            {{ .TableOfContents }}
-        </div>
+            </div>
+        {{ end }}
+
+        {{ partial "feature-figure.html" . }}
+
+        <article class="post-content" data-pagefind-body>
+            {{ .Content }}
+        </article>
+
+        {{ partial "series-box.html" . }}
+
+        {{ if or .NextInSection .PrevInSection }}
+            <div class="prevnext">
+                {{ with .NextInSection }}
+                    <a class="prev" href="{{ .Permalink }}">
+                        <div class="prev-caption">
+                            &larr; {{ i18n "newer_post" }}
+                        </div>
+                        <div class="prev-post">
+                            {{ .Title | markdownify }}
+                        </div>
+                    </a>
+                {{ else }}
+                    <div class="prev"></div>
+                {{ end }}
+
+                {{ with .PrevInSection }}
+                    <a class="next" href="{{ .Permalink }}">
+                        <div class="next-caption">
+                            {{ i18n "older_post" }} &rarr;
+                        </div>
+                        <div class="next-post">
+                            {{ .Title | markdownify }}
+                        </div>
+                    </a>
+                {{ else }}
+                    <div class="next"></div>
+                {{ end }}
+            </div>
+        {{ end }}
+
+        {{ if .Site.Params.shareButtons }}
+            {{ partial "share.html" . }}
+        {{ end }}
+
+        {{ if .Params.comments }}
+            <div class="comments">
+                {{ partial "comments.html" . }}
+            </div>
+        {{ end }}
     {{ end }}
 
-    {{ partial "feature-figure.html" . }}
 
-    <article class="post-content" data-pagefind-body>
-        {{ .Content }}
+    {{ 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 }}
     </article>
-
-    {{ partial "series-box.html" . }}
-
-    {{ if or .NextInSection .PrevInSection }}
-        <div class="prevnext">
-            {{ with .NextInSection }}
-                <a class="prev" href="{{ .Permalink }}">
-                    <div class="prev-caption">
-                        &larr; {{ i18n "newer_post" }}
-                    </div>
-                    <div class="prev-post">
-                        {{ .Title | markdownify }}
-                    </div>
-                </a>
-            {{ else }}
-                <div class="prev"></div>
-            {{ end }}
-
-            {{ with .PrevInSection }}
-                <a class="next" href="{{ .Permalink }}">
-                    <div class="next-caption">
-                        {{ i18n "older_post" }} &rarr;
-                    </div>
-                    <div class="next-post">
-                        {{ .Title | markdownify }}
-                    </div>
-                </a>
-            {{ else }}
-                <div class="next"></div>
-            {{ end }}
-        </div>
-    {{ end }}
-
-    {{ if .Site.Params.shareButtons }}
-        {{ partial "share.html" . }}
-    {{ 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/robots.txt

@@ -1,2 +1,6 @@
 User-Agent: *
 Sitemap: {{ "sitemap.xml" | absLangURL }}
+
+{{/* It complains about the raw markdown output having no title tag */ -}}
+User-Agent: Bingbot
+Disallow: /blog/*.md$

theme.toml

@@ -8,7 +8,7 @@ description = "Simple Hugo theme for boba.best and bbaovanc.com"
 homepage = "https://bbaovanc.com"
 tags = []
 features = []
-min_version = "0.93.0"
+min_version = "0.146.0"
 
 [author]
   name = "bbaovanc"