✨ Add support for content on taxonomy pages

layouts/404.html

@@ -3,7 +3,7 @@
   <p class="mt-8 mb-12 text-neutral-400 dark:text-neutral-500">
     {{ i18n "error.404_error" | emojify }}
   </p>
-  <div class="markdown dark:markdown-invert">
+  <div class="prose dark:prose-invert">
     <p>{{ i18n "error.404_description" | emojify }}</p>
   </div>
 {{ end }}

layouts/_default/_markup/render-heading.html

@@ -1 +1 @@
-<h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ .Text | safeHTML }} {{ if .Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}<a class="absolute top-0 w-6 no-underline transition-opacity opacity-0 heading-anchor ltr:-left-6 rtl:-right-6" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a>{{ end }}</h{{ .Level }}>
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" class="relative">{{ .Text | safeHTML }} {{ if .Page.Params.showHeadingAnchors | default (.Page.Site.Params.article.showHeadingAnchors | default true) }}<a class="absolute top-0 w-6 no-underline transition-opacity opacity-0 heading-anchor ltr:-left-6 rtl:-right-6" href="#{{ .Anchor | safeURL }}" aria-label="{{ i18n "article.anchor_label" }}">#</a>{{ end }}</h{{ .Level }}>

layouts/_default/list.html

@@ -1,5 +1,29 @@
 {{ define "main" }}
-  {{ partial "section-header.html" . }}
+  {{ $toc := and (.Params.showTableOfContents | default (.Site.Params.list.showTableOfContents | default false)) (in .TableOfContents "<ul") }}
+  <header>
+    {{ if .Site.Params.list.showBreadcrumbs | default false }}
+      {{ partial "breadcrumbs.html" . }}
+    {{ end }}
+    <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .Title }}</h1>
+  </header>
+  <section
+    class="flex flex-col max-w-full prose lg:flex-row dark:prose-invert {{ if $toc -}}
+      mt-12
+    {{- else -}}
+      mt-0
+    {{- end }}"
+  >
+    {{ if $toc }}
+      <div class="order-first px-0 lg:max-w-xs ltr:lg:pl-8 rtl:lg:pr-8 lg:order-last">
+        <div class="ltr:pl-5 rtl:pr-5 toc lg:sticky lg:top-10">
+          {{ partial "toc.html" . }}
+        </div>
+      </div>
+    {{ end }}
+    <div class="min-w-0 min-h-0 max-w-prose">
+      {{ .Content | emojify }}
+    </div>
+  </section>
   {{ if gt .Pages 0 }}
     <section>
       {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
@@ -16,7 +40,7 @@
     </section>
     {{ partial "pagination.html" . }}
   {{ else }}
-    <section class="mt-10 markdown dark:markdown-invert">
+    <section class="mt-10 prose dark:prose-invert">
       <p class="py-8 border-t">
         <em>{{ i18n "list.no_articles" | emojify }}</em>
       </p>

layouts/_default/single.html

@@ -11,7 +11,7 @@
         {{ partial "article-meta.html" (dict "context" . "scope" "single") }}
       </div>
     </header>
-    <section class="flex flex-col max-w-full mt-0 lg:flex-row markdown dark:markdown-invert">
+    <section class="flex flex-col max-w-full mt-0 prose lg:flex-row dark:prose-invert">
       {{ if and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in .TableOfContents "<ul") }}
         <div class="order-first px-0 lg:max-w-xs ltr:lg:pl-8 rtl:lg:pr-8 lg:order-last">
           <div class="ltr:pl-5 rtl:pr-5 toc lg:sticky lg:top-10">
@@ -19,7 +19,7 @@
           </div>
         </div>
       {{ end }}
-      <div class="overflow-auto max-w-prose">
+      <div class="min-w-0 min-h-0 max-w-prose">
         {{ .Content | emojify }}
       </div>
     </section>

layouts/_default/taxonomy.html

@@ -1,5 +1,17 @@
 {{ define "main" }}
