🔀 Merge branch 'dev' into v2

This commit is contained in:
James Panther
2022-01-24 12:05:43 +11:00
21 changed files with 95 additions and 33 deletions
+6 -2
View File
@@ -13,7 +13,11 @@
{{/* Gather partials for this context */}}
{{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }}
{{ $meta.Add "partials" (slice (partial "meta/date.html" .)) }}
{{ $meta.Add "partials" (slice (partial "meta/date.html" .Date)) }}
{{ end }}
{{ if .Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false) }}
{{ $meta.Add "partials" (slice (partial "meta/date-updated.html" .Lastmod)) }}
{{ end }}
{{ if and (.Params.showWordCount | default (.Site.Params.article.showWordCount | default false)) (ne .WordCount 0) }}
@@ -29,7 +33,7 @@
{{ end }}
<div class="flex flex-row items-center">
<div class="flex flex-row flex-wrap items-center">
{{/* Output partials */}}
{{ with ($meta.Get "partials") }}
{{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" }}
+2 -2
View File
@@ -20,7 +20,7 @@
>
<span class="mt-[0.1rem] text-xs text-neutral-500 dark:text-neutral-400">
{{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }}
{{ partial "meta/date.html" .NextInSection }}
{{ partial "meta/date.html" .NextInSection.Date }}
{{ end }}
</span>
</span>
@@ -36,7 +36,7 @@
>
<span class="mt-[0.1rem] text-xs text-neutral-500 dark:text-neutral-400">
{{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }}
{{ partial "meta/date.html" .PrevInSection }}
{{ partial "meta/date.html" .PrevInSection.Date }}
{{ end }}
</span>
</span>
+3
View File
@@ -0,0 +1,3 @@
{{- i18n "article.updated" -}}:&nbsp;
{{ partial "meta/date.html" . }}
{{- /* Trim EOF */ -}}
+2 -9
View File
@@ -1,11 +1,4 @@
<time datetime="{{ .Date }}">
{{- .Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long") -}}
<time datetime="{{ . }}">
{{- . | time.Format (site.Language.Params.dateFormat | default ":date_long") -}}
</time>
{{ if .Params.showDateUpdated | default (.Site.Params.article.showDateUpdated | default false) }}
&nbsp;(Updated:&nbsp;
<time datetime="{{ .Lastmod }}">
{{- .Date | time.Format (.Site.Language.Params.dateFormat | default ":date_long") -}}
</time>
)
{{ end }}
{{- /* Trim EOF */ -}}