From 95b62176cf07a5019a4906828de7b51e0cfde2ff Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Fri, 11 Jul 2025 08:59:42 +0800 Subject: [PATCH 1/3] Revert ":bug: Fix: Reassignment of variable names" This reverts commit 80486364cdd8d94be01d840f2729f0b943ae152f. --- layouts/partials/head.html | 10 +++++----- layouts/partials/hero/background.html | 2 +- layouts/partials/hero/basic.html | 2 +- layouts/partials/hero/thumbAndBackground.html | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 01a2865a..78ddbc3c 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -74,14 +74,14 @@ {{ end }} {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} {{ range $backgroundAndFeaturedImages }} - {{ $classImages := slice }} + {{ $images := slice }} {{ if or $disableImageOptimization (strings.HasSuffix .Name ".svg") }} - {{ $classImages = $classImages | append . }} + {{ $images = $images | append . }} {{ else }} - {{ $classImages = $classImages | append (.Resize "600x") }} - {{ $classImages = $classImages | append (.Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x")) }} + {{ $images = $images | append (.Resize "600x") }} + {{ $images = $images | append (.Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x")) }} {{ end }} - {{ range $classImages }} + {{ range $images }} {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} {{ $cssBackgroundImage := printf ".%s { background-image: url(\"%s\"); }" $className .RelPermalink }} {{ $cssBackgroundImage = $cssBackgroundImage | resources.FromString "css/background-image.css" }} diff --git a/layouts/partials/hero/background.html b/layouts/partials/hero/background.html index 7faae0d9..674df3c8 100644 --- a/layouts/partials/hero/background.html +++ b/layouts/partials/hero/background.html @@ -1,7 +1,7 @@ {{ $images := .Resources.ByType "image" }} {{ $backgroundImage := $images.GetMatch "*background*" }} {{ if not $backgroundImage }} - {{ $backgroundImage = $images.GetMatch "*feature*" }} + {{ $backgroundImage := $images.GetMatch "*feature*" }} {{ end }} {{ if not $backgroundImage }} {{ $backgroundImage = $images.GetMatch "{*cover*,*thumbnail*}" }} diff --git a/layouts/partials/hero/basic.html b/layouts/partials/hero/basic.html index 2123652c..de8e0882 100644 --- a/layouts/partials/hero/basic.html +++ b/layouts/partials/hero/basic.html @@ -1,7 +1,7 @@ {{ $images := .Resources.ByType "image" }} {{ $backgroundImage := $images.GetMatch "*background*" }} {{ if not $backgroundImage }} - {{ $backgroundImage = $images.GetMatch "*feature*" }} + {{ $backgroundImage := $images.GetMatch "*feature*" }} {{ end }} {{ if not $backgroundImage }} {{ $backgroundImage = $images.GetMatch "{*cover*,*thumbnail*}" }} diff --git a/layouts/partials/hero/thumbAndBackground.html b/layouts/partials/hero/thumbAndBackground.html index ca83ff88..841f83ec 100644 --- a/layouts/partials/hero/thumbAndBackground.html +++ b/layouts/partials/hero/thumbAndBackground.html @@ -13,7 +13,7 @@ {{ $backgroundImage = $images.GetMatch "{*cover*,*thumbnail*}" }} {{ end }} {{ if not $backgroundImage }} - {{ $backgroundImage = $images.GetMatch "*feature*" }} + {{ $backgroundImage := $images.GetMatch "*feature*" }} {{ end }} {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} {{ if and ($backgroundImage) (not (or ($disableImageOptimization) (strings.HasSuffix $backgroundImage.Name ".svg"))) }} @@ -31,7 +31,7 @@ {{ $featuredImage = resources.Get .Site.Params.defaultFeaturedImage }} {{ end }} {{ if not $featuredImage }} - {{ $featuredImage = $images.GetMatch "*background*" }} + {{ $featuredImage := $images.GetMatch "*background*" }} {{ end }} {{ if not $featuredImage }} {{ with .Site.Params.defaultFeaturedImage }} @@ -53,13 +53,13 @@ ) }} {{ with $featuredImage }} - {{ $classNameFeaturedImage := printf "background-image-%s" (md5 .RelPermalink) }} -
+ {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} +
{{ end }} {{ with $backgroundImage }} - {{ $classNameBackgroundImage := printf "background-image-%s" (md5 .RelPermalink) }} -
+ {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} +
From 8d05df18dcec608c89ee27df623bd59a6ceff3ae Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Fri, 11 Jul 2025 08:59:51 +0800 Subject: [PATCH 2/3] Revert ":bug: Fix: Typos and images not in css if optimized" This reverts commit f82776c86bf959d181e0be6291140bce982be5a3. --- layouts/partials/head.html | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 78ddbc3c..6b7aa75d 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -56,32 +56,29 @@ {{ end }} {{ $images := slice }} - {{ $backgroundAndFeaturedImages := slice }} + {{ $backgroundAndfeaturedImages := slice }} {{ range .Site.Pages }} {{ $images = $images | append (.Page.Resources.ByType "image") }} {{ if .Params.featureimage }} - {{ $backgroundAndFeaturedImages = $backgroundAndFeaturedImages | append (resources.GetRemote .Params.featureimage) }} + {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append (resources.GetRemote .Params.featureimage) }} {{ end }} {{ end }} - {{ $backgroundAndFeaturedImages = $backgroundAndFeaturedImages | append ($images.Match "{*background*,*feature*,*cover*,*thumbnail*}") }} + {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append ($images.Match "{*background*,*feature*,*cover*,*thumbnail*}") }} {{ $siteParams := slice .Site.Params.defaultFeaturedImage .Site.Params.defaultBackgroundImage }} {{ range $siteParams }} {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} - {{ $backgroundAndFeaturedImages = $backgroundAndFeaturedImages | append (resources.GetRemote .) }} + {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append (resources.GetRemote .) }} {{ else }} - {{ $backgroundAndFeaturedImages = $backgroundAndFeaturedImages | append (resources.Get .) }} + {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append (resources.Get .) }} {{ end }} {{ end }} {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} - {{ range $backgroundAndFeaturedImages }} - {{ $images := slice }} - {{ if or $disableImageOptimization (strings.HasSuffix .Name ".svg") }} - {{ $images = $images | append . }} - {{ else }} - {{ $images = $images | append (.Resize "600x") }} - {{ $images = $images | append (.Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x")) }} + {{ range $backgroundAndfeaturedImages }} + {{ $backgroundAndfeaturedImages := . }} + {{ if not (or ($disableImageOptimization) (strings.HasSuffix .Name ".svg")) }} + {{ $backgroundAndfeaturedImages = .Resize "600x" }} {{ end }} - {{ range $images }} + {{ with $backgroundAndfeaturedImages }} {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} {{ $cssBackgroundImage := printf ".%s { background-image: url(\"%s\"); }" $className .RelPermalink }} {{ $cssBackgroundImage = $cssBackgroundImage | resources.FromString "css/background-image.css" }} From 9e5a7f9d29050aa20ecf4f0871e69d8310dcb3d2 Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Fri, 11 Jul 2025 09:02:44 +0800 Subject: [PATCH 3/3] Revert ":recycle: Refactor: Move inline styles containing background-image: out of line" This reverts commit 1736cafcf4fef8c732b23b8ad6eab348756f8c3d. --- .../partials/article-link/card-related.html | 58 ++++---- layouts/partials/article-link/card.html | 61 ++++---- layouts/partials/article-link/simple.html | 54 ++++--- layouts/partials/head.html | 42 ------ layouts/partials/hero/background.html | 97 +++++++------ layouts/partials/hero/basic.html | 60 ++++---- layouts/partials/hero/thumbAndBackground.html | 135 ++++++++++-------- layouts/partials/term-link/card.html | 37 ++--- 8 files changed, 272 insertions(+), 272 deletions(-) diff --git a/layouts/partials/article-link/card-related.html b/layouts/partials/article-link/card-related.html index 11045624..288a85de 100644 --- a/layouts/partials/article-link/card-related.html +++ b/layouts/partials/article-link/card-related.html @@ -1,35 +1,39 @@ - -
- {{- with $.Params.images -}} +{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} +{{ with .Params.externalUrl }} + + {{ else }} + + {{ end }} +
+ + {{- with $.Params.images -}} {{- range first 6 . }} - - {{ end -}} - {{- else -}} - {{ $images := $.Resources.ByType "image" }} - {{ $featuredImage := $images.GetMatch "*feature*" }} - {{ if not $featuredImage }} - {{ $featuredImage = $images.GetMatch "{*cover*,*thumbnail*}" }} + {{ end -}} + {{- else -}} + {{- $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 and (not $featuredImage) .Params.featureimage }} - {{ $featuredImage = resources.GetRemote .Params.featureimage }} - {{ end }} - {{ if not $featuredImage }} - {{ $featuredImage = resources.Get .Site.Params.defaultFeaturedImage }} - {{ end }} - {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} - {{ if and ($featuredImage) (not (or ($disableImageOptimization) (strings.HasSuffix $featuredImage.Name ".svg"))) }} - {{ $featuredImage = $featuredImage.Resize "600x" }} - {{ end }} - {{ with $featuredImage }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
+ {{- if not $featured }}{{ with .Site.Params.defaultFeaturedImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}} + {{- with $featured -}} + {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg")}} + {{ with . }} +
+ {{ end }} {{ else }} - {{ with $.Site.Params.images }} - + {{ with .Resize "600x" }} +
{{ end }} {{ end }} - {{ end }} + {{- else -}} + {{- with $.Site.Params.images }} + {{ end -}} + {{- end -}} + {{- end -}} + {{ if and .Draft .Site.Params.article.showDraftLabel }} diff --git a/layouts/partials/article-link/card.html b/layouts/partials/article-link/card.html index 70affad0..7a565d3c 100644 --- a/layouts/partials/article-link/card.html +++ b/layouts/partials/article-link/card.html @@ -1,38 +1,39 @@ - -
- {{- with $.Params.images -}} +{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} +{{ with .Params.externalUrl }} + + {{ else }} + + {{ end }} +
+ + {{- with $.Params.images -}} {{- range first 6 . }} - - {{ end -}} - {{- else -}} - {{ $images := $.Resources.ByType "image" }} - {{ $featuredImage := $images.GetMatch "*feature*" }} - {{ if not $featuredImage }} - {{ $featuredImage = $images.GetMatch "{*cover*,*thumbnail*}" }} + {{ end -}} + {{- else -}} + {{- $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 and (not $featuredImage) .Params.featureimage }} - {{ $featuredImage = resources.GetRemote .Params.featureimage }} - {{ end }} - {{ if not $featuredImage }} - {{ $featuredImage = resources.Get .Site.Params.defaultFeaturedImage }} - {{ end }} - {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} - {{ if and ($featuredImage) (not (or ($disableImageOptimization) (strings.HasSuffix $featuredImage.Name ".svg"))) }} - {{ $featuredImage = $featuredImage.Resize "600x" }} - {{ end }} - {{ if .Params.hideFeatureImage }} - {{ $featuredImage = false }} - {{ end }} - {{ with $featuredImage }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
+ {{- if not $featured }}{{ with .Site.Params.defaultFeaturedImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}} + {{ if .Params.hideFeatureImage }}{{ $featured = false }}{{ end }} + {{- with $featured -}} + {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg")}} + {{ with . }} +
+ {{ end }} {{ else }} - {{ with $.Site.Params.images }} - + {{ with .Resize "600x" }} +
{{ end }} {{ end }} - {{ end }} + {{- else -}} + {{- with $.Site.Params.images }} + {{ end -}} + {{- end -}} + {{- end -}} {{ if and .Draft .Site.Params.article.showDraftLabel }} diff --git a/layouts/partials/article-link/simple.html b/layouts/partials/article-link/simple.html index 9f0ab86d..bf5461fc 100644 --- a/layouts/partials/article-link/simple.html +++ b/layouts/partials/article-link/simple.html @@ -14,6 +14,8 @@ {{ $articleImageClasses = delimit (slice $articleImageClasses "thumbnailshadow md:mr-7") " " }} {{ end }} +{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} + {{ $articleInnerClasses := "" }} {{ if .Site.Params.list.showCards }} {{ $articleInnerClasses = delimit (slice $articleInnerClasses "p-4") " " }} @@ -29,36 +31,32 @@ {{- with $.Params.images -}} {{- range first 6 . }} - - {{ end -}} - {{- else -}} - {{ $images := $.Resources.ByType "image" }} - {{ $featuredImage := $images.GetMatch "*feature*" }} - {{ if not $featuredImage }} - {{ $featuredImage = $images.GetMatch "{*cover*,*thumbnail*}" }} + {{ end -}} + {{- else -}} + {{- $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 and (not $featuredImage) .Params.featureimage }} - {{ $featuredImage = resources.GetRemote .Params.featureimage }} - {{ end }} - {{ if not $featuredImage }} - {{ $featuredImage = resources.Get .Site.Params.defaultFeaturedImage }} - {{ end }} - {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} - {{ if and ($featuredImage) (not (or ($disableImageOptimization) (strings.HasSuffix $featuredImage.Name ".svg"))) }} - {{ $featuredImage = $featuredImage.Resize "600x" }} - {{ end }} - {{ if .Params.hideFeatureImage }} - {{ $featuredImage = false }} - {{ end }} - {{ with $featuredImage }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
- {{ else }} - {{ with $.Site.Params.images }} - + {{- if not $featured }}{{ with .Site.Params.defaultFeaturedImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}} + {{ if .Params.hideFeatureImage }}{{ $featured = false }}{{ end }} + {{- with $featured -}} + {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg")}} + {{ with . }} +
+ {{ end }} + {{ else }} + {{ with .Resize "600x" }} +
+ {{ end }} {{ end }} - {{ end }} - {{ end }} + {{- else -}} + {{- with $.Site.Params.images }} + {{ end -}} + {{- end -}} + {{- end -}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 6b7aa75d..a1db6860 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -54,48 +54,6 @@ {{ $cssZoom := resources.Get "lib/zoom/style.css" }} {{ $assets.Add "css" (slice $cssZoom) }} {{ end }} - - {{ $images := slice }} - {{ $backgroundAndfeaturedImages := slice }} - {{ range .Site.Pages }} - {{ $images = $images | append (.Page.Resources.ByType "image") }} - {{ if .Params.featureimage }} - {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append (resources.GetRemote .Params.featureimage) }} - {{ end }} - {{ end }} - {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append ($images.Match "{*background*,*feature*,*cover*,*thumbnail*}") }} - {{ $siteParams := slice .Site.Params.defaultFeaturedImage .Site.Params.defaultBackgroundImage }} - {{ range $siteParams }} - {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} - {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append (resources.GetRemote .) }} - {{ else }} - {{ $backgroundAndfeaturedImages = $backgroundAndfeaturedImages | append (resources.Get .) }} - {{ end }} - {{ end }} - {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} - {{ range $backgroundAndfeaturedImages }} - {{ $backgroundAndfeaturedImages := . }} - {{ if not (or ($disableImageOptimization) (strings.HasSuffix .Name ".svg")) }} - {{ $backgroundAndfeaturedImages = .Resize "600x" }} - {{ end }} - {{ with $backgroundAndfeaturedImages }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} - {{ $cssBackgroundImage := printf ".%s { background-image: url(\"%s\"); }" $className .RelPermalink }} - {{ $cssBackgroundImage = $cssBackgroundImage | resources.FromString "css/background-image.css" }} - {{ $assets.Add "css" (slice $cssBackgroundImage) }} - {{ end }} - {{ end }} - - {{ $repoLanguages := partial "functions/repo-languages.html" }} - {{ $repoColors := .Site.Data.repoColors }} - {{ range $repoLanguages }} - {{ $color := index $repoColors . | default "#0077b6" }} - {{ $className := printf "background-color-%s" (md5 .) }} - {{ $cssRepoColor := printf ".%s { background-color: %s; }" $className $color }} - {{ $cssRepoColor = $cssRepoColor | resources.FromString (printf "css/background-color.css") }} - {{ $assets.Add "css" (slice $cssRepoColor) }} - {{ end }} - {{ $bundleCSS := $assets.Get "css" | resources.Concat "css/main.bundle.css" | resources.Minify | resources.Fingerprint (.Site.Params.fingerprintAlgorithm | default "sha512") }} diff --git a/layouts/partials/hero/background.html b/layouts/partials/hero/background.html index 674df3c8..c3adf2e0 100644 --- a/layouts/partials/hero/background.html +++ b/layouts/partials/hero/background.html @@ -1,55 +1,62 @@ -{{ $images := .Resources.ByType "image" }} -{{ $backgroundImage := $images.GetMatch "*background*" }} -{{ if not $backgroundImage }} - {{ $backgroundImage := $images.GetMatch "*feature*" }} -{{ end }} -{{ if not $backgroundImage }} - {{ $backgroundImage = $images.GetMatch "{*cover*,*thumbnail*}" }} -{{ end }} -{{ if and (not $backgroundImage) .Params.featureimage }} - {{ $backgroundImage = resources.GetRemote .Params.featureimage }} -{{ end }} -{{ if not $backgroundImage }} - {{ with .Site.Params.defaultBackgroundImage }} - {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} - {{ $backgroundImage = resources.GetRemote . }} - {{ else }} - {{ $backgroundImage = resources.Get . }} - {{ end }} - {{ end }} -{{ end }} {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} -{{ if and ($backgroundImage) (not (or ($disableImageOptimization) (strings.HasSuffix $backgroundImage.Name ".svg"))) }} - {{ $backgroundImage = $backgroundImage.Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }} + +{{- $images := .Resources.ByType "image" -}} +{{- $featured := $images.GetMatch "*background*" -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "*feature*" }}{{ end -}} +{{- 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.defaultBackgroundImage }} + {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} + {{ $featured = resources.GetRemote . }} + {{ else }} + {{ $featured = resources.Get . }} + {{ end }} + {{ end }} +{{ end -}} + {{ $isParentList := eq (.Scratch.Get "scope") "list" }} -{{ $shouldBlur := $.Params.layoutBackgroundBlur | default (or - (and ($.Site.Params.article.layoutBackgroundBlur | default true) (not $isParentList)) +{{ $shouldBlur := $.Params.layoutBackgroundBlur | default (or + (and ($.Site.Params.article.layoutBackgroundBlur | default true) (not $isParentList)) (and ($.Site.Params.list.layoutBackgroundBlur | default true) ($isParentList)) ) }} -{{ $shouldAddHeaderSpace := $.Params.layoutBackgroundHeaderSpace | default (or - (and ($.Site.Params.article.layoutBackgroundHeaderSpace | default true) (not $isParentList)) +{{ $shouldAddHeaderSpace := $.Params.layoutBackgroundHeaderSpace | default (or + (and ($.Site.Params.article.layoutBackgroundHeaderSpace | default true) (not $isParentList)) (and ($.Site.Params.list.layoutBackgroundHeaderSpace | default true) ($isParentList)) ) }} +{{- with $featured -}} -{{ with $backgroundImage }} - {{ if $shouldAddHeaderSpace | default true}} -
- {{ end }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
-
-
-
-
-
- {{ if $shouldBlur | default false }} -
- {{ $backgroundBlur := resources.Get "js/background-blur.js" }} - {{ $backgroundBlur = $backgroundBlur | resources.Minify | resources.Fingerprint ($.Site.Params.fingerprintAlgorithm | default "sha512") }} - - {{ end }} +{{ if $shouldAddHeaderSpace | default true}} +
{{ end }} + +{{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg")}} + {{ with . }} +
+ {{ end }} +{{ else }} + {{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }} +
+ {{ end }} +{{ end }} + +
+
+
+
+
+{{ if $shouldBlur | default false }} +
+{{ $backgroundBlur := resources.Get "js/background-blur.js" }} +{{ $backgroundBlur = $backgroundBlur | resources.Minify | resources.Fingerprint ($.Site.Params.fingerprintAlgorithm | default "sha512") }} + +{{ end }} +{{- end -}} diff --git a/layouts/partials/hero/basic.html b/layouts/partials/hero/basic.html index de8e0882..54e84ed3 100644 --- a/layouts/partials/hero/basic.html +++ b/layouts/partials/hero/basic.html @@ -1,29 +1,37 @@ -{{ $images := .Resources.ByType "image" }} -{{ $backgroundImage := $images.GetMatch "*background*" }} -{{ if not $backgroundImage }} - {{ $backgroundImage := $images.GetMatch "*feature*" }} -{{ end }} -{{ if not $backgroundImage }} - {{ $backgroundImage = $images.GetMatch "{*cover*,*thumbnail*}" }} -{{ end }} -{{ if and (not $backgroundImage) .Params.featureimage }} - {{ $backgroundImage = resources.GetRemote .Params.featureimage }} -{{ end }} -{{ if not $backgroundImage }} - {{ with .Site.Params.defaultBackgroundImage }} - {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} - {{ $backgroundImage = resources.GetRemote . }} - {{ else }} - {{ $backgroundImage = resources.Get . }} - {{ end }} - {{ end }} -{{ end }} {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} -{{ if and ($backgroundImage) (not (or ($disableImageOptimization) (strings.HasSuffix $backgroundImage.Name ".svg"))) }} - {{ $backgroundImage = $backgroundImage.Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }} + +{{- $images := .Resources.ByType "image" -}} +{{- $featured := $images.GetMatch "*background*" -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "*feature*" }}{{ end -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} + +{{ if and .Params.featureimage (not $featured) }} + {{- $url:= .Params.featureimage -}} + {{ $featured = resources.GetRemote $url }} {{ end }} -{{ with $backgroundImage }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
-{{ end }} +{{- if not $featured }} + {{ with .Site.Params.defaultBackgroundImage }} + {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} + {{ $featured = resources.GetRemote . }} + {{ else }} + {{ $featured = resources.Get . }} + {{ end }} + {{ end }} +{{ end -}} + +{{- with $featured -}} + {{ if or $disableImageOptimization (strings.HasSuffix $featured ".svg") }} + {{ with . }} +
+ {{ end }} + {{ else }} + {{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }} +
+ {{ end }} + {{ end }} +{{- end -}} diff --git a/layouts/partials/hero/thumbAndBackground.html b/layouts/partials/hero/thumbAndBackground.html index 841f83ec..2a8448cb 100644 --- a/layouts/partials/hero/thumbAndBackground.html +++ b/layouts/partials/hero/thumbAndBackground.html @@ -1,77 +1,98 @@ -{{ $images := .Resources.ByType "image" }} -{{ $backgroundImage := $images.GetMatch "*background*" }} -{{ if not $backgroundImage }} +{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} + +{{- $images := .Resources.ByType "image" -}} +{{- $background := $images.GetMatch "*background*" -}} + +{{- if not $background }} {{ with .Site.Params.defaultBackgroundImage }} {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} - {{ $backgroundImage = resources.GetRemote . }} + {{ $background = resources.GetRemote . }} {{ else }} - {{ $backgroundImage = resources.Get . }} + {{ $background = resources.Get . }} {{ end }} {{ end }} -{{ end }} -{{ if not $backgroundImage }} - {{ $backgroundImage = $images.GetMatch "{*cover*,*thumbnail*}" }} -{{ end }} -{{ if not $backgroundImage }} - {{ $backgroundImage := $images.GetMatch "*feature*" }} -{{ end }} -{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} -{{ if and ($backgroundImage) (not (or ($disableImageOptimization) (strings.HasSuffix $backgroundImage.Name ".svg"))) }} - {{ $backgroundImage = $backgroundImage.Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }} -{{ end }} +{{ end -}} -{{ $featuredImage := $images.GetMatch "*feature*" }} -{{ if not $featuredImage }} - {{ $featuredImage = $images.GetMatch "{*cover*,*thumbnail*}" }} +{{- if not $background }}{{ $background = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} +{{- if not $background }}{{ $background = $images.GetMatch "*feature*" }}{{ end -}} +{{- $featured := $images.GetMatch "*feature*" -}} +{{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} +{{ if .Params.featureimage }} + {{- $url:= .Params.featureimage -}} + {{- if not $featured }}{{ $featured = resources.GetRemote $url }}{{ end -}} {{ end }} -{{ if and (not $featuredImage) .Params.featureimage }} - {{ $featuredImage = resources.GetRemote .Params.featureimage }} -{{ end }} -{{ if not $featuredImage }} - {{ $featuredImage = resources.Get .Site.Params.defaultFeaturedImage }} -{{ end }} -{{ if not $featuredImage }} - {{ $featuredImage := $images.GetMatch "*background*" }} -{{ end }} -{{ if not $featuredImage }} +{{- if not $featured }}{{ $featured = $images.GetMatch "*background*" }}{{ end -}} + +{{- if not $featured }} {{ with .Site.Params.defaultFeaturedImage }} {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} - {{ $featuredImage = resources.GetRemote . }} + {{ $featured = resources.GetRemote . }} {{ else }} - {{ $featuredImage = resources.Get . }} + {{ $featured = resources.Get . }} {{ end }} {{ end }} -{{ end }} -{{ if and ($featuredImage) (not (or ($disableImageOptimization) (strings.HasSuffix $featuredImage.Name ".svg"))) }} - {{ $featuredImage = $featuredImage.Resize "600x" }} -{{ end }} +{{ end -}} -{{ $isParentList := eq (.Scratch.Get "scope") "list" }} +{{ $isParentList := eq (.Scratch.Get "scope") "list" }} {{ $shouldBlur := $.Params.layoutBackgroundBlur | default (or - (and ($.Site.Params.article.layoutBackgroundBlur | default true) (not $isParentList)) - (and ($.Site.Params.list.layoutBackgroundBlur | default true) ($isParentList)) - ) }} + (and ($.Site.Params.article.layoutBackgroundBlur | default true) (not $isParentList)) + (and ($.Site.Params.list.layoutBackgroundBlur | default true) ($isParentList)) + ) +}} -{{ with $featuredImage }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
-{{ end }} +{{- with $featured -}} + {{ if or $disableImageOptimization (strings.HasSuffix . ".svg") }} + {{ with . }} +
+ {{ end }} + {{ else }} + {{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }} +
+ {{ end }} + {{ end }} +{{- end -}} -{{ with $backgroundImage }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
-
-
-
-
-
-{{ end }} +{{- with $background -}} + + {{ if or $disableImageOptimization (strings.HasSuffix . ".svg") }} + {{ with . }} +
+
+
+
+ {{ end }} + {{ else }} + {{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }} +
+
+
+
+ {{ end }} + {{ end }} + +{{- end -}} {{ if $shouldBlur | default false }} -
+
{{ $backgroundBlur := resources.Get "js/background-blur.js" }} - {{ $backgroundBlur = $backgroundBlur | resources.Minify | resources.Fingerprint ($.Site.Params.fingerprintAlgorithm | default "sha512") }} - + {{ $backgroundBlur = $backgroundBlur | resources.Minify | resources.Fingerprint (.Site.Params.fingerprintAlgorithm | default "sha512") }} + {{ end }} diff --git a/layouts/partials/term-link/card.html b/layouts/partials/term-link/card.html index 31fdc225..280a74d4 100644 --- a/layouts/partials/term-link/card.html +++ b/layouts/partials/term-link/card.html @@ -1,29 +1,32 @@
+ {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} + {{- with site.Params.images -}} {{- range first 6 . }} {{ end -}} {{- else -}} - {{ $images := .Page.Resources.ByType "image" }} - {{ $featuredImage := $images.GetMatch "*feature*" }} - {{ if not $featuredImage }} - {{ $featuredImage = $images.GetMatch "{*cover*,*thumbnail*}" }} - {{ end }} - {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }} - {{ if and ($featuredImage) (not (or ($disableImageOptimization) (strings.HasSuffix $featuredImage.Name ".svg"))) }} - {{ $featuredImage = $featuredImage.Resize "600x" }} - {{ end }} - {{ with $featuredImage }} - {{ $className := printf "background-image-%s" (md5 .RelPermalink) }} -
- {{ else }} - {{ with site.Params.images }} - + {{- $images := .Page.Resources.ByType "image" -}} + {{- $featured := $images.GetMatch "*feature*" -}} + {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}} + {{- with $featured -}} + {{ if $disableImageOptimization }} + {{ with . }} +
+ {{ end }} + {{ else }} + {{ with .Resize "600x" }} +
+ {{ end }} {{ end }} - {{ end }} - {{ end }} + {{- else -}} + {{- with site.Params.images }} + + {{ end -}} + {{- end -}} + {{- end -}} {{ if site.Params.taxonomy.showTermCount | default true }}