From 04aba872d713b6dd91c51e9c4e89e562b9a8e3ed Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 19:29:22 +0200 Subject: [PATCH 1/8] Update scripts.html --- src/layouts/partials/scripts.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/layouts/partials/scripts.html b/src/layouts/partials/scripts.html index a07e7f697..04343bf99 100644 --- a/src/layouts/partials/scripts.html +++ b/src/layouts/partials/scripts.html @@ -4,16 +4,15 @@ {{- $esbuildOptions = merge $esbuildOptions (dict "minify" "true") -}} {{- end -}} -{{- $bootstrapJs := resources.Get "/js/vendor/bootstrap.bundle.min.js" | fingerprint | resources.Copy "/assets/js/vendor/bootstrap.bundle.min.js" -}} +{{- $bootstrapJs := resources.Get "/js/vendor/bootstrap.bundle.min.js" | fingerprint | resources.Copy "/assets/js/vendor/bootstrap.bundle.min.js" }} {{- $scripts := slice "js/application.js" "js/lazyload.js" -}} {{- range $scriptFile := $scripts -}} -{{- $script := resources.Get $scriptFile | js.Build $esbuildOptions | fingerprint | resources.Copy (path.Join "/assets" $scriptFile) -}} - +{{- $script := resources.Get $scriptFile | js.Build $esbuildOptions | fingerprint | resources.Copy (path.Join "/assets" $scriptFile) }} -{{- end -}} +{{- end }} -{{ range .Page.Params.extra_js -}} +{{- range .Page.Params.extra_js }} -{{- end -}} +{{- end }} From 08f62c312c0e2437f20805658122f4ecd7e54d0a Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 19:31:00 +0200 Subject: [PATCH 2/8] Update stylesheet.html --- src/layouts/partials/stylesheet.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/layouts/partials/stylesheet.html b/src/layouts/partials/stylesheet.html index e70056e44..4f4805f03 100644 --- a/src/layouts/partials/stylesheet.html +++ b/src/layouts/partials/stylesheet.html @@ -1,10 +1,9 @@ -{{ $sassOptions := dict "targetPath" "/assets/css/style.css" "outputStyle" "expanded" "precision" 6 -}} +{{- $sassOptions := dict "targetPath" "/assets/css/style.css" "outputStyle" "expanded" "precision" 6 -}} {{- $postcssOptions := dict "use" "autoprefixer" "noMap" true -}} {{- if hugo.IsProduction -}} {{- $sassOptions = merge $sassOptions (dict "outputStyle" "compressed") -}} {{- end -}} -{{- $style := resources.Get "scss/style.scss" | toCSS $sassOptions | postCSS $postcssOptions | fingerprint -}} - +{{- $style := resources.Get "scss/style.scss" | toCSS $sassOptions | postCSS $postcssOptions | fingerprint }} From d7b68bbdf1d9e9d70b2166f1b105e3e13818588a Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 19:33:25 +0200 Subject: [PATCH 3/8] Update social.html --- src/layouts/partials/social.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/layouts/partials/social.html b/src/layouts/partials/social.html index 0abc92038..9b66f9d46 100644 --- a/src/layouts/partials/social.html +++ b/src/layouts/partials/social.html @@ -8,17 +8,18 @@ -{{ template "_internal/twitter_cards.html" . -}} +{{- template "_internal/twitter_cards.html" . }} + {{- /* Manually add `twitter:creator` since Hugo's internal shortcode doesn't add it */ -}} -{{ template "_internal/opengraph.html" . -}} +{{- template "_internal/opengraph.html" . }} {{- /* Manually add `og:image`'s dimensions since Hugo's internal shortcode doesn't do it */ -}} {{- $socialImage := path.Join "src/static" (index $.Site.Params.images 0) -}} -{{- with imageConfig $socialImage -}} +{{- with imageConfig $socialImage }} {{- end }} -{{ template "_internal/schema.html" . -}} +{{- template "_internal/schema.html" . }} From 785cf0ba9bd42118eaab5e5b40838b1209695882 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 19:33:58 +0200 Subject: [PATCH 4/8] Update stylesheet.html --- src/layouts/partials/stylesheet.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layouts/partials/stylesheet.html b/src/layouts/partials/stylesheet.html index 4f4805f03..68f4da2a1 100644 --- a/src/layouts/partials/stylesheet.html +++ b/src/layouts/partials/stylesheet.html @@ -5,5 +5,6 @@ {{- $sassOptions = merge $sassOptions (dict "outputStyle" "compressed") -}} {{- end -}} -{{- $style := resources.Get "scss/style.scss" | toCSS $sassOptions | postCSS $postcssOptions | fingerprint }} +{{- $style := resources.Get "scss/style.scss" | toCSS $sassOptions | postCSS $postcssOptions | fingerprint -}} + From 3b8e015944079c0fde3adcf1fd90dab84b1b8aca Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 19:35:38 +0200 Subject: [PATCH 5/8] Update social.html --- src/layouts/partials/social.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/partials/social.html b/src/layouts/partials/social.html index 9b66f9d46..1423d2318 100644 --- a/src/layouts/partials/social.html +++ b/src/layouts/partials/social.html @@ -8,7 +8,7 @@ -{{- template "_internal/twitter_cards.html" . }} +{{ template "_internal/twitter_cards.html" . -}} {{- /* Manually add `twitter:creator` since Hugo's internal shortcode doesn't add it */ -}} From a1c5f43f2cf07813e0fa9804bf17aee87b9d98e0 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 19:37:35 +0200 Subject: [PATCH 6/8] Update social.html --- src/layouts/partials/social.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/partials/social.html b/src/layouts/partials/social.html index 1423d2318..176f6e7bd 100644 --- a/src/layouts/partials/social.html +++ b/src/layouts/partials/social.html @@ -17,9 +17,9 @@ {{- /* Manually add `og:image`'s dimensions since Hugo's internal shortcode doesn't do it */ -}} {{- $socialImage := path.Join "src/static" (index $.Site.Params.images 0) -}} -{{- with imageConfig $socialImage }} +{{- with imageConfig $socialImage -}} {{- end }} -{{- template "_internal/schema.html" . }} +{{ template "_internal/schema.html" . -}} From 8cbcf6986cdcea585dea3108a176ea2b232e754d Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 22:07:02 +0200 Subject: [PATCH 7/8] Update social.html --- src/layouts/partials/social.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/layouts/partials/social.html b/src/layouts/partials/social.html index 176f6e7bd..0abc92038 100644 --- a/src/layouts/partials/social.html +++ b/src/layouts/partials/social.html @@ -9,11 +9,10 @@ {{ template "_internal/twitter_cards.html" . -}} - {{- /* Manually add `twitter:creator` since Hugo's internal shortcode doesn't add it */ -}} -{{- template "_internal/opengraph.html" . }} +{{ template "_internal/opengraph.html" . -}} {{- /* Manually add `og:image`'s dimensions since Hugo's internal shortcode doesn't do it */ -}} {{- $socialImage := path.Join "src/static" (index $.Site.Params.images 0) -}} From 124441dec0b7f400696b55caea11f6e522eb2fb7 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 30 Mar 2024 22:08:21 +0200 Subject: [PATCH 8/8] Update stylesheet.html --- src/layouts/partials/stylesheet.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/layouts/partials/stylesheet.html b/src/layouts/partials/stylesheet.html index 68f4da2a1..4f4805f03 100644 --- a/src/layouts/partials/stylesheet.html +++ b/src/layouts/partials/stylesheet.html @@ -5,6 +5,5 @@ {{- $sassOptions = merge $sassOptions (dict "outputStyle" "compressed") -}} {{- end -}} -{{- $style := resources.Get "scss/style.scss" | toCSS $sassOptions | postCSS $postcssOptions | fingerprint -}} - +{{- $style := resources.Get "scss/style.scss" | toCSS $sassOptions | postCSS $postcssOptions | fingerprint }}