diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/baseof.html | 13 | ||||
| -rw-r--r-- | layouts/_default/single.html | 24 | ||||
| -rw-r--r-- | layouts/partials/footer-content.html (renamed from layouts/partials/theme-copyright.html) | 0 | ||||
| -rw-r--r-- | layouts/shortcodes/img.html | 5 |
4 files changed, 24 insertions, 18 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 18ea135..974affa 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -6,8 +6,12 @@ <title>{{ $title | title }}</title> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1"> - <link rel="stylesheet" type="text/css" href="/stylesheets/highlight.css"> - <link rel="stylesheet" type="text/css" href="/stylesheets/style.css"> + {{ $css := resources.Match "stylesheets/*.css" | resources.Concat "style.css" | minify | fingerprint }} + <link rel="stylesheet" href="{{ $css.Permalink }}"> + {{ with $.Resources.GetMatch "**.css*" }} + {{ $style := . | minify | fingerprint }} + <link type=text/css rel="stylesheet" href="{{ $style.Permalink }}"> + {{ end }} {{- block "head" . }}{{- end }} </head> <body> @@ -25,13 +29,10 @@ </main> <footer> <hr> - <div id="sharing"> - <a><img src="/icons/rss_feed_24dp_78A75A_FILL0_wght400_GRAD0_opsz24.svg" /></a> - </div> {{ if .Site.Params.copyright.include }} <span id="copyright">© {{ time.Now.Year }} {{ .Site.Params.copyright.name }} – {{ .Site.Params.copyright.type }}</span> {{ end }} - {{ partial "theme-copyright.html" . }} + {{ partial "footer-content.html" . }} </footer> </body> </html> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 099d3fc..035d589 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,18 +1,20 @@ {{ define "main" }} <div id="publishing"> +{{ if ne .Date (time "0001-01-01") }} <span>{{ .PublishDate | time.Format ":date_long" }}</span> - {{ if and (isset .Params "lastmod") (ne .Lastmod .PublishDate) }} - <br> - <span>Revised: {{ .Lastmod | time.Format ":date_long" }}</span> - {{ end }} - {{ if isset .Params "tags" }} - <br> - <span>Tags:</span> - {{- range sort .Params.tags }} - <a href="/tags/{{ . }}">{{ . | humanize | title }}</a> - {{- end }} - {{ end }} +{{ end }} +{{ if and (isset .Params "lastmod") (ne .Lastmod .PublishDate) }} + <br> + <span>Revised: {{ .Lastmod | time.Format ":date_long" }}</span> +{{ end }} +{{ if isset .Params "tags" }} + <br> + <span>Tags:</span> + {{- range sort .Params.tags }} + <a href="/tags/{{ . }}">{{ . | humanize | title }}</a> + {{- end }} +{{ end }} </div> {{ .Content }} diff --git a/layouts/partials/theme-copyright.html b/layouts/partials/footer-content.html index b97de5f..b97de5f 100644 --- a/layouts/partials/theme-copyright.html +++ b/layouts/partials/footer-content.html diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html index 56bf22f..a57e1ed 100644 --- a/layouts/shortcodes/img.html +++ b/layouts/shortcodes/img.html @@ -4,6 +4,7 @@ <!-- Get parameters --> {{- $alt := .Get "alt" | default "" -}} +{{- $caption := .Get "caption" | default "" -}} {{- $rotation := .Get "rotation" | default 0 -}} <!-- Get quality --> @@ -30,5 +31,7 @@ <figure> <img src="{{ $image.RelPermalink }}" title="{{ $alt }}" alt="{{ $alt }}" /> - <figcaption>{{ $alt }}</figcaption> + {{- if ne $caption "" -}} + <figcaption>{{ $caption }}</figcaption> + {{- end -}} </figure> |