Merge branch 'master' into canary

2022-10-29 13:51:05 +00:00
parent 7f94ce9847 5d34c3de44
commit b0ab8e8ef0
19 changed files with 591 additions and 879 deletions
@@ -23,9 +23,12 @@
        {{ end }}
    </div>

-    {{ if or (not .Date.IsZero) (.Site.Params.article.readingTime) }}
+    {{ $showReadingTime := .Params.readingTime | default (.Site.Params.article.readingTime) }}
+    {{ $showDate := not .Date.IsZero }}
+    {{ $showFooter := or $showDate $showReadingTime }}
+    {{ if $showFooter }}
    <footer class="article-time">
-        {{ if not .Date.IsZero }}
+        {{ if $showDate }}
            <div>
                {{ partial "helper/icon" "date" }}
                <time class="article-time--published">
@@ -34,7 +37,7 @@
            </div>
        {{ end }}

-        {{ if .Site.Params.article.readingTime }}
+        {{ if $showReadingTime }}
            <div>
                {{ partial "helper/icon" "clock" }}
                <time class="article-time--reading">
@@ -55,4 +58,4 @@
            </div>
        </footer>
    {{ end }}
-</div>
+</div>