From 656790f3e6a56173465ae13d6a77e16353e427da Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Mon, 23 Feb 2026 15:20:29 +0100 Subject: [PATCH 1/5] fix: add whitespace when last block is not fluid and has different color --- layouts/partials/page/blocks.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/layouts/partials/page/blocks.html b/layouts/partials/page/blocks.html index dd3138b..9860e7b 100644 --- a/layouts/partials/page/blocks.html +++ b/layouts/partials/page/blocks.html @@ -1,4 +1,13 @@ {{ with .Params.content_blocks }} {{ partial "bookshop_bindings" `.Params.content_blocks` | safeHTML }} {{ partial "bookshop_partial" (slice "page" .) | safeHTML }} + + {{ $last := . | last 1 }} + {{ with index $last 0 }} + {{ $fluid := index . "fluid" | default true }} + {{ if and (index (index . "background") "color") (not $fluid) }} + {{- $padding := partial "utilities/GetPadding.html" -}} +
+ {{ end }} + {{ end }} {{ end }} From c1cda5d50fff1c6de356b9a05161038dcdd5d67c Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Mon, 23 Feb 2026 15:21:16 +0100 Subject: [PATCH 2/5] feat: support heading in testimonials block --- .../testimonials/testimonials.bookshop.yml | 6 ++++++ .../components/testimonials/testimonials.hugo.html | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/component-library/components/testimonials/testimonials.bookshop.yml b/component-library/components/testimonials/testimonials.bookshop.yml index 9716f19..0cd4e12 100644 --- a/component-library/components/testimonials/testimonials.bookshop.yml +++ b/component-library/components/testimonials/testimonials.bookshop.yml @@ -9,6 +9,12 @@ spec: # Defines the structure of this component, as well as the default values blueprint: + heading: + preheading: + heading: + content: + align: + width: background: color: subtle: diff --git a/component-library/components/testimonials/testimonials.hugo.html b/component-library/components/testimonials/testimonials.hugo.html index 1b7c3f9..95898be 100644 --- a/component-library/components/testimonials/testimonials.hugo.html +++ b/component-library/components/testimonials/testimonials.hugo.html @@ -9,8 +9,17 @@ https://github.com/CloudCannon/bookshop/blob/main/guides/hugo.adoc#passing-data-to-bookshop-components */}} +{{/* Initialize global arguments */}} +{{- $padding := partial "utilities/GetPadding.html" -}} + {{/* Main code */}} -{{ $raw := partial "assets/testimonial-carousel.html" (dict +{{- $raw := partial "assets/section-title.html" (dict + "heading" .heading + "justify" .justify + "class" (printf "pb-%d" $padding.y)) +-}} + +{{ $partial := partial "assets/testimonial-carousel.html" (dict "carousel" .carousel "testimonials" .testimonials "card" .card @@ -18,6 +27,8 @@ "icon-style" (or .icon_style (index . "icon-style")) ) }} +{{ $raw = printf "%s%s" $raw $partial }} + {{ if $raw }} {{ partial "utilities/section.html" (dict "component-name" "testimonials" From e94b5d695766de3e7d70d9c1008866e8fca961ac Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Mon, 23 Feb 2026 15:21:54 +0100 Subject: [PATCH 3/5] fix: correct client contact argument in testimonial --- .../components/testimonials/testimonials.bookshop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/component-library/components/testimonials/testimonials.bookshop.yml b/component-library/components/testimonials/testimonials.bookshop.yml index 0cd4e12..e351406 100644 --- a/component-library/components/testimonials/testimonials.bookshop.yml +++ b/component-library/components/testimonials/testimonials.bookshop.yml @@ -27,7 +27,7 @@ blueprint: icon: content: client: - name: + contact: url: image: mode: From abcd6a69879d1d4984abf08b8c7f80102c8b4e21 Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Mon, 23 Feb 2026 15:22:23 +0100 Subject: [PATCH 4/5] fix: define links structure for hero --- component-library/components/hero/hero.bookshop.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/component-library/components/hero/hero.bookshop.yml b/component-library/components/hero/hero.bookshop.yml index 12cfa30..57602a7 100644 --- a/component-library/components/hero/hero.bookshop.yml +++ b/component-library/components/hero/hero.bookshop.yml @@ -32,6 +32,11 @@ blueprint: width: link-type: links: + - + title: + url: + icon: + force: align: order: overlay-mode: From 7bc8fcdc1400af83a0e6da2dc646f4e008fb2ada Mon Sep 17 00:00:00 2001 From: Mark Dumay <61946753+markdumay@users.noreply.github.com> Date: Mon, 23 Feb 2026 15:22:51 +0100 Subject: [PATCH 5/5] feat: add optional links to cards block --- .../components/cards/cards.bookshop.yml | 6 ++++++ component-library/components/cards/cards.hugo.html | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/component-library/components/cards/cards.bookshop.yml b/component-library/components/cards/cards.bookshop.yml index 3969667..eae2605 100644 --- a/component-library/components/cards/cards.bookshop.yml +++ b/component-library/components/cards/cards.bookshop.yml @@ -31,6 +31,12 @@ blueprint: mode: content: link: + links: + - + title: + url: + icon: + force: orientation: class: width: diff --git a/component-library/components/cards/cards.hugo.html b/component-library/components/cards/cards.hugo.html index 95258d4..9ad17c5 100644 --- a/component-library/components/cards/cards.hugo.html +++ b/component-library/components/cards/cards.hugo.html @@ -65,6 +65,18 @@ "wrapper" (printf "d-none d-%s-block" $breakpoint.prev) ))) -}} +{{ $links := "" }} +{{ if .links }} + {{ $links = partial "assets/links.html" (dict + "page" page + "links" .links + "align" "start" + "justify" "start" + "link-type" .link_type + ) }} + {{ $raw = printf "%s%s" $raw $links }} +{{ end }} + {{ if $raw }} {{ partial "utilities/section.html" (dict "component-name" "cards"