WIP

Support custom keywords instead of defaulting to using tags
Now can set `keywords:` in the front matter for actual keywords
2025-06-13 09:57:30 -05:00 · 2024-01-22 21:23:52 -06:00 · 2024-01-22 20:44:54 -06:00 · 2023-12-01 20:05:42 -06:00 · 2023-12-01 19:57:39 -06:00 · 2023-11-11 20:33:08 -06:00
20 changed files with 100 additions and 145 deletions
--- a/archetypes/blog/index.md
+++ b/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
--- a/archetypes/default/index.md
+++ b/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 }}

 ---

--- a/assets/css/bobastyle.css
+++ b/assets/css/bobastyle.css
@ -177,19 +177,14 @@ body {
  margin: 0;
 }

-.center-body {
-  margin: 20px;
-  max-width: 720px;
-}
-
-@media (min-width: 760px) {
-  .center-body {
-    margin: 20px auto;
-  }
+.main-container {
+  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;
 }
@ -366,20 +361,19 @@ h1 svg.icon {

 /* }}} */

-/* Back to top {{{ */
-#top {
-  font-size: 0;
+/* Skip to main content {{{ */
+#skip-to-main {
+  position: absolute;
+  padding: 8px;
+  background-color: var(--text-0);
+  color: var(--background-0);
+  transform: translateY(-100%);
 }
-#back-to-top {
-  position: fixed;
-  float: right;
-  bottom: 25px;
-  right: 25px;
-  background-color: var(--background-1);
-  color: var(--text-1);
-  border-radius: 100%;
-  padding: 12px;
-  display: none;
+#skip-to-main:focus {
+  transform: translateY(0%);
+}
+#main-content:target {
+  animation: none; /* prevent it from turning yellow */
 }
 /* }}} */

