diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 6127e0d..275ddd5 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -24,9 +24,9 @@ - + - + {{ $style := resources.Get "sass/main.scss" | resources.ToCSS | resources.Fingerprint }} diff --git a/layouts/partials/helpers/image.html b/layouts/partials/helpers/image.html index 373a113..ed43ed5 100644 --- a/layouts/partials/helpers/image.html +++ b/layouts/partials/helpers/image.html @@ -13,26 +13,21 @@ {{ $result = merge $result (dict "permalink" $imageValue) }} {{ else }} - {{ $pageResourceImage := resources.GetMatch (printf "%s" ($imageValue | safeURL)) }} + {{ $pageResourceImage := (.Context.Resources.GetMatch ($imageValue | safeURL)).Fill "300x300 center" }} {{ if $pageResourceImage }} {{ $result = merge $result (dict "permalink" $pageResourceImage.RelPermalink) }} - - - {{ if ne (path.Ext $imageValue) ".svg" }} - {{ $result = merge $result (dict "resource" $pageResourceImage) }} - {{ end }} {{ else }} - {{ $result = merge $result (dict "permalink" (relURL $imageValue)) }} + {{ $result = merge $result (dict "permalink" (printf "%s" (relURL $imageValue))) }} {{ end }} {{ end }} {{ else }} - {{ $defaultImageSetting := .Context.Site.Params.defaultCoverImage }} + {{ $defaultImageSetting := .Context.Site.Params.defaultImage }} {{ $result = merge $result (dict "isDefault" true) }} {{ $result = merge $result (dict "exists" true) }} @@ -42,8 +37,7 @@ {{ if $siteResourceImage }} - {{ $result = merge $result (dict "permalink" $siteResourceImage.RelPermalink) }} - {{ $result = merge $result (dict "resource" $siteResourceImage) }} + {{ $result = merge $result (dict "permalink" ($siteResourceImage.Fill "300x300 center").RelPermalink) }} {{ else }} {{ errorf "Failed loading image: %q" $defaultImageSetting.src }}