-  {{ partial "section-header.html" . }}
+  <header>
+    {{ if .Site.Params.list.showBreadcrumbs | default false }}
+      {{ partial "breadcrumbs.html" . }}
+    {{ end }}
+    <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .Title }}</h1>
+  </header>
+  {{ if .Content }}
+    <section class="flex flex-col max-w-full mt-0 prose lg:flex-row dark:prose-invert">
+      <div class="min-w-0 min-h-0 max-w-prose">
+        {{ .Content | emojify }}
+      </div>
+    </section>
+  {{ end }}
   <section class="flex flex-wrap -mx-2 overflow-hidden">
     {{ range .Data.Terms }}
       <article class="w-full px-2 my-3 overflow-hidden sm:w-1/2 md:w-1/3 lg:w-1/4 xl:w-1/5">

layouts/_default/term.html

@@ -1,5 +1,17 @@
 {{ define "main" }}
-  {{ partial "section-header.html" . }}
+  <header>
+    {{ if .Site.Params.list.showBreadcrumbs | default false }}
+      {{ partial "breadcrumbs.html" . }}
+    {{ end }}
+    <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .Title }}</h1>
+  </header>
+  {{ if .Content }}
+    <section class="flex flex-col max-w-full mt-0 prose lg:flex-row dark:prose-invert">
+      <div class="min-w-0 min-h-0 max-w-prose">
+        {{ .Content | emojify }}
+      </div>
+    </section>
+  {{ end }}
   <section>
     {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }}
       <h2 class="mt-12 text-2xl font-bold first:mt-8">{{ .Key }}</h2>

layouts/partials/article-link.html

@@ -34,7 +34,7 @@
     {{ partial "article-meta.html" . }}
   </div>
   {{ if .Params.showSummary | default (.Site.Params.list.showSummary | default false) }}
-    <div class="py-1 markdown dark:markdown-invert">
+    <div class="py-1 prose dark:prose-invert">
       {{ .Summary | emojify }}
     </div>
   {{ end }}

layouts/partials/home/page.html

@@ -1,4 +1,4 @@
-<article class="max-w-full markdown dark:markdown-invert">
+<article class="max-w-full prose dark:prose-invert">
   {{ with .Title }}
     <header>
       <h1>{{ . | emojify }}</h1>

layouts/partials/home/profile.html

@@ -29,7 +29,7 @@
       {{ partialCached "author-links.html" . }}
     </div>
   </header>
-  <section class="markdown dark:markdown-invert">{{ .Content | emojify }}</section>
+  <section class="prose dark:prose-invert">{{ .Content | emojify }}</section>
 </article>
 <section>
   {{ partial "recent-articles.html" . }}

layouts/partials/schema.html

@@ -17,10 +17,6 @@
   </script>
 {{ else if .IsPage }}
   {{- $iso8601 := "2006-01-02T15:04:05-07:00" -}}
-  {{ $url := replace .Permalink ( printf "%s" .Site.BaseURL) "" }}
-  {{ $.Scratch.Delete "path" }}
-  {{ $.Scratch.Add "path" .Site.BaseURL }}
-  {{ $count := len (split $url "/") }}
   <script type="application/ld+json">
   [{
     "@context": "https://schema.org",
@@ -48,28 +44,6 @@
     {{ end }}
     "mainEntityOfPage": "true",
     "wordCount": "{{ .WordCount }}"
-  },
-  {
-    "@context": "http://schema.org",
-    "@type": "BreadcrumbList",
-    "itemListElement":
-      [{
-        "@type": "ListItem",
-          "position": 1,
-          "item": {
-            "@id": "{{ .Site.BaseURL }}",
-            "name": "Home"
-          }
-      },{{ range $index, $element := split $url "/" }}{{ $.Scratch.Add "path" $element }}{{ if ne $element "" }}
-      {
-      "@type": "ListItem",
-        "position": {{ add $index 2 }},
-        "item": {
-          "@id": "{{ $.Scratch.Get "path" }}",
-          "name": "{{ humanize . }}"
-        }
-      }{{ if not (eq $index (sub $count 2)) }}, {{ end }}{{ $.Scratch.Add "path" "/" }}{{ end }}{{ end }}
-    ]
   }]
   </script>
 {{ end }}

layouts/partials/section-header.html

@@ -1,9 +0,0 @@
-<header>
-  {{ if .Site.Params.list.showBreadcrumbs | default false }}
-    {{ partial "breadcrumbs.html" . }}
-  {{ end }}
-  <section class="markdown dark:markdown-invert">
-    <h1 class="mb-3 text-4xl font-extrabold text-neutral-800">{{ .Title }}</h1>
-    <section>{{ .Content }}</section>
-  </section>
-</header>