@ -647,7 +641,7 @@ h1 svg.icon {
 /* Content (single) formatting {{{ */

 .series-box {
-  background-color: var(--background-1);
+  background-color: var(--background-1); /* remember to update print styling */
  color: var(--text-1);
  padding: 8px 16px;
  border-radius: 8px;
@ -655,7 +649,7 @@ h1 svg.icon {
 }

 .table-of-contents {
-  background-color: var(--background-1);
+  background-color: var(--background-1); /* remember to update print styling */
  color: var(--text-1);
  padding: 8px 20px;
  border-radius: 8px;
@ -710,7 +704,7 @@ h1 svg.icon {

 /* See also formating */
 .see-also {
-  background-color: var(--background-1);
+  background-color: var(--background-1); /* remember to update print styling */
  color: var(--text-1);
  padding: 8px 12px;
  border-radius: 8px;
@ -776,14 +770,14 @@ h1 svg.icon {
  display: flex;
  flex-direction: column;
  margin: 16px 0;
-  background-color: var(--background-1);
+  background-color: var(--background-1); /* remember to update print styling */
  border-radius: 8px;
 }
 .code-block > .code-header {
  display: flex;
  flex-direction: row;
  justify-content: space-between;
-  background-color: var(--background-2);
+  background-color: var(--background-2); /* remember to update print styling */
  padding: 4px 8px;
  border-top-left-radius: 8px;
  border-top-right-radius: 8px;
@ -863,6 +857,7 @@ aside {
  margin-bottom: 0;
 }

+/* remember to update print styling for all the following asides */
 aside.note {
  background-color: var(--background-blue-1);
 }
@ -893,47 +888,26 @@ aside.quote {
  margin: 25px 0;
 }

-.full-width-page-list > hr,
-.full-width-page-list > h1 {
+.related-posts > hr,
+.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) {
-  /* 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 {
+.related-posts .page-list {
  display: flex;
  flex-direction: row;
  gap: 20px;
@ -960,8 +934,7 @@ aside.quote {
  .post-meta-edit-history,
  .prevnext,
  .share-buttons,
-  .related-posts,
-  .latest-posts {
+  .related-posts {
    display: none;
  }

@ -977,9 +950,10 @@ aside.quote {
    margin-left: 0;
    margin-right: 0;
  }
-  .center-body {
+  .main-container {
    max-width: 100%;
    margin: 8px 0;
+    padding: 0;
  }

  .breadcrumb {
@ -1000,9 +974,18 @@ aside.quote {
    display: block;
  }

-  #back-to-top {
-    display: none !important;
+  /* replace background colors with borders {{{ */
+  .series-box {
  }
+  .table-of-contents {
+  }
+  .see-also {
+  }
+  .code-block {
+  }
+  .code-block > .code-header {
+  }
+  /* all the asides */
 }

 /* }}} */
--- a/assets/css/syntax-light.css
+++ b/assets/css/syntax-light.css
@ -5,16 +5,17 @@
    color: black;
  }

-/* Background */ .bg { background-color: #f8f8f8 }
+/* 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; }
-/* LineHighlight */ .chroma .hl { background-color: #ffffcc }
-/* LineNumbersTable */ .chroma .lnt { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
-/* LineNumbers */ .chroma .ln { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
+/* 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 }
--- a/assets/css/syntax.css
+++ b/assets/css/syntax.css
@ -1,15 +1,16 @@
 /* native style */

-/* Background */ .bg { color: #d0d0d0; background-color: #202020 }
+/* 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; }
-/* LineHighlight */ .chroma .hl { background-color: #ffffcc }
-/* LineNumbersTable */ .chroma .lnt { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 }
-/* LineNumbers */ .chroma .ln { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 }
+/* 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 }
--- a/assets/js/bobatheme.js
+++ b/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 => {
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.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
--- a/config.yaml
+++ b/config.yaml
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -4,46 +4,37 @@
    {{ 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="center-body">
-
+        <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>
-
-            {{ if or .Site.Copyright .Site.Params.footer }}
-                <footer>
-                    {{ with .Site.Copyright }}
-                        <p>{{ . | safeHTML }}</p>
-                    {{ end }}
-
-                    {{ with .Site.Params.footer }}
-                        {{ . | $.RenderString (dict "display" "block") }}
-                    {{ 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>
-
        </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>
--- a/layouts/_default/single.html
+++ b/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 }}
--- a/layouts/partials/figure.html
+++ b/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 }}">
--- a/layouts/partials/head.html
+++ b/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" }}
--- a/layouts/partials/latest-posts.html
+++ b/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>
--- a/layouts/partials/page-metadata/item/authors.html
+++ b/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 }}
--- a/layouts/partials/page-metadata/item/categories.html
+++ b/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 }}
--- a/layouts/partials/page-metadata/item/series.html
+++ b/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 }}
--- a/layouts/partials/page-metadata/item/tags.html
+++ b/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 }}
--- a/layouts/partials/remote_figure.html
+++ b/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 }}">
--- a/layouts/partials/seo-tags/schema.html
+++ b/layouts/partials/seo-tags/schema.html
@ -21,10 +21,14 @@
    <meta itemprop="image" content="{{ $featured.Permalink }}">
 {{ end }}

-{{ with (.GetTerms "tags") }}
-    {{ $tags := slice }}
-    {{ range . }}
-        {{ $tags = $tags | append .LinkTitle }}
+{{ 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 }}
-    <meta itemprop="keywords" content="{{ delimit $tags ", " }}">
 {{ end }}
--- a/layouts/partials/series-box.html
+++ b/layouts/partials/series-box.html
@ -12,6 +12,6 @@
            This post is part of a series:
        {{ end }}

-        {{ delimit $series ", " }}
+        {{ delimit $series ", " | safeHTML }}
    </div>
 {{ end }}
Author	SHA1	Message	Date
BBaoVanC	fa1fb5d0ba	WIP	2024-01-22 21:23:52 -06:00
BBaoVanC	77afe66aa6	Support custom keywords instead of defaulting to using tags Now can set `keywords:` in the front matter for actual keywords	2024-01-22 20:44:54 -06:00
BBaoVanC	788583ea23	Update syntax styles to fix user-select Turns out the last commit didn't work because bobastyle.css has lower priority than the syntax CSS. But Hugo must've updated the styles upstream because it's fixed after regenerating.	2023-12-01 20:05:42 -06:00
BBaoVanC	4216b9ed6f	Add vendor-prefixed user-select to code block line numbers	2023-12-01 19:57:39 -06:00
BBaoVanC	54e639ecc3	Don't automatically put copyright in <p>	2023-11-11 20:33:08 -06:00
BBaoVanC	c980ced2fb	Remove back to top button 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.	2023-11-05 17:41:59 -06:00
BBaoVanC	9ca15a198f	Revert "Load bobastyle.css async too" This reverts commits `f33492ef8e` and `5c87c2b069`. It turns out this makes performance score even worse because it makes the CLS really bad	2023-11-05 01:20:20 -05:00
BBaoVanC	5c87c2b069	Fix async loading of bobastyle.css	2023-11-05 01:00:22 -05:00
BBaoVanC	6c42ae9518	Lazy load images	2023-11-05 00:56:13 -05:00
BBaoVanC	f33492ef8e	Load bobastyle.css async too	2023-11-05 00:56:01 -05:00
BBaoVanC	ffcae79156	Load syntax CSS async	2023-11-05 00:31:26 -05:00
BBaoVanC	a59a87374b	Rename config.yaml to hugo.yaml	2023-11-04 20:55:02 -05:00
BBaoVanC	88adfbdf89	Move site author to under params due to .Site.Author deprecation See Hugo v0.120.0	2023-11-03 23:33:28 -05:00
BBaoVanC	0f717e81c0	Patch link issue with delimit due to breaking change in Hugo v0.120 References: - https://github.com/gohugoio/hugo/releases/tag/v0.120.0 - https://github.com/gohugoio/hugo/issues/10876 - https://github.com/gohugoio/hugo/issues/11502	2023-11-03 22:08:23 -05:00
BBaoVanC	ede5958a46	Fix main container padding when printing	2023-11-02 01:01:24 -05:00
BBaoVanC	0b3b160e87	Rename config.yaml to hugo.yaml in exampleSite	2023-10-21 21:45:22 -05:00
BBaoVanC	12c6efc0fe	Add "Skip to main content" tab-focusable button - https://webaim.org/techniques/skipnav/ - https://css-tricks.com/how-to-create-a-skip-to-content-link/	2023-10-21 20:21:26 -05:00
BBaoVanC	0e930f7ae1	Clean up dom layout of full-width page lists They shouldn't be a child of the centered, max-width'd body because they need to be full width. So put them outside of the main container div.	2023-10-21 19:44:02 -05:00