🔀 Merge branch 'dev' into v2

layouts/partials/footer.html

@@ -32,8 +32,7 @@
       {{ if .Site.Params.attribution | default true }}
         <p class="text-xs text-neutral-400 dark:text-neutral-600">
           {{ $hugo := printf `<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500"
-            href="https://gohugo.io/" target="_blank" rel="noopener noreferrer">Hugo</a>`
-          }}
+            href="https://gohugo.io/" target="_blank" rel="noopener noreferrer">Hugo</a>` }}
           {{ $congo := printf `<a class="hover:underline hover:decoration-primary-400 hover:text-primary-500" href="https://git.io/hugo-congo" target="_blank" rel="noopener noreferrer">Congo</a>` }}
           {{ i18n "footer.powered_by" (dict "Hugo" $hugo "Congo" $congo) | safeHTML }}
         </p>

layouts/partials/meta/date.html

@@ -1,10 +1,10 @@
 <time datetime="{{ .Date }}">
-  {{- .Date.Format .Site.Params.article.dateFormat | default "2 January 2006" -}}
+  {{- .Date.Format (.Site.Params.article.dateFormat | default "2 January 2006") -}}
 </time>
 {{ if .Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false) }}
   &nbsp;(Updated:&nbsp;
   <time datetime="{{ .Lastmod }}">
-    {{- .Lastmod.Format .Site.Params.article.dateFormat | default "2 January 2006" -}}
+    {{- .Lastmod.Format (.Site.Params.article.dateFormat | default "2 January 2006") -}}
   </time>
   )
 {{ end }}

layouts/partials/schema.html

@@ -17,7 +17,7 @@
     "articleSection": "{{ (site.GetPage .Section).Title }}",
     "name": "{{ .Title | safeJS }}",
     "headline": "{{ .Title | safeJS }}",
-    "description": "{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}",
+    "description": "{{ with .Description }}{{ . }}{{ else }}{{ if .IsPage }}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}",
     {{ with .Site.LanguageCode }}"inLanguage": {{ . }},{{ end }}
     "author" : {
       "@type": "Person",
@@ -33,8 +33,8 @@
     {{ with .PublishDate }}"datePublished": "{{ .Format $iso8601 }}",{{ end }}
     {{ with .Lastmod }}"dateModified": "{{ .Format $iso8601 }}",{{ end }}
     "url" : "{{ .Permalink }}",
-    "wordCount": "{{ .WordCount }}",
-    "keywords": [{{ if .IsPage}}{{ range $index, $tag := .Params.tags }}{{ $tag }},{{ end }}{{ else }}{{ range $plural, $terms := .Site.Taxonomies }}{{ range $term, $val := $terms }}{{ printf "%s," $term }}{{ end }}{{ end }}{{ end }}]
+    {{ with .Params.tags }}"keywords": {{ . }},{{ end }}
+    "wordCount": "{{ .WordCount }}"
   }
   </script>
 {{ end }}

layouts/shortcodes/lead.html

@@ -1,3 +1,3 @@
-<p class="!mb-9 text-xl text-neutral-500 dark:text-neutral-400">
-  {{ .Inner }}
-</p>
+<div class="!mb-9 text-xl text-neutral-500 dark:text-neutral-400">
+  {{ .Inner | markdownify }}
+</div>