diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 1d4723e5..4070343f 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -51,7 +51,7 @@ {{ end }} -
+
{{ .Content }}
diff --git a/layouts/partials/article-link/simple.html b/layouts/partials/article-link/simple.html index 59456d8e..0bdf7ca0 100644 --- a/layouts/partials/article-link/simple.html +++ b/layouts/partials/article-link/simple.html @@ -10,7 +10,7 @@ {{ $imgWrapperClasses := "" }} {{ $cardContentClasses := "" }} -{{ if site.Params.list.showCards }} +{{ if .Params.showCards | default site.Params.list.showCards }} {{ $cardClasses = printf "%s overflow-hidden rounded-lg border border-neutral-300 dark:border-neutral-600" $cardClasses }} {{ $imgWrapperClasses = "" }} {{ $cardContentClasses = printf "%s p-4" $cardContentClasses }} diff --git a/layouts/partials/author-extra.html b/layouts/partials/author-extra.html index 508383a5..2823977d 100644 --- a/layouts/partials/author-extra.html +++ b/layouts/partials/author-extra.html @@ -10,7 +10,7 @@ {{ if $authorImage }} {{ $final := $authorImage }} {{ $squareImage := $authorImage }} - {{ if not $disableImageOptimization }} + {{ if not (or $disableImageOptimization (eq $authorImage.MediaType.SubType "svg")) }} {{ $final = $authorImage.Fill "192x192" }} {{ $shortSide := int (math.Min $authorImage.Width $authorImage.Height) }} {{ $squareImage = $authorImage.Crop (printf "%dx%d" $shortSide $shortSide ) }} diff --git a/layouts/partials/author.html b/layouts/partials/author.html index ab0fe327..995467e7 100644 --- a/layouts/partials/author.html +++ b/layouts/partials/author.html @@ -10,7 +10,7 @@ {{ if $authorImage }} {{ $final := $authorImage }} {{ $squareImage := $authorImage }} - {{ if not $disableImageOptimization }} + {{ if not (or $disableImageOptimization (eq $authorImage.MediaType.SubType "svg")) }} {{ $final = $authorImage.Fill "192x192" }} {{ $shortSide := int (math.Min $authorImage.Width $authorImage.Height) }} {{ $squareImage = $authorImage.Crop (printf "%dx%d" $shortSide $shortSide ) }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 0ddba873..359ea31d 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -99,7 +99,7 @@ {{/* CSS */}} {{ $cssResources := slice }} {{ $schemeName := .Site.Params.colorScheme | default "blowfish" }} - {{ $cssScheme := resources.Get (printf "css/schemes/%s.css" $schemeName) | default (resources.Get "css/schemes/blowfish.css") }} + {{ $cssScheme := resources.Get (printf "css/schemes/%s.css" (lower $schemeName)) | default (resources.Get "css/schemes/blowfish.css") }} {{ $cssResources = $cssResources | append $cssScheme }} {{ $cssResources = $cssResources | append (resources.Get "css/compiled/main.css") }} {{ with resources.Get "css/custom.css" }} diff --git a/layouts/partials/home/background.html b/layouts/partials/home/background.html index c928413f..d67eece1 100644 --- a/layouts/partials/home/background.html +++ b/layouts/partials/home/background.html @@ -52,7 +52,7 @@ {{ if $authorImage }} {{ $final := $authorImage }} {{ $squareImage := $authorImage }} - {{ if not $disableImageOptimization }} + {{ if not (or $disableImageOptimization (eq $authorImage.MediaType.SubType "svg")) }} {{ $final = $authorImage.Fill (print "288x288 q" ( $.Site.Params.Author.imagequality | default "96" )) }} {{ $shortSide := int (math.Min $authorImage.Width $authorImage.Height) }} {{ $squareImage = $authorImage.Crop (printf "%dx%d" $shortSide $shortSide ) }} diff --git a/layouts/partials/home/hero.html b/layouts/partials/home/hero.html index ed6d81ae..ec11ee0c 100644 --- a/layouts/partials/home/hero.html +++ b/layouts/partials/home/hero.html @@ -55,7 +55,7 @@ {{ if $authorImage }} {{ $final := $authorImage }} {{ $squareImage := $authorImage }} - {{ if not $disableImageOptimization }} + {{ if not (or $disableImageOptimization (eq $authorImage.MediaType.SubType "svg")) }} {{ $final = $authorImage.Fill (print "288x288 q" ( $.Site.Params.Author.imagequality | default "96" )) }} {{ $shortSide := int (math.Min $authorImage.Width $authorImage.Height) }} {{ $squareImage = $authorImage.Crop (printf "%dx%d" $shortSide $shortSide ) }} diff --git a/layouts/partials/home/profile.html b/layouts/partials/home/profile.html index 2d27bf68..fdc137fe 100644 --- a/layouts/partials/home/profile.html +++ b/layouts/partials/home/profile.html @@ -14,7 +14,7 @@ {{ if $authorImage }} {{ $final := $authorImage }} {{ $squareImage := $authorImage }} - {{ if not $disableImageOptimization }} + {{ if not (or $disableImageOptimization (eq $authorImage.MediaType.SubType "svg")) }} {{ $final = $authorImage.Fill (print "288x288 q" ( $.Site.Params.Author.imagequality | default "96" )) }} {{ $shortSide := int (math.Min $authorImage.Width $authorImage.Height) }} {{ $squareImage = $authorImage.Crop (printf "%dx%d" $shortSide $shortSide ) }} diff --git a/layouts/partials/schema.html b/layouts/partials/schema.html index 2f14cc69..470511ec 100644 --- a/layouts/partials/schema.html +++ b/layouts/partials/schema.html @@ -25,7 +25,6 @@ "name": "{{ .Title | safeJS }}", "headline": "{{ .Title | safeJS }}", {{ with .Description }}"description": "{{ . | safeJS }}",{{ end }} - {{ with .Summary }}"abstract": "{{ . | safeJS }}",{{ end }} {{ with .Site.LanguageCode }}"inLanguage": "{{ . }}",{{ end }} "url" : {{ .Permalink }}, "author" : { @@ -49,22 +48,25 @@ "@context": "https://schema.org", "@type": "BreadcrumbList", "itemListElement": [ - {{- $breadcrumbs := slice -}} + {{- $position := 0 -}} {{- range .Ancestors -}} {{- if not .IsHome -}} - {{- $breadcrumbs = $breadcrumbs | append . -}} + {{- $position = add $position 1 -}} + { + "@type": "ListItem", + "position": {{ $position }}, + "name": "{{ .Title }}", + "item": {{ .Permalink }} + }, {{- end -}} {{- end -}} - {{- $breadcrumbs = $breadcrumbs | append . -}} - - {{- range $index, $element := $breadcrumbs -}} - { - "@type": "ListItem", - "position": {{ add $index 1 }}, - "name": "{{ .Title }}", - "item": {{ .Permalink }}, - }{{ if ne (add $index 1) (len $breadcrumbs) }},{{ end }} - {{- end -}} + {{- $position = add $position 1 -}} + { + "@type": "ListItem", + "position": {{ $position }}, + "name": "{{ .Title }}", + "item": {{ .Permalink }} + } ] }{{ end }}]