From 627f174ae490783afcf32ea26250cd8cc16abeb7 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Nov 2023 12:06:26 +0100 Subject: [PATCH 1/4] Fix duplicate rendering of section body --- layouts/partials/utilities/GetSections.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layouts/partials/utilities/GetSections.html b/layouts/partials/utilities/GetSections.html index 3cafe1af1..8be355d55 100644 --- a/layouts/partials/utilities/GetSections.html +++ b/layouts/partials/utilities/GetSections.html @@ -48,7 +48,8 @@ {{- $thumbnail := (or (and (reflect.IsMap $sectionPage.Params.Thumbnail) $sectionPage.Params.Thumbnail.url) $sectionPage.Params.Thumbnail) -}} {{- $icon := $sectionPage.Params.Icon -}} - {{- $content := $sectionPage.Content -}} + {{- $content := "" -}} + {{ if not $sectionPage.IsSection }}{{ $content = $sectionPage.Content }}{{ end -}} {{- $sectionTitle := strings.FirstUpper $sectionPage.Type -}} {{- $moreTitle := "" -}} {{- with (index site.Params.sections $section) -}} From 9e97f063e54abccaef47a53ff9478786c27ee6f7 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Nov 2023 12:06:41 +0100 Subject: [PATCH 2/4] Update build stats --- exampleSite/hugo_stats.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/exampleSite/hugo_stats.json b/exampleSite/hugo_stats.json index 0be29a574..dc180cc13 100644 --- a/exampleSite/hugo_stats.json +++ b/exampleSite/hugo_stats.json @@ -120,12 +120,15 @@ "col-8", "col-9", "col-auto", + "col-lg-2", "col-lg-4", "col-lg-8", "col-md-10", "col-md-2", + "col-md-3", "col-md-4", "col-md-8", + "col-md-9", "col-md-auto", "col-sm-12", "col-sm-3", @@ -141,6 +144,7 @@ "d-grid", "d-inline", "d-inline-flex", + "d-lg-block", "d-md-block", "d-md-flex", "d-md-none", @@ -332,6 +336,7 @@ "row", "row-cols-1", "row-cols-2", + "row-cols-lg-3", "row-cols-md-2", "row-cols-md-3", "row-cols-sm-2", @@ -341,6 +346,7 @@ "search-suggestions", "shadow", "show", + "sidebar-overflow", "slide", "small", "spinner-border", From d32fdfa987feafbb819808642439af83a3c270e3 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Nov 2023 12:09:16 +0100 Subject: [PATCH 3/4] Make page breakpoint configurable --- config/_default/params.toml | 1 + exampleSite/config/_default/params.toml | 1 + layouts/_default/baseof.html | 3 ++ layouts/_default/list/body.html | 12 +++++--- layouts/_default/single.html | 30 +++++++------------ layouts/partials/assets/card-group.html | 9 +++--- layouts/partials/utilities/GetBreakpoint.html | 21 +++++++++++++ layouts/tags/list.html | 11 +++---- 8 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 layouts/partials/utilities/GetBreakpoint.html diff --git a/config/_default/params.toml b/config/_default/params.toml index 962ce4d76..b2741fd9f 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -8,6 +8,7 @@ endorse = true footerBelowFold = false loading = "lazy" + breakpoint = "md" [main.externalLinks] cue = false tab = false diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml index 1ce5bf833..b9c43c4fa 100644 --- a/exampleSite/config/_default/params.toml +++ b/exampleSite/config/_default/params.toml @@ -6,6 +6,7 @@ canonifyAssetsURLs = false footerBelowFold = false loading = "lazy" + breakpoint = "md" [main.externalLinks] cue = true tab = true diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 829722201..fef9b1b10 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -48,6 +48,9 @@ {{ $sections := partial "utilities/GetSections.html" (dict "page" . "loading" $loading) }} {{- $.Scratch.Set "sections" $sections -}} +{{- /* Define main breakpoint */ -}} +{{- $.Scratch.Set "breakpoint" (partial "utilities/GetBreakpoint.html") }} + diff --git a/layouts/_default/list/body.html b/layouts/_default/list/body.html index 3fd3ff394..cbe11b6df 100644 --- a/layouts/_default/list/body.html +++ b/layouts/_default/list/body.html @@ -1,9 +1,10 @@ {{- $sections := $.Scratch.Get "sections" -}} {{- $fullCover := $.Scratch.Get "fullCover" -}} +{{- $breakpoint := $.Scratch.Get "breakpoint" -}} {{- $layout := .Params.layout -}} -
-
+
+
{{ if not .IsHome }} {{ with .Title }}

