From 9dbc0a4f38b7afc81925cd15006287deb2e6ca41 Mon Sep 17 00:00:00 2001 From: Allen Guan Date: Thu, 3 Mar 2022 12:38:47 +0800 Subject: [PATCH 01/20] fix(RSS): page context selection --- layouts/_default/rss.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 178f997..4934bd0 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -1,5 +1,13 @@ -{{- $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections -}} -{{- $notHidden := where .Site.RegularPages "Params.hidden" "!=" true -}} +{{- $pctx := . -}} +{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}} +{{- $pages := slice -}} +{{- if or $.IsHome $.IsSection -}} +{{- $pages = $pctx.RegularPages -}} +{{- else -}} +{{- $pages = $pctx.Pages -}} +{{- end -}} +{{- $pages := where $pages "Type" "in" .Site.Params.mainSections -}} +{{- $notHidden := where $pages "Params.hidden" "!=" true -}} {{- $filtered := ($pages | intersect $notHidden) -}} {{- $limit := .Site.Config.Services.RSS.Limit -}} {{- if ge $limit 1 -}} From d455336d579da37139ef4efe3f9060871a62b94d Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sat, 5 Mar 2022 18:11:48 +0100 Subject: [PATCH 02/20] fix: remove section filter in rss.xml --- layouts/_default/rss.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 4934bd0..e9f3f1a 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -6,12 +6,10 @@ {{- else -}} {{- $pages = $pctx.Pages -}} {{- end -}} -{{- $pages := where $pages "Type" "in" .Site.Params.mainSections -}} -{{- $notHidden := where $pages "Params.hidden" "!=" true -}} -{{- $filtered := ($pages | intersect $notHidden) -}} +{{- $pages := where $pages "Params.hidden" "!=" true -}} {{- $limit := .Site.Config.Services.RSS.Limit -}} {{- if ge $limit 1 -}} -{{- $filtered = $filtered | first $limit -}} +{{- $pages = $pages | first $limit -}} {{- end -}} {{- printf "" | safeHTML }} @@ -28,7 +26,7 @@ {{- with .OutputFormats.Get "RSS" -}} {{ printf "" .Permalink .MediaType | safeHTML }} {{- end -}} - {{ range $filtered }} + {{ range $pages }} {{- $content := safeHTML (.Summary | html) -}} {{- if .Site.Params.rssFullContent -}} {{- $content = safeHTML (.Content | html) -}} From 863e6d411608c13bea4206892497931da78a1554 Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sat, 5 Mar 2022 17:14:24 +0000 Subject: [PATCH 03/20] Resolve merge conflict --- layouts/{ => _default}/rss.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename layouts/{ => _default}/rss.xml (100%) diff --git a/layouts/rss.xml b/layouts/_default/rss.xml similarity index 100% rename from layouts/rss.xml rename to layouts/_default/rss.xml From 76925213a31cba81874eed8052ad168f7227895f Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sat, 5 Mar 2022 17:22:11 +0000 Subject: [PATCH 04/20] chore: update go.mod Trying to figure out what's wrong --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 776617e..6a8a679 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module github.com/CaiJimmy/hugo-theme-stack/v3 +module github.com/CaiJimmy/hugo-theme-stack -go 1.12 +go 1.17 From 07da61b1f298dece36951ba5b635ac6fdcb57e52 Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sat, 5 Mar 2022 17:25:02 +0000 Subject: [PATCH 05/20] chore: delete go.mod --- go.mod | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 go.mod diff --git a/go.mod b/go.mod deleted file mode 100644 index 6a8a679..0000000 --- a/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/CaiJimmy/hugo-theme-stack - -go 1.17 From 8f5164b5b90c0a83f58b98c5d04355401e312cbe Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sat, 5 Mar 2022 17:35:18 +0000 Subject: [PATCH 06/20] chore: add go.mod again --- go.mod | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 go.mod diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..63df635 --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module github.com/CaiJimmy/hugo-theme-stack/v3 + +go 1.17 From 07e1b856b02abcb544afefc425e464a2fa9e9d03 Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sun, 6 Mar 2022 10:58:02 +0100 Subject: [PATCH 07/20] feat: same container width on all pages (#534) --- layouts/_default/baseof.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 98cc815..081277b 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -6,7 +6,14 @@ {{- partial "head/colorScheme" . -}} - {{- $hasWidget := default (gt (len .Site.Params.widgets.homepage) 0) (.Scratch.Get "hasWidget") -}} + + {{/* The container is wider when there's any activated widget */}} + {{- $hasWidget := false -}} + {{- range .Site.Params.widgets -}} + {{- if gt (len .) 0 -}} + {{- $hasWidget = true -}} + {{- end -}} + {{- end -}}
{{- block "left-sidebar" . -}} {{ partial "sidebar/left.html" . }} From de9756291bf82b67ffc2e53ba01c02adc8db120a Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sun, 6 Mar 2022 10:58:31 +0100 Subject: [PATCH 08/20] release: 3.10.0 --- layouts/partials/footer/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html index 86222eb..b9ab61a 100644 --- a/layouts/partials/footer/footer.html +++ b/layouts/partials/footer/footer.html @@ -1,4 +1,4 @@ -{{- $ThemeVersion := "3.9.0" -}} +{{- $ThemeVersion := "3.10.0" -}}