Skip to content

Commit 353f5e2

Browse files
markdumaymarkdumay
authored
Merge pull request #1578 from gethinode/develop
Develop
2 parents 5f1edc0 + cd301e2 commit 353f5e2

File tree

7 files changed

+103
-66
lines changed

7 files changed

+103
-66
lines changed

‎data/structures/card.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ arguments:
7373
group: partial
7474
anchor:
7575
release: v0.24.23
76+
links:
77+
release: v1.14.0
7678
# deprecated arguments
7779
header:
7880
type: select

‎exampleSite/hugo_stats.json‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -656,11 +656,11 @@
656656
"docs",
657657
"documentation",
658658
"dropdown-nav-0",
659-
"dropdown-panel-4bb40e55576372d7d5033b3cb5988c2c",
660-
"dropdown-panel-6dfba858bf9eaea88ebc32de712ebf3f",
661-
"dropdown-panel-6fe204644b3fccca0d62ab3b712bf1cd",
662-
"dropdown-panel-b8350cafdd51c4d33847172721da9800",
663-
"dropdown-panel-e25d76a286385f8669a497412d250185",
659+
"dropdown-panel-0626353d67dd97b71dc37553482cd9d9",
660+
"dropdown-panel-9fe1f1ca588465dc433150e9776e7c55",
661+
"dropdown-panel-bc0ea07878926f7156a5c3a3f7a97fc0",
662+
"dropdown-panel-e96f22e4624ab2759fea46df2ded1460",
663+
"dropdown-panel-ee06c704eca15cd76c8e2fe77d29f364",
664664
"elements-type",
665665
"entity-relationship-diagram",
666666
"example",
@@ -678,11 +678,11 @@
678678
"fab-medium",
679679
"fab-whatsapp",
680680
"fab-x-twitter",
681-
"faq-aa1b2fa31cd6205cdeb0e1b972a20584",
682-
"faq-aa1b2fa31cd6205cdeb0e1b972a20584-heading-faq-aa1b2fa31cd6205cdeb0e1b972a20584",
683-
"faq-aa1b2fa31cd6205cdeb0e1b972a20584-item-0",
684-
"faq-aa1b2fa31cd6205cdeb0e1b972a20584-item-1",
685-
"faq-aa1b2fa31cd6205cdeb0e1b972a20584-item-2",
681+
"faq-1f62d0a5dfb896dda297f80fdd1c539c",
682+
"faq-1f62d0a5dfb896dda297f80fdd1c539c-heading-faq-1f62d0a5dfb896dda297f80fdd1c539c",
683+
"faq-1f62d0a5dfb896dda297f80fdd1c539c-item-0",
684+
"faq-1f62d0a5dfb896dda297f80fdd1c539c-item-1",
685+
"faq-1f62d0a5dfb896dda297f80fdd1c539c-item-2",
686686
"fas-1",
687687
"fas-2",
688688
"fas-3",
@@ -773,11 +773,11 @@
773773
"nav-0-btn-1",
774774
"nav-0-btn-2",
775775
"nav-nav-0",
776-
"nav-panel-4bb40e55576372d7d5033b3cb5988c2c",
777-
"nav-panel-6dfba858bf9eaea88ebc32de712ebf3f",
778-
"nav-panel-6fe204644b3fccca0d62ab3b712bf1cd",
779-
"nav-panel-b8350cafdd51c4d33847172721da9800",
780-
"nav-panel-e25d76a286385f8669a497412d250185",
776+
"nav-panel-0626353d67dd97b71dc37553482cd9d9",
777+
"nav-panel-9fe1f1ca588465dc433150e9776e7c55",
778+
"nav-panel-bc0ea07878926f7156a5c3a3f7a97fc0",
779+
"nav-panel-e96f22e4624ab2759fea46df2ded1460",
780+
"nav-panel-ee06c704eca15cd76c8e2fe77d29f364",
781781
"navbar",
782782
"navbar-0-collapse",
783783
"navbar-mode",
@@ -786,36 +786,36 @@
786786
"navigation",
787787
"notification",
788788
"overview",
789-
"panel-4bb40e55576372d7d5033b3cb5988c2c-0",
790-
"panel-4bb40e55576372d7d5033b3cb5988c2c-1",
791-
"panel-4bb40e55576372d7d5033b3cb5988c2c-2",
792-
"panel-4bb40e55576372d7d5033b3cb5988c2c-btn-0",
793-
"panel-4bb40e55576372d7d5033b3cb5988c2c-btn-1",
794-
"panel-4bb40e55576372d7d5033b3cb5988c2c-btn-2",
795-
"panel-6dfba858bf9eaea88ebc32de712ebf3f-0",
796-
"panel-6dfba858bf9eaea88ebc32de712ebf3f-1",
797-
"panel-6dfba858bf9eaea88ebc32de712ebf3f-2",
798-
"panel-6dfba858bf9eaea88ebc32de712ebf3f-btn-0",
799-
"panel-6dfba858bf9eaea88ebc32de712ebf3f-btn-1",
800-
"panel-6dfba858bf9eaea88ebc32de712ebf3f-btn-2",
801-
"panel-6fe204644b3fccca0d62ab3b712bf1cd-0",
802-
"panel-6fe204644b3fccca0d62ab3b712bf1cd-1",
803-
"panel-6fe204644b3fccca0d62ab3b712bf1cd-2",
804-
"panel-6fe204644b3fccca0d62ab3b712bf1cd-btn-0",
805-
"panel-6fe204644b3fccca0d62ab3b712bf1cd-btn-1",
806-
"panel-6fe204644b3fccca0d62ab3b712bf1cd-btn-2",
807-
"panel-b8350cafdd51c4d33847172721da9800-0",
808-
"panel-b8350cafdd51c4d33847172721da9800-1",
809-
"panel-b8350cafdd51c4d33847172721da9800-2",
810-
"panel-b8350cafdd51c4d33847172721da9800-btn-0",
811-
"panel-b8350cafdd51c4d33847172721da9800-btn-1",
812-
"panel-b8350cafdd51c4d33847172721da9800-btn-2",
813-
"panel-e25d76a286385f8669a497412d250185-0",
814-
"panel-e25d76a286385f8669a497412d250185-1",
815-
"panel-e25d76a286385f8669a497412d250185-2",
816-
"panel-e25d76a286385f8669a497412d250185-btn-0",
817-
"panel-e25d76a286385f8669a497412d250185-btn-1",
818-
"panel-e25d76a286385f8669a497412d250185-btn-2",
789+
"panel-0626353d67dd97b71dc37553482cd9d9-0",
790+
"panel-0626353d67dd97b71dc37553482cd9d9-1",
791+
"panel-0626353d67dd97b71dc37553482cd9d9-2",
792+
"panel-0626353d67dd97b71dc37553482cd9d9-btn-0",
793+
"panel-0626353d67dd97b71dc37553482cd9d9-btn-1",
794+
"panel-0626353d67dd97b71dc37553482cd9d9-btn-2",
795+
"panel-9fe1f1ca588465dc433150e9776e7c55-0",
796+
"panel-9fe1f1ca588465dc433150e9776e7c55-1",
797+
"panel-9fe1f1ca588465dc433150e9776e7c55-2",
798+
"panel-9fe1f1ca588465dc433150e9776e7c55-btn-0",
799+
"panel-9fe1f1ca588465dc433150e9776e7c55-btn-1",
800+
"panel-9fe1f1ca588465dc433150e9776e7c55-btn-2",
801+
"panel-bc0ea07878926f7156a5c3a3f7a97fc0-0",
802+
"panel-bc0ea07878926f7156a5c3a3f7a97fc0-1",
803+
"panel-bc0ea07878926f7156a5c3a3f7a97fc0-2",
804+
"panel-bc0ea07878926f7156a5c3a3f7a97fc0-btn-0",
805+
"panel-bc0ea07878926f7156a5c3a3f7a97fc0-btn-1",
806+
"panel-bc0ea07878926f7156a5c3a3f7a97fc0-btn-2",
807+
"panel-e96f22e4624ab2759fea46df2ded1460-0",
808+
"panel-e96f22e4624ab2759fea46df2ded1460-1",
809+
"panel-e96f22e4624ab2759fea46df2ded1460-2",
810+
"panel-e96f22e4624ab2759fea46df2ded1460-btn-0",
811+
"panel-e96f22e4624ab2759fea46df2ded1460-btn-1",
812+
"panel-e96f22e4624ab2759fea46df2ded1460-btn-2",
813+
"panel-ee06c704eca15cd76c8e2fe77d29f364-0",
814+
"panel-ee06c704eca15cd76c8e2fe77d29f364-1",
815+
"panel-ee06c704eca15cd76c8e2fe77d29f364-2",
816+
"panel-ee06c704eca15cd76c8e2fe77d29f364-btn-0",
817+
"panel-ee06c704eca15cd76c8e2fe77d29f364-btn-1",
818+
"panel-ee06c704eca15cd76c8e2fe77d29f364-btn-2",
819819
"persona",
820820
"pie-chart",
821821
"pills",

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/gethinode/mod-lottie v1.6.1 // indirect
1616
github.com/gethinode/mod-mermaid/v3 v3.0.1 // indirect
1717
github.com/gethinode/mod-simple-datatables/v2 v2.0.2 // indirect
18-
github.com/gethinode/mod-utils/v4 v4.15.1 // indirect
18+
github.com/gethinode/mod-utils/v4 v4.16.0 // indirect
1919
github.com/nextapps-de/flexsearch v0.0.0-20250907103239-defb38b083f0 // indirect
2020
github.com/twbs/bootstrap v5.3.8+incompatible // indirect
2121
)

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,8 @@ github.com/gethinode/mod-utils/v4 v4.15.0 h1:Zocy3qEVluYcx9te7bN6Serwp49kjhuH+eI
510510
github.com/gethinode/mod-utils/v4 v4.15.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
511511
github.com/gethinode/mod-utils/v4 v4.15.1 h1:zsn6pYxMePLqsNaX+V8qND5tAbbp/CiscgZrnFAxc2s=
512512
github.com/gethinode/mod-utils/v4 v4.15.1/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
513+
github.com/gethinode/mod-utils/v4 v4.16.0 h1:yroLCeQyE/xU46YIKS81ZtFsOONTmVudrv2qW7IBH5Q=
514+
github.com/gethinode/mod-utils/v4 v4.16.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
513515
github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3 h1:H/qVR5O4BXjRjD+5PZB+r4ug2BSJ2Of4RtwOntd+OKo=
514516
github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
515517
github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg=

