diff --git a/layouts/partials/article-link/card-related.html b/layouts/partials/article-link/card-related.html index 6ea57ad8..b1fcb2ba 100644 --- a/layouts/partials/article-link/card-related.html +++ b/layouts/partials/article-link/card-related.html @@ -13,6 +13,10 @@ {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} + {{ if and .Params.featureimage (not $featured) }} + {{- $url:= .Params.featureimage -}} + {{ $featured = resources.GetRemote $url }} + {{ end }} {{- if not $featured }}{{ with .Site.Params.defaultFeaturedImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}} {{- with $featured -}} {{ if $disableImageOptimization }} diff --git a/layouts/partials/article-link/card.html b/layouts/partials/article-link/card.html index f5eb8f54..53c9c768 100644 --- a/layouts/partials/article-link/card.html +++ b/layouts/partials/article-link/card.html @@ -13,6 +13,10 @@ {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} + {{ if and .Params.featureimage (not $featured) }} + {{- $url:= .Params.featureimage -}} + {{ $featured = resources.GetRemote $url }} + {{ end }} {{- if not $featured }}{{ with .Site.Params.defaultFeaturedImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}} {{ if .Params.hideFeatureImage }}{{ $featured = false }}{{ end }} {{- with $featured -}} diff --git a/layouts/partials/article-link/simple.html b/layouts/partials/article-link/simple.html index bb1768ea..24bf281b 100644 --- a/layouts/partials/article-link/simple.html +++ b/layouts/partials/article-link/simple.html @@ -40,9 +40,9 @@ {{- $images := $.Resources.ByType "image" -}} {{- $featured := $images.GetMatch "*feature*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} - {{ if .Params.featureimage }} + {{ if and .Params.featureimage (not $featured) }} {{- $url:= .Params.featureimage -}} - {{- if not $featured }}{{ $featured = resources.GetRemote $url }}{{ end -}} + {{ $featured = resources.GetRemote $url }} {{ end }} {{- if not $featured }}{{ with .Site.Params.defaultFeaturedImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}} {{ if .Params.hideFeatureImage }}{{ $featured = false }}{{ end }} diff --git a/layouts/partials/author-extra.html b/layouts/partials/author-extra.html index a15a63c1..701e9fa7 100644 --- a/layouts/partials/author-extra.html +++ b/layouts/partials/author-extra.html @@ -9,7 +9,7 @@ {{ else }} - {{ $authorImage := resources.GetRmeote . }} + {{ $authorImage := resources.GetRemote . }} {{ if not $disableImageOptimization }} {{ $authorImage = $authorImage.Fill "192x192" }} {{ end }} diff --git a/layouts/partials/hero/background.html b/layouts/partials/hero/background.html index f72015fe..ac4adb8a 100644 --- a/layouts/partials/hero/background.html +++ b/layouts/partials/hero/background.html @@ -4,10 +4,9 @@ {{- $featured := $images.GetMatch "*background*" -}} {{- if not $featured }}{{ $featured = $images.GetMatch "*feature*" }}{{ end -}} {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} -{{ if .Params.featureimage }} +{{ if and .Params.featureimage (not $featured) }} {{- $url:= .Params.featureimage -}} -{{if or $.Site.Params.list.showHero $.Site.Params.term.showHero $.Site.Params.taxonomy.showHero}} {{ $url = default $.Site.Params.homepage.homepageImage $.Site.Params.defaultBackgroundImage }} {{end}} -{{- if not $featured }}{{ $featured = resources.GetRemote $url }}{{ end -}} +{{ $featured = resources.GetRemote $url }} {{ end }} {{- if not $featured }}{{ with .Site.Params.defaultBackgroundImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}} {{ $isParentList := eq (.Scratch.Get "scope") "list" }} diff --git a/layouts/partials/home/background.html b/layouts/partials/home/background.html index 3ee48e58..00e43c59 100644 --- a/layouts/partials/home/background.html +++ b/layouts/partials/home/background.html @@ -6,9 +6,21 @@