{{ . }}

{{ end }} {{ end }} @@ -15,9 +16,12 @@ {{- if $fullCover }}{{ $loading = site.Params.main.loading }}{{ end }} {{ end }} {{- $content := partial "utilities/ProcessContent" (dict "page" . "raw" .RawContent "loading" $loading) -}} - {{ $content | safeHTML }} + {{- $content | safeHTML -}} {{ if and (and $sections (eq (len $sections) 1)) (not $content) }}

{{- T "emptyList" }}.

{{ end }}
-
+
+ {{/* Empty in default layout */}} +
+
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 730eefbaa..c42994012 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,10 +1,11 @@ {{- define "partials/single-main.html" -}} + {{- $breakpoint := $.Scratch.Get "breakpoint" -}} {{ if .Site.Params.navigation.breadcrumb }}{{ partial "assets/breadcrumb.html" . }}{{ end -}} {{ .Render "single/header" }} {{- if and .Site.Params.navigation.toc .Params.includeToc | default true -}} -
{{ partial "assets/toc-dropdown.html" . }}
+
{{ partial "assets/toc-dropdown.html" . }}
{{- end -}} {{ .Render "single/body" }} @@ -18,6 +19,7 @@ {{ define "main" -}} {{- $menu := .Scratch.Get "sidebar" -}} {{- $version := .Scratch.Get "version" -}} + {{- $breakpoint := $.Scratch.Get "breakpoint" -}} {{ $sidebar := "" }} {{- $hasSidebar := .Site.Params.navigation.sidebar | default true -}} @@ -38,34 +40,24 @@
{{ strings.FirstUpper $.Section {{ end }}
- {{ if and $menu $hasSidebar -}} -
-
+ {{ if $hasSidebar -}} +
+
{{ $sidebar | safeHTML }}
-
+
{{ partial "partials/single-main.html" . }}
-
+
{{ $toc | safeHTML }}
- {{ else if $hasSidebar }} -
-
-
- {{ partial "partials/single-main.html" . }} -
-
- {{ $toc | safeHTML }} -
-
{{ else }} -
-
+
+
{{ partial "partials/single-main.html" . }}
-
+
{{ $toc | safeHTML }}
diff --git a/layouts/partials/assets/card-group.html b/layouts/partials/assets/card-group.html index c47a10b6b..23920fef0 100644 --- a/layouts/partials/assets/card-group.html +++ b/layouts/partials/assets/card-group.html @@ -36,6 +36,7 @@ --> {{- $page := .page -}} +{{- $breakpoint := partial "utilities/GetBreakpoint.html" -}} {{- if not (in (slice "*hugolib.pageState" "*hugolib.pageForShortcode") (printf "%T" $page)) -}} {{- errorf "partial [assets/card-group.html] - Invalid value for param 'page': %T" $page -}} @@ -108,10 +109,10 @@ {{- end -}} {{- $colGrid := "" -}} {{- if eq $cols "1" }}{{ $colGrid = "row-cols-1" -}} -{{- else if eq $cols "2" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-1 row-cols-md-2" }}{{ else }}{{ $colGrid = "row-cols-2" }}{{ end -}} -{{- else if eq $cols "3" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-2 row-cols-md-3" }}{{ else }}{{ $colGrid = "row-cols-3" }}{{ end -}} -{{- else if eq $cols "4" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-2 row-cols-md-4" }}{{ else }}{{ $colGrid = "row-cols-4" }}{{ end -}} -{{- else if eq $cols "5" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-3 row-cols-md-5" }}{{ else }}{{ $colGrid = "row-cols-5" }}{{ end -}} +{{- else if eq $cols "2" }}{{ if $responsive }}{{ $colGrid = printf "row-cols-1 row-cols-%s-1 row-cols-%s-2" $breakpoint.prev $breakpoint.current }}{{ else }}{{ $colGrid = "row-cols-2" }}{{ end -}} +{{- else if eq $cols "3" }}{{ if $responsive }}{{ $colGrid = printf "row-cols-1 row-cols-%s-2 row-cols-%s-3" $breakpoint.prev $breakpoint.current }}{{ else }}{{ $colGrid = "row-cols-3" }}{{ end -}} +{{- else if eq $cols "4" }}{{ if $responsive }}{{ $colGrid = printf "row-cols-1 row-cols-%s-2 row-cols-%s-4" $breakpoint.prev $breakpoint.current }}{{ else }}{{ $colGrid = "row-cols-4" }}{{ end -}} +{{- else if eq $cols "5" }}{{ if $responsive }}{{ $colGrid = printf "row-cols-1 row-cols-%s-3 row-cols-%s-5" $breakpoint.prev $breakpoint.current }}{{ else }}{{ $colGrid = "row-cols-5" }}{{ end -}} {{ end -}} {{- $gutter := .gutter | default "4" -}} diff --git a/layouts/partials/utilities/GetBreakpoint.html b/layouts/partials/utilities/GetBreakpoint.html new file mode 100644 index 000000000..4f285c2c9 --- /dev/null +++ b/layouts/partials/utilities/GetBreakpoint.html @@ -0,0 +1,21 @@ +{{- /* Define main breakpoint */ -}} +{{ $prev := 0 }} +{{ $next := 0 }} +{{ $result := dict }} +{{- $breakpoints := slice "xs" "sm" "md" "lg" "xl" "xxl" }} +{{- $breakpoint := site.Params.main.breakpoint | default "md" -}} +{{- if not (in $breakpoints $breakpoint) -}} + {{- errorf "layout [_default/baseof.html] - Invalid value for param 'breakpoint': %s" $breakpoint -}} +{{ else }} + {{ range $index, $item := $breakpoints }} + {{ if eq $item $breakpoint }} + {{ $prev = sub $index 1 }} + {{ $next = add $index 1 }} + {{ end }} + {{ end }} + {{ if lt $prev 0 }}{{ $prev = 0 }}{{ end }} + {{ if ge $next (len $breakpoints) }}{{ $next = sub (len $breakpoints) 1 }}{{ end }} + {{ $result = dict "prev" (index $breakpoints $prev) "current" $breakpoint "next" (index $breakpoints $next) }} +{{- end -}} + +{{ return $result }} \ No newline at end of file diff --git a/layouts/tags/list.html b/layouts/tags/list.html index 765b2ad68..3d1570056 100644 --- a/layouts/tags/list.html +++ b/layouts/tags/list.html @@ -1,11 +1,12 @@ {{ define "main" }} {{- $page := . -}} {{- $layout := $page.Params.layout -}} + {{- $breakpoint := $.Scratch.Get "breakpoint" -}}
-
-
-
+
+
+
{{- if ne $layout "featured" -}} {{ if and (not $page.IsHome) site.Params.navigation.breadcrumb }}
{{ partial "assets/breadcrumb.html" $page }}
@@ -36,7 +37,7 @@ {{ $year := .Date.Year }} {{ $lastYear := $.Scratch.Get "lastYear"}}
-
+
@@ -52,7 +53,7 @@ {{ end }} {{ end }}
-
+
{{ end }} \ No newline at end of file From 06e10655ecb44275ef49f03357dee80e2ae1bb6e Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Nov 2023 12:10:07 +0100 Subject: [PATCH 4/4] Bump package release --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbf60c4f5..e44380314 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gethinode/hinode", - "version": "0.21.6", + "version": "0.21.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gethinode/hinode", - "version": "0.21.6", + "version": "0.21.7", "license": "MIT", "devDependencies": { "@fullhuman/postcss-purgecss": "^5.0.0", diff --git a/package.json b/package.json index 9807c404c..00cc157c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gethinode/hinode", - "version": "0.21.6", + "version": "0.21.7", "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator", "keywords": [ "hugo",