‎layouts/_partials/assets/card.html‎

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,38 @@
66

77
{{ $error := false }}
88

9+
{{- define "_partials/inline/card-icons.html" -}}
10+
{{ $links := .links }}
11+
12+
<span class="text-body-secondary">
13+
{{- range $index, $item := $links -}}
14+
{{ partial "assets/button.html" (dict
15+
"href" $item.url
16+
"icon" (printf "%s fa-fw" $item.icon)
17+
"class" "btn-social p-0"
18+
"label" $item.title
19+
"spacing" false
20+
) }}
21+
{{- end -}}
22+
</span>
23+
{{- end -}}
24+
925
{{/* Inline partial to render the card's body */}}
1026
{{- define "_partials/inline/card-body.html" -}}
1127
{{- $title := .title -}}
1228
{{- $href := .href -}}
1329
{{- $color := .color -}}
1430
{{- $description := .description -}}
15-
{{- $button := .button -}}
31+
{{- $links := .links -}}
1632

1733
{{- if $href -}}
1834
<a href="{{ $href }}" class="{{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }} stretched-link">
19-
<p class="card-title fs-lg-5 fs-6">{{ $title }}</p>
35+
{{ if or $title $links }}
36+
<p class="card-title fs-lg-5 fs-6">
37+
{{- with $title }}{{ . }}{{ end }}
38+
{{ with $links }}{{ partial "inline/card-icons.html" (dict "links" .) }}{{ end -}}
39+
</p>
40+
{{ end -}}
2041
{{ with $description }}
2142
<div class="card-text {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">
2243
{{ . | safeHTML }}
@@ -25,7 +46,12 @@
2546
</a>
2647
{{- else -}}
2748
<div>
28-
{{ with $title }}<p class="card-title fs-lg-5 fs-6">{{ . }}</p>{{ end -}}
49+
{{ if or $title $links }}
50+
<p class="card-title fs-lg-5 fs-6">
51+
{{- with $title }}{{ . }}{{ end }}
52+
{{ with $links }}{{ partial "inline/card-icons.html" (dict "links" .) }}{{ end -}}
53+
</p>
54+
{{ end -}}
2955
{{ with $description }}<div class="card-text">{{ . | safeHTML }}</div>{{ end -}}
3056
</div>
3157
{{- end -}}
@@ -228,7 +254,7 @@
228254
"href" $href
229255
"color" $args.color
230256
"description" $description
231-
"button" $args.button
257+
"links" $args.links
232258
) -}}
233259
{{ if $page }}<div>{{ partial "inline/card-caption.html" (dict "page" $page "keywords" $args.footerStyle "color" $args.color) }}</div>{{ end }}
234260
{{ if and $href $args.button }}
@@ -275,7 +301,13 @@
275301
<div class="card-body p-0 d-flex flex-column{{ if $thumbnail }} p-{{ $args.padding }}{{ end }}{{ if $overlay }}card-img-overlay card-overlay-gradient p-4{{ end }}" {{ if $overlay }}data-bs-theme="dark"{{ end }}>
276302
{{ if $args.overlay }}<div class="flex-grow-1"></div>{{ end }}
277303
{{ if $page }}{{- partial "inline/card-caption.html" (dict "page" $page "keywords" $args.headerStyle "color" $args.color) -}}{{ end }}
278-
{{- partial "inline/card-body.html" (dict "title" $title "href" $href "color" $args.color "description" $description) -}}
304+
{{- partial "inline/card-body.html" (dict
305+
"title" $title
306+
"href" $href
307+
"color" $args.color
308+
"description" $description
309+
"links" $args.links
310+
) -}}
279311
{{ if $page }}{{- partial "inline/card-caption.html" (dict "page" $page "keywords" $args.footerStyle "color" $args.color) -}}{{ end }}
280312
</div>
281313
{{ if $args.button }}

