Remove exampleSite

This isn't really kept up to date these days, the example site is bbaovanc.com.
Fix pagination for Hugo 0.146
2025-06-13 09:57:30 -05:00 · 2025-04-20 04:41:57 -05:00 · 2025-04-20 04:34:15 -05:00 · 2025-04-19 01:13:33 -05:00 · 2025-04-19 00:58:23 -05:00 · 2024-11-15 17:25:46 -06:00
16 changed files with 233 additions and 129 deletions
--- a/.gitmodules
+++ b/.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
--- a/assets/css/bobastyle.css
+++ b/assets/css/bobastyle.css
@ -248,31 +248,31 @@ hr {
  }
 }

-table.markdown {
+table.simple {
  border-collapse: collapse;
  border: 2px solid var(--text-1);
 }

-table.markdown thead {
+table.simple thead {
  background-color: var(--background-2);
  color: var(--text-2);
  border-bottom: 2px solid var(--text-1);
 }

-table.markdown th,
-table.markdown td {
+table.simple th,
+table.simple td {
  padding: 8px;
 }

-table.markdown :is(th, td) + :is(th, td) {
+table.simple :is(th, td) + :is(th, td) {
  border-left: 2px solid var(--text-1);
 }

-table.markdown tbody tr:nth-child(odd) {
+table.simple tbody tr:nth-child(odd) {
  background-color: var(--background-0);
  color: var(--text-0);
 }
-table.markdown tbody tr:nth-child(even) {
+table.simple tbody tr:nth-child(even) {
  background-color: var(--background-1);
  color: var(--text-1);
 }
@ -858,22 +858,22 @@ aside {
 }

 aside.note {
-  background-color: var(--accent-blue-1);
+  background-color: var(--background-blue-1);
 }
 aside.info {
-  background-color: var(--accent-green-1);
+  background-color: var(--background-green-1);
 }
 aside.tip {
-  background-color: var(--accent-teal-1);
+  background-color: var(--background-teal-1);
 }
 aside.warning {
-  background-color: var(--accent-yellow-1);
+  background-color: var(--background-yellow-1);
 }
 aside.example {
-  background-color: var(--accent-purple-1);
+  background-color: var(--background-purple-1);
 }
 aside.quote {
-  background-color: var(--accent-1);
+  background-color: var(--background-1);
 }

 /* }}} */
@ -972,34 +972,6 @@ aside.quote {
  .table-of-contents.print {
    display: block;
  }
-
-  /*
-   * 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);
-  }
 }

 /* }}} */
--- 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/exampleSite/hugo.yaml
+++ b/exampleSite/hugo.yaml
@ -1,60 +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
-
-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
-
-  # 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
-  # gitHistoryURL: https://github.com/BBaoVanC/bobatheme/commits/master
-
-  # social media share icons
-  # shareButtons:
-  #   twitter: true
-  #   facebook: true
-  #   linkedin: true
-  #   reddit: true
-  #   telegram: true
-  #   print: true
-
-  # show "Latest Posts" section at bottom of content pages
-  # latestPostsOnContent: 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
--- a/hugo.yaml
+++ b/hugo.yaml
@ -2,6 +2,12 @@ markup:
  highlight:
    noClasses: false
    lineNos: true
+  goldmark:
+    parser:
+      attribute:
+        block: true
+        # this is enabled by default already
+        #title: true

 params:
  readingtime: true
@ -12,11 +18,20 @@ taxonomies:
  author: authors
  series: series

+outputs:
+  page:
+    - html
+    - markdown
+
+outputFormats:
+  markdown:
+    ugly: true
+
 privacy:
  googleAnalytics:
    disable: true

-  twitter:
+  x:
    enableDNT: true

  vimeo:
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@ -30,6 +30,9 @@ readingtime:
 edit_history:
  other: "Edit history"

+view_markdown:
+  other: "View raw"
+

 # Post count
 no_posts:
@ -67,6 +70,9 @@ aria_rss_link:
 aria_post_meta_edit_history:
  other: "link to page edit history"

+aria_post_meta_view_markdown:
+  other: "link to view raw markdown code of page"
+
 aria_post_meta_categories:
  other: "categories"

--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -27,7 +27,7 @@
        {{ if or .Site.Copyright .Site.Params.footer }}
            <footer>
                {{ with .Site.Copyright }}
-                    <p>{{ . | safeHTML }}</p>
+                    {{ . | safeHTML }}
                {{ end }}

                {{ with .Site.Params.footer }}
--- a/layouts/_default/single.markdown.md
+++ b/layouts/_default/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 -}}
--- a/layouts/partials/_internal/pagination.html
+++ b/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 -}}
--- a/layouts/partials/page-metadata/item/viewraw.html
+++ b/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 }}
--- a/layouts/partials/page-metadata/post-full.html
+++ b/layouts/partials/page-metadata/post-full.html
@ -20,7 +20,10 @@
        {{ 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/item/categories.html" . }}
+
        {{ partial "page-metadata/item/tags.html" . }}
    </div>
 {{ end }}
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@ -1,5 +1,6 @@
 {{ if gt .Paginator.TotalPages 1 }}
    <nav class="pagination">
-        {{ template "_internal/pagination.html" . }}
+        {{/* https://github.com/gohugoio/hugo/blob/a88b488181279befd50e1d127f9f67604f2f9854/tpl/tplimpl/embedded/templates/_partials/pagination.html */}}
+        {{ partial "_internal/pagination.html" . }}
    </nav>
 {{ end }}
--- 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/seo-tags/twitter-cards.html
+++ b/layouts/partials/seo-tags/twitter-cards.html
@ -24,6 +24,6 @@
 <meta name="twitter:title" content="{{ .Title | 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 }}
--- a/layouts/shortcodes/table.html
+++ b/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 | .Page.RenderString (dict "display" "block") }}
-{{ $new := printf `<table class="%s">` $class }}
-{{ (replace $htmlTable "<table>" $new) | safeHTML }}
Author	SHA1	Message	Date
BBaoVanC	6e7160efbb	Remove exampleSite This isn't really kept up to date these days, the example site is bbaovanc.com.	2025-04-20 04:41:57 -05:00
BBaoVanC	04c3c007a8	Fix pagination for Hugo 0.146	2025-04-20 04:34:15 -05:00
BBaoVanC	ad7432155f	Update jam icons repo to my own reupload	2025-04-19 01:13:33 -05:00
BBaoVanC	0aaf865b75	Rename privacy.twitter.enableDNT to x due to deprecation in Hugo	2025-04-19 00:58:23 -05:00
BBaoVanC	c9095e948b	Replace table shortcode with markdown attributes for class	2024-11-15 17:25:46 -06:00
BBaoVanC	ddb57e0120	Merge branch 'markdown-output'	2024-10-01 13:30:00 -05:00
BBaoVanC	9b851ce0e4	Add "View raw" button to page to view raw markdown code of page	2024-10-01 13:29:14 -05:00
BBaoVanC	f34cffb849	Make markdown output "ugly" This makes it so, for example, `/blog/swapfile-guide` has markdown file at `/blog/swapfile-guide.md` instead of `/blog/swapfile-guide/index.md`.	2024-10-01 13:28:19 -05:00
BBaoVanC	91994df910	Create markdown output template Further progress is blocked by Hugo feature requests: - https://discourse.gohugo.io/t/render-alternative-output-format-outside-of-leaf-bundle-subdirectory/46968 - https://github.com/gohugoio/hugo/issues/8927	2024-09-28 20:10:22 -05:00
BBaoVanC	e84f334591	Replace paginate with pagination.pagerSize in hugo.yaml	2024-09-24 21:17:41 -05:00
BBaoVanC	ebf39263a6	Replace use of deprecated .Site.Social	2024-08-29 20:39:34 -05: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