Update jam icons repo to my own reupload

This makes it so, for example, `/blog/swapfile-guide` has markdown file
at `/blog/swapfile-guide.md` instead of `/blog/swapfile-guide/index.md`.

.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

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.simple th,
-table.markdown td {
+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);
 }

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 }
+/* LineHighlight */ .chroma .hl { background-color: #dfdfdf }
-/* LineNumbersTable */ .chroma .lnt { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
+/* 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; 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 }

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 }
+/* LineHighlight */ .chroma .hl { background-color: #363636 }
-/* LineNumbersTable */ .chroma .lnt { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #686868 }
+/* 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; 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 }

exampleSite/hugo.yaml

@@ -4,15 +4,23 @@ 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
 
+pagination:
+  pagerSize: 5
+
 taxonomies:
   _merge: deep
 
 markup: # this just keeps the bobatheme markup styling
   _merge: deep
 
+outputs:
+  _merge: deep
+
+outputFormats:
+  _merge: deep
+
 params:
   author:
     name: bbaovanc

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:

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"
 

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 }}

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 -}}

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

@@ -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 }}

layouts/partials/seo-tags/schema.html

@@ -21,6 +21,9 @@
     <meta itemprop="image" content="{{ $featured.Permalink }}">
 {{ end }}
 
+{{ with .Keywords }}
+    <meta itemprop="keywords" content="{{ delimit . ", " }}">
+{{ else }}
     {{ with (.GetTerms "tags") }}
         {{ $tags := slice }}
         {{ range . }}
@@ -28,3 +31,4 @@
         {{ end }}
         <meta itemprop="keywords" content="{{ delimit $tags ", " }}">
     {{ end }}
+{{ end }}

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 }}

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 }}