‎layouts/_partials/assets/contact.html‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@
5050
{{ end }}
5151

5252
{{ partial "assets/hero.html" (dict
53-
"page" $args.page
54-
"heading" (merge $heading (dict "size" 6))
55-
"background" $args.background
56-
"illustration" $illustration
57-
"order" $args.order
58-
"link-type" $args.linkType
59-
"links" $args.links
60-
"orientation" $args.orientation
61-
"width" (or $args.width 12)
62-
"use-title" true
63-
"size" 6
53+
"page" $args.page
54+
"heading" (merge $heading (dict "size" 6))
55+
"background" $args.background
56+
"illustration" $illustration
57+
"order" $args.order
58+
"link-type" $args.linkType
59+
"links" $args.links
60+
"orientation" $args.orientation
61+
"width" (or $args.width 12)
62+
"use-title" true
63+
"size" 6
64+
"content-style" "text-muted fs-5"
6465
)
6566
}}
6667
{{ end }}

‎layouts/_partials/assets/section-title.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
{{- $padding := partial "utilities/GetPadding.html" -}}
2020

2121
{{/* Initialize local arguments */}}
22-
{{- $size := (or $args.heading.size site.Params.modules.bookshop.title.size) | default 4 -}}
23-
{{- $arrangement := (or $args.arrangement site.Params.modules.bookshop.title.arrangement) | default "above" -}}
24-
{{- $headingStyle := (or $args.headingStyle site.Params.modules.bookshop.title.headingStyle) | default "display" -}}
25-
{{- $contentStyle := (or $args.contentStyle site.Params.modules.bookshop.title.contentStyle) | default "lead text-muted" -}}
22+
{{- $size := (or $args.heading.size site.Params.style.title.size) | default 4 -}}
23+
{{- $arrangement := (or $args.arrangement site.Params.style.title.arrangement) | default "above" -}}
24+
{{- $headingStyle := (or $args.headingStyle site.Params.style.title.headingStyle) | default "display" -}}
25+
{{- $contentStyle := (or $args.contentStyle site.Params.style.title.contentStyle) | default "lead text-muted" -}}
2626
{{- $preheading := $args.heading.preheading }}
2727
{{- $title := $args.heading.title }}
2828
{{- $width := $args.heading.width | default 12 -}}

0 commit comments

Comments
 (0)