WIP

It's kind of ugly and weird, and probably not necessary. I might add it
back in the future if it's actually needed again.

archetypes/blog/index.md

@@ -8,7 +8,7 @@ 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

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/bobastyle.css

@@ -173,19 +173,18 @@ html {
 body {
   background-color: var(--background-0);
   color: var(--text-0);
-  margin: 20px;
-  max-width: 720px;
   overflow-wrap: break-word;
+  margin: 0;
 }
 
-@media (min-width: 760px) {
+.main-container {
-  body {
   margin: 20px auto;
-  }
+  padding: 0 20px;
+  max-width: 760px; /* 720px + 20px for left & right padding */
 }
 
 footer {
-  margin-top: 20px;
+  margin: 20px 0;
   text-align: center;
   font-size: smaller;
 }
@@ -308,12 +307,7 @@ h1 svg.icon {
 /* }}} */
 
 
-/* Heading formatting (website title and article section headers) {{{ */
+/* Heading formatting (article section titles) {{{ */
-
-.header {
-  margin: 16px 0;
-  font-size: 1.5em;
-}
 
 /* this is also used i.e. in page-title */
 .heading-link {
@@ -328,26 +322,36 @@ h1 svg.icon {
 
 /* }}} */
 
-/* Navbar formatting {{{ */
+/* Top bar formatting {{{ */
+
+.top {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  background-color: var(--background-1);
+}
+
+.header {
+  flex-grow: 1;
+  margin: 8px 16px;
+  font-size: 1.25em;
+  display: flex;
+  align-items: center;
+}
 
 .navbar {
   display: flex;
-  flex-grow: 1;
+  flex-wrap: wrap;
-  overflow: auto;
-  background-color: var(--background-1);
-  border-radius: 8px;
-  margin-top: 5px;
-  padding: 4px;
 }
 
 .navbar-item {
-  padding: 8px 12px;
+  padding: 12px 16px;
-  border-radius: 12px;
   white-space: nowrap;
 }
 
 .navbar-item:hover {
-  background-color: var(--background-3);
+  background-color: var(--background-2);
   text-decoration: none;
 }
 
@@ -357,20 +361,19 @@ h1 svg.icon {
 
 /* }}} */
 
-/* Back to top {{{ */
+/* Skip to main content {{{ */
-#top {
+#skip-to-main {
-  font-size: 0;
+  position: absolute;
+  padding: 8px;
+  background-color: var(--text-0);
+  color: var(--background-0);
+  transform: translateY(-100%);
 }
-#back-to-top {
+#skip-to-main:focus {
-  position: fixed;
+  transform: translateY(0%);
-  float: right;
+}
-  bottom: 25px;
+#main-content:target {
-  right: 25px;
+  animation: none; /* prevent it from turning yellow */
-  background-color: var(--background-1);
-  color: var(--text-1);
-  border-radius: 100%;
-  padding: 12px;
-  display: none;
 }
 /* }}} */
 
@@ -855,22 +858,22 @@ aside {
 }
 
 aside.note {
-  background-color: var(--background-blue-1);
+  background-color: var(--accent-blue-1);
 }
 aside.info {
-  background-color: var(--background-green-1);
+  background-color: var(--accent-green-1);
 }
 aside.tip {
-  background-color: var(--background-teal-1);
+  background-color: var(--accent-teal-1);
 }
 aside.warning {
-  background-color: var(--background-yellow-1);
+  background-color: var(--accent-yellow-1);
 }
 aside.example {
-  background-color: var(--background-purple-1);
+  background-color: var(--accent-purple-1);
 }
 aside.quote {
-  background-color: var(--background-1);
+  background-color: var(--accent-1);
 }
 
 /* }}} */
@@ -884,47 +887,26 @@ aside.quote {
   margin: 25px 0;
 }
 
-.full-width-page-list > hr,
+.related-posts > hr,
-.full-width-page-list > h1 {
+.related-posts > h1 {
   margin-left: 20px;
   margin-right: 20px;
 }
 
-.full-width-page-list .page {
+.related-posts .page {
   min-width: 300px;
   max-width: 300px;
 
 }
 
-.full-width-page-list .page:first-child {
+.related-posts .page:first-child {
   margin-left: 20px;
 }
-.full-width-page-list .page:last-child {
+.related-posts .page:last-child {
   margin-right: 20px;
 }
 
-@media (max-width: 720px) {
+.related-posts .page-list {
-  /* when the screen is smaller than max size, make sure that the .related div
-   * still reaches the screen edge. then if the posts overflow and require
-   * scrolling, you can see it cut off on the side of your phone screen
-   */
-  .full-width-page-list {
-    margin-left: -20px;
-    margin-right: -20px;
-  }
-}
-
-@media (min-width: 720px) {
-  .full-width-page-list {
-    /* this makes it full width -- 720px max-width on body it is exactly 720px
-     * so .related takes up full width
-     */
-    margin-left: calc(-100vw / 2 + 720px / 2);
-    margin-right: calc(-100vw / 2 + 720px / 2);
-  }
-}
-
-.full-width-page-list .page-list {
   display: flex;
   flex-direction: row;
   gap: 20px;
@@ -946,13 +928,12 @@ aside.quote {
 
 /* Print compatibility {{{ */
 @media print {
-  .top,
+  .top > .navbar,
   .section-header-link,
   .post-meta-edit-history,
   .prevnext,
   .share-buttons,
-  .related-posts,
+  .related-posts {
-  .latest-posts {
     display: none;
   }
 
@@ -961,8 +942,21 @@ aside.quote {
     color-adjust: exact !important;
   }
 
-  body {
+  .top {
+    background-color: unset;
+  }
+  .top > .header {
+    margin-left: 0;
+    margin-right: 0;
+  }
+  .main-container {
     max-width: 100%;
+    margin: 8px 0;
+    padding: 0;
+  }
+
+  .breadcrumb {
+    margin: 8px 0;
   }
 
   table,
@@ -979,8 +973,32 @@ aside.quote {
     display: block;
   }
 
-  #back-to-top {
+  /*
-    display: none !important;
+   * reduce usage of background colors
+   */
+
+  aside {
+    background-color: unset !important;
+    border: 4px solid;
+  }
+
+  aside.note {
+    border-color: var(--background-blue-1);
+  }
+  aside.info {
+    border-color: var(--background-green-1);
+  }
+  aside.tip {
+    border-color: var(--background-teal-1);
+  }
+  aside.warning {
+    border-color: var(--background-yellow-1);
+  }
+  aside.example {
+    border-color: var(--background-purple-1);
+  }
+  aside.quote {
+    border-color: var(--background-1);
   }
 }
 

assets/js/bobatheme.js

@@ -1,13 +1,3 @@
-// back to top
-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";
-    }
-}
-
 // code block copy to clipboard
 window.onload = () => {
     document.querySelectorAll(".code-block").forEach(codeBlock => {

exampleSite/hugo.yaml

@@ -10,13 +10,13 @@ enableGitInfo: true
 taxonomies:
   _merge: deep
 
-author:
-  name: bbaovanc
-
 markup: # this just keeps the bobatheme markup styling
   _merge: deep
 
 params:
+  author:
+    name: bbaovanc
+
   # these are for the OpenGraph/Twitter embeds in Hugo
   description: Example website for bobatheme
 
@@ -32,9 +32,6 @@ params:
   # gitFileIcon: github-circle
   # gitHistoryURL: https://github.com/BBaoVanC/bobatheme/commits/master
 
-  # display a "Latest Posts" section on the homepage below its content
-  homepageLatestPosts: true
-
   # social media share icons
   # shareButtons:
   #   twitter: true

layouts/_default/baseof.html

@@ -4,19 +4,25 @@
     {{ partial "head.html" . }}
 
     <body>
-        <a id="top" aria-hidden="true"></a>
+        <a id="skip-to-main" href="#main-content">Skip to main content</a>
 
         {{ partial "top.html" . }}
 
+        <div class="main-container">
             {{ if not .IsHome }}
                 {{ partial "breadcrumb.html" . }}
             {{ end }}
 
-        <main>
+            <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>
@@ -29,17 +35,6 @@
                 {{ end }}
             </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/single.html

@@ -73,17 +73,16 @@
             {{ partial "comments.html" . }}
         </div>
     {{ end }}
+{{ end }}
 
+
+{{ define "post-body" }}
     {{ $related := .Site.RegularPages.Related . | first 10 }}
     {{ with $related }}
-        <div class="related-posts full-width-page-list">
+        <div class="related-posts">
             <hr>
             <h1>{{ i18n "related_posts" }}</h1>
             {{ partial "page-list.html" . }}
         </div>
     {{ end }}
-
-    {{ if .Site.Params.latestPostsOnContent }}
-        {{ partialCached "latest-posts.html" . }}
-    {{ 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,10 +7,10 @@
         <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/bobatheme.js" | fingerprint "sha512" }}

layouts/partials/latest-posts.html

@@ -1,11 +0,0 @@
-<div class="latest-posts full-width-page-list">
-    <hr>
-    <h1>
-        {{ i18n "latest_posts" }}
-        {{ partial "rss-link.html" .Site.Home }}
-    </h1>
-
-    {{ with .Site.RegularPages | first 5 }}
-        {{ partial "page-list.html" . }}
-    {{ end }}
-</div>

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

@@ -6,9 +6,9 @@
             {{ $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

@@ -6,6 +6,6 @@
 
     <div class="page-metadata-section categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
         {{ partial "icon.html" "folder" }}
-        {{ delimit $categories ", " }}
+        {{ delimit $categories ", " | safeHTML }}
     </div>
 {{ end }}

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

@@ -6,6 +6,6 @@
 
     <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

@@ -6,6 +6,6 @@
 
     <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/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/series-box.html

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

layouts/partials/top.html

@@ -1,21 +1,24 @@
-<header class="header">
+<div class="top">
+    <header class="header">
         <a class="heading-link" href="{{ .Site.Home.Permalink | absLangURL }}">
             {{ .Site.Title | markdownify }}
         </a>
-</header>
+    </header>
 
-<nav class="navbar" aria-label="{{ i18n "aria_navbar" }}">
+    <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 .) }}
+            {{/* 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>
+    </nav>
+</div>

layouts/shortcodes/include.html

@@ -9,9 +9,12 @@
     {{ $path = .Get 0 }}
 {{ end }}
 
-
+{{ with ($path | readFile) }}
-{{ if $markdown }}
+    {{ if $markdown }}
-    {{ $path | readFile | .Page.RenderString (dict "display" "block") }}
+        {{ $path | readFile | $.Page.RenderString (dict "display" "block") }}
-{{ else }}
+    {{ else }}
         {{ $path | readFile }}
+    {{ end }}
+{{ else }}
+    {{ errorf "file not found: %s" $path }}
 {{ end }}