merge in theme updates

This commit is contained in:
John Bowdre 2022-05-25 15:22:38 -05:00
parent 8cd4ac6649
commit 198c05a317
4 changed files with 14 additions and 6 deletions

View file

@ -13,7 +13,7 @@
<div class="{{ if ne $p.singleColumn true }}grid-inverse {{ end }}wrap content"> <div class="{{ if ne $p.singleColumn true }}grid-inverse {{ end }}wrap content">
<article class="post_content"> <article class="post_content">
{{- $t := .Title }} {{- $t := .Title }}
<h1 class="post_title">{{ $t }}</h1> <h1 class="post_title">{{ $t | markdownify }}</h1>
{{- partial "post-meta" . }} {{- partial "post-meta" . }}
{{- with .Param "lastmod" -}} {{- with .Param "lastmod" -}}
{{- $ageDays = div (sub now.Unix .Unix) 86400 -}} {{- $ageDays = div (sub now.Unix .Unix) 86400 -}}
@ -28,7 +28,7 @@
{{- partial "image" (dict "file" $p.featureImage "alt" $p.featureImageAlt "cap" $p.featureImageCap "type" "featured" "Page" $.Page) }} {{- partial "image" (dict "file" $p.featureImage "alt" $p.featureImageAlt "cap" $p.featureImageCap "type" "featured" "Page" $.Page) }}
</div> </div>
{{- end -}} {{- end -}}
{{ if and (gt .WordCount 400 ) (gt (len .TableOfContents) 180) ($s.toc) }} {{ if and (gt .WordCount 400 ) (gt (len .TableOfContents) 180) ($p.toc) }}
<div class="post_toc"> <div class="post_toc">
<div class="wrap-collapsible"> <div class="wrap-collapsible">
<input id="collapsible" class="toggle" type="checkbox"> <input id="collapsible" class="toggle" type="checkbox">

View file

@ -8,7 +8,7 @@
<footer class="footer"> <footer class="footer">
<div class="footer_inner wrap pale"> <div class="footer_inner wrap pale">
<img src='{{ absURL (default $defaultFooterLogo $s.footerLogo) }}' class="icon icon_2 transparent" alt="{{ $t }}"> <img src='{{ absURL (default $defaultFooterLogo $s.footerLogo) }}' class="icon icon_2 transparent" alt="{{ $t }}">
<p>{{ T "copyright" }}{{ with $s.since }}&nbsp;{{ . }}-{{ end }}&nbsp;<span class="year"></span>&nbsp;{{ $t }}<a rel="me" href="https://counter.social/@john_b">.</a> {{ T "all_rights" }}. {{ T "powered_by" }} <a href="https://gohugo.io/">Hugo</a>, <a href="https://github.com/chipzoller/hugo-clarity">Hugo Clarity theme</a>, {{ T "and" }} <a href="https://www.netlify.com/">Netlify</a>. <a href="https://github.com/jbowdre/virtuallypotato">{{ T "view_source" }}</a>.</p> <p>{{ T "copyright" | markdownify }}{{ with $s.since }}&nbsp;{{ . }}-{{ end }}&nbsp;<span class="year"></span>&nbsp;{{ $t }}<a rel="me" href="https://counter.social/@john_b">.</a> {{ T "all_rights" | markdownify }}. {{ T "powered_by" | markdownify }} <a href="https://gohugo.io/">Hugo</a>, <a href="https://github.com/chipzoller/hugo-clarity">Hugo Clarity theme</a>, {{ T "and" | markdownify }} <a href="https://www.netlify.com/">Netlify</a>. <a href="https://github.com/jbowdre/virtuallypotato">{{ T "view_source" | markdownify }}</a>.</p>
{{- partialCached "top" .}} {{- partialCached "top" .}}
</div> </div>
</footer> </footer>

View file

@ -33,6 +33,14 @@
<a href='{{ absLangURL (default "about/" $s.introURL) }}' class="button mt-1" role="button" title='{{ $r }}'>{{ $r }}</a> <a href='{{ absLangURL (default "about/" $s.introURL) }}' class="button mt-1" role="button" title='{{ $r }}'>{{ $r }}</a>
{{- end }} {{- end }}
{{- end }} {{- end }}
{{ if .Site.Params.sidebardisclaimer }}
<div class="sidebardisclaimer">
<h2 class="mt-4">Disclaimer</h2>
{{ .Site.Params.disclaimerText }}
</div>
{{ end }}
{{- $relatedInSidebar := true }} {{- $relatedInSidebar := true }}
{{- if eq $s.showRelatedInSidebar false }} {{- if eq $s.showRelatedInSidebar false }}
{{ $relatedInSidebar = false }} {{ $relatedInSidebar = false }}
@ -62,7 +70,7 @@
<ul> <ul>
{{- range . }} {{- range . }}
<li> <li>
<a href="{{ .Permalink }}" class="nav-link" title="{{ .Title }}">{{ .Title }}</a> <a href="{{ .Permalink }}" class="nav-link" title="{{ .Title }}">{{ .Title | markdownify }}</a>
</li> </li>
{{- end }} {{- end }}
</ul> </ul>
@ -72,7 +80,7 @@
{{- $recent := default 8 $s.numberOfRecentPosts }} {{- $recent := default 8 $s.numberOfRecentPosts }}
{{- range first $recent $posts }} {{- range first $recent $posts }}
<li> <li>
<a href="{{ .Permalink }}" class="nav-link" title="{{ .Title }}">{{ .Title }}</a> <a href="{{ .Permalink }}" class="nav-link" title="{{ .Title }}">{{ .Title | markdownify }}</a>
</li> </li>
{{- end }} {{- end }}
</ul> </ul>

@ -1 +1 @@
Subproject commit 6c3db7cbab090796895b4b66ffd76bbbd768195e Subproject commit e511e14db7a11b726ccc6c4456bf5ec5ebdd3720