Skip to content

Commit d9135a9

Browse files
markdumaymarkdumay
authored
Merge pull request #1662 from gethinode/templatev2
Templatev2
2 parents 89022c4 + 714c00e commit d9135a9

File tree

10 files changed

+140
-90
lines changed

10 files changed

+140
-90
lines changed

‎component-library/components/about/about.hugo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{{ if not $args.error }}
2121
{{ partial "assets/hero.html" (dict
2222
"page" page
23-
"heading" $args.heading
23+
"heading" (merge (dict "width" 8) $args.heading)
2424
"background" $args.background
2525
"illustration" (merge (dict "ratio" "auto") $args.illustration)
2626
"order" $args.order

‎config/_default/params.toml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,11 @@
205205
# toml-docs-start build
206206
purge = false
207207
# toml-docs-end build
208+
[style.title]
209+
size = 4
210+
arrangement = "above"
211+
headingStyle = "display"
212+
bodyStyle = "lead text-muted"
208213

209214
[schema]
210215
type = "Organization"
@@ -283,11 +288,5 @@
283288
default = ["section"]
284289
# default = ["page", "home", "section"]
285290

286-
[modules.bookshop.title]
287-
size = 4
288-
arrangement = "above"
289-
headingStyle = "display"
290-
bodyStyle = "lead text-muted"
291-
292291
[modules.bookshop.articles]
293292
moreButton = true

‎exampleSite/content/en/blocks/about.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ The `about` content block renders a short message next to an illustration. You c
1919
title: Heading
2020
content: Content
2121
align: start
22-
width: 8
2322
background:
2423
color: primary
2524
subtle: true

‎exampleSite/hugo_stats.json‎

Lines changed: 90 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -685,11 +685,16 @@
685685
"docs",
686686
"documentation",
687687
"dropdown-nav-0",
688-
"dropdown-panel-35433019c432bbd32deaa2117993acf1",
689-
"dropdown-panel-604f628371bf08ef6b54f15c23bcf40d",
690-
"dropdown-panel-7fe113913cbeef0a8b5f772bb57c992a",
691-
"dropdown-panel-c6b6ee2160f7cd41c2c0c627d21de4d1",
692-
"dropdown-panel-d01a8ea40d9d840cd76b07d9d4f9a2b6",
688+
"dropdown-panel-0ed6095d60e79f0b9cd8b25a127c44e3",
689+
"dropdown-panel-1f2146d1391ffdf562c7615c5c4882e3",
690+
"dropdown-panel-388afb5ef96c6c252bc61848857ca76f",
691+
"dropdown-panel-89eb5a6e564c8a41467ec3f7d344501e",
692+
"dropdown-panel-abe133297fa2726baa0de8d80f05f651",
693+
"dropdown-panel-c4cf2a939817300eed80ef852b22cceb",
694+
"dropdown-panel-d2114cbbee4d2fab130b9f6fd1b2a0f8",
695+
"dropdown-panel-ee605323e126479ed190f9db7d4901d6",
696+
"dropdown-panel-f0ef9da18dd14a0ab321b0275999641b",
697+
"dropdown-panel-f1180359be7908472eb7879b7d153c66",
693698
"eerste-artikel",
694699
"elements-type",
695700
"entity-relationship-diagram",
@@ -710,11 +715,16 @@
710715
"fab-whatsapp",
711716
"fab-x-twitter",
712717
"faq",
713-
"faq-d0a9da40b180a692dcc3edfc0251c4f2",
714-
"faq-d0a9da40b180a692dcc3edfc0251c4f2-heading-faq-d0a9da40b180a692dcc3edfc0251c4f2",
715-
"faq-d0a9da40b180a692dcc3edfc0251c4f2-item-0",
716-
"faq-d0a9da40b180a692dcc3edfc0251c4f2-item-1",
717-
"faq-d0a9da40b180a692dcc3edfc0251c4f2-item-2",
718+
"faq-1e1205e0c74898602b928d7f0a9106fe",
719+
"faq-1e1205e0c74898602b928d7f0a9106fe-heading-faq-1e1205e0c74898602b928d7f0a9106fe",
720+
"faq-1e1205e0c74898602b928d7f0a9106fe-item-0",
721+
"faq-1e1205e0c74898602b928d7f0a9106fe-item-1",
722+
"faq-1e1205e0c74898602b928d7f0a9106fe-item-2",
723+
"faq-bce1f1fe2d733ec3de431c6bb8df2033",
724+
"faq-bce1f1fe2d733ec3de431c6bb8df2033-heading-faq-bce1f1fe2d733ec3de431c6bb8df2033",
725+
"faq-bce1f1fe2d733ec3de431c6bb8df2033-item-0",
726+
"faq-bce1f1fe2d733ec3de431c6bb8df2033-item-1",
727+
"faq-bce1f1fe2d733ec3de431c6bb8df2033-item-2",
718728
"fas-1",
719729
"fas-2",
720730
"fas-3",
@@ -816,11 +826,16 @@
816826
"nav-0-btn-1",
817827
"nav-0-btn-2",
818828
"nav-nav-0",
819-
"nav-panel-35433019c432bbd32deaa2117993acf1",
820-
"nav-panel-604f628371bf08ef6b54f15c23bcf40d",
821-
"nav-panel-7fe113913cbeef0a8b5f772bb57c992a",
822-
"nav-panel-c6b6ee2160f7cd41c2c0c627d21de4d1",
823-
"nav-panel-d01a8ea40d9d840cd76b07d9d4f9a2b6",
829+
"nav-panel-0ed6095d60e79f0b9cd8b25a127c44e3",
830+
"nav-panel-1f2146d1391ffdf562c7615c5c4882e3",
831+
"nav-panel-388afb5ef96c6c252bc61848857ca76f",
832+
"nav-panel-89eb5a6e564c8a41467ec3f7d344501e",
833+
"nav-panel-abe133297fa2726baa0de8d80f05f651",
834+
"nav-panel-c4cf2a939817300eed80ef852b22cceb",
835+
"nav-panel-d2114cbbee4d2fab130b9f6fd1b2a0f8",
836+
"nav-panel-ee605323e126479ed190f9db7d4901d6",
837+
"nav-panel-f0ef9da18dd14a0ab321b0275999641b",
838+
"nav-panel-f1180359be7908472eb7879b7d153c66",
824839
"navbar",
825840
"navbar-0-collapse",
826841
"navbar-mode",
@@ -830,36 +845,66 @@
830845
"notification",
831846
"over-mij",
832847
"overview",
833-
"panel-35433019c432bbd32deaa2117993acf1-0",
834-
"panel-35433019c432bbd32deaa2117993acf1-1",
835-
"panel-35433019c432bbd32deaa2117993acf1-2",
836-
"panel-35433019c432bbd32deaa2117993acf1-btn-0",
837-
"panel-35433019c432bbd32deaa2117993acf1-btn-1",
838-
"panel-35433019c432bbd32deaa2117993acf1-btn-2",
839-
"panel-604f628371bf08ef6b54f15c23bcf40d-0",
840-
"panel-604f628371bf08ef6b54f15c23bcf40d-1",
841-
"panel-604f628371bf08ef6b54f15c23bcf40d-2",
842-
"panel-604f628371bf08ef6b54f15c23bcf40d-btn-0",
843-
"panel-604f628371bf08ef6b54f15c23bcf40d-btn-1",
844-
"panel-604f628371bf08ef6b54f15c23bcf40d-btn-2",
845-
"panel-7fe113913cbeef0a8b5f772bb57c992a-0",
846-
"panel-7fe113913cbeef0a8b5f772bb57c992a-1",
847-
"panel-7fe113913cbeef0a8b5f772bb57c992a-2",
848-
"panel-7fe113913cbeef0a8b5f772bb57c992a-btn-0",
849-
"panel-7fe113913cbeef0a8b5f772bb57c992a-btn-1",
850-
"panel-7fe113913cbeef0a8b5f772bb57c992a-btn-2",
851-
"panel-c6b6ee2160f7cd41c2c0c627d21de4d1-0",
852-
"panel-c6b6ee2160f7cd41c2c0c627d21de4d1-1",
853-
"panel-c6b6ee2160f7cd41c2c0c627d21de4d1-2",
854-
"panel-c6b6ee2160f7cd41c2c0c627d21de4d1-btn-0",
855-
"panel-c6b6ee2160f7cd41c2c0c627d21de4d1-btn-1",
856-
"panel-c6b6ee2160f7cd41c2c0c627d21de4d1-btn-2",
857-
"panel-d01a8ea40d9d840cd76b07d9d4f9a2b6-0",
858-
"panel-d01a8ea40d9d840cd76b07d9d4f9a2b6-1",
859-
"panel-d01a8ea40d9d840cd76b07d9d4f9a2b6-2",
860-
"panel-d01a8ea40d9d840cd76b07d9d4f9a2b6-btn-0",
861-
"panel-d01a8ea40d9d840cd76b07d9d4f9a2b6-btn-1",
862-
"panel-d01a8ea40d9d840cd76b07d9d4f9a2b6-btn-2",
848+
"panel-0ed6095d60e79f0b9cd8b25a127c44e3-0",
849+
"panel-0ed6095d60e79f0b9cd8b25a127c44e3-1",
850+
"panel-0ed6095d60e79f0b9cd8b25a127c44e3-2",
851+
"panel-0ed6095d60e79f0b9cd8b25a127c44e3-btn-0",
852+
"panel-0ed6095d60e79f0b9cd8b25a127c44e3-btn-1",
853+
"panel-0ed6095d60e79f0b9cd8b25a127c44e3-btn-2",
854+
"panel-1f2146d1391ffdf562c7615c5c4882e3-0",
855+
"panel-1f2146d1391ffdf562c7615c5c4882e3-1",
856+
"panel-1f2146d1391ffdf562c7615c5c4882e3-2",
857+
"panel-1f2146d1391ffdf562c7615c5c4882e3-btn-0",
858+
"panel-1f2146d1391ffdf562c7615c5c4882e3-btn-1",
859+
"panel-1f2146d1391ffdf562c7615c5c4882e3-btn-2",
860+
"panel-388afb5ef96c6c252bc61848857ca76f-0",
861+
"panel-388afb5ef96c6c252bc61848857ca76f-1",
862+
"panel-388afb5ef96c6c252bc61848857ca76f-2",
863+
"panel-388afb5ef96c6c252bc61848857ca76f-btn-0",
864+
"panel-388afb5ef96c6c252bc61848857ca76f-btn-1",
865+
"panel-388afb5ef96c6c252bc61848857ca76f-btn-2",
866+
"panel-89eb5a6e564c8a41467ec3f7d344501e-0",
867+
"panel-89eb5a6e564c8a41467ec3f7d344501e-1",
868+
"panel-89eb5a6e564c8a41467ec3f7d344501e-2",
869+
"panel-89eb5a6e564c8a41467ec3f7d344501e-btn-0",
870+
"panel-89eb5a6e564c8a41467ec3f7d344501e-btn-1",
871+
"panel-89eb5a6e564c8a41467ec3f7d344501e-btn-2",
872+
"panel-abe133297fa2726baa0de8d80f05f651-0",
873+
"panel-abe133297fa2726baa0de8d80f05f651-1",
874+
"panel-abe133297fa2726baa0de8d80f05f651-2",
875+
"panel-abe133297fa2726baa0de8d80f05f651-btn-0",
876+
"panel-abe133297fa2726baa0de8d80f05f651-btn-1",
877+
"panel-abe133297fa2726baa0de8d80f05f651-btn-2",
878+
"panel-c4cf2a939817300eed80ef852b22cceb-0",
879+
"panel-c4cf2a939817300eed80ef852b22cceb-1",
880+
"panel-c4cf2a939817300eed80ef852b22cceb-2",
881+
"panel-c4cf2a939817300eed80ef852b22cceb-btn-0",
882+
"panel-c4cf2a939817300eed80ef852b22cceb-btn-1",
883+
"panel-c4cf2a939817300eed80ef852b22cceb-btn-2",
884+
"panel-d2114cbbee4d2fab130b9f6fd1b2a0f8-0",
885+
"panel-d2114cbbee4d2fab130b9f6fd1b2a0f8-1",
886+
"panel-d2114cbbee4d2fab130b9f6fd1b2a0f8-2",
887+
"panel-d2114cbbee4d2fab130b9f6fd1b2a0f8-btn-0",
888+
"panel-d2114cbbee4d2fab130b9f6fd1b2a0f8-btn-1",
889+
"panel-d2114cbbee4d2fab130b9f6fd1b2a0f8-btn-2",
890+
"panel-ee605323e126479ed190f9db7d4901d6-0",
891+
"panel-ee605323e126479ed190f9db7d4901d6-1",
892+
"panel-ee605323e126479ed190f9db7d4901d6-2",
893+
"panel-ee605323e126479ed190f9db7d4901d6-btn-0",
894+
"panel-ee605323e126479ed190f9db7d4901d6-btn-1",
895+
"panel-ee605323e126479ed190f9db7d4901d6-btn-2",
896+
"panel-f0ef9da18dd14a0ab321b0275999641b-0",
897+
"panel-f0ef9da18dd14a0ab321b0275999641b-1",
898+
"panel-f0ef9da18dd14a0ab321b0275999641b-2",
899+
"panel-f0ef9da18dd14a0ab321b0275999641b-btn-0",
900+
"panel-f0ef9da18dd14a0ab321b0275999641b-btn-1",
901+
"panel-f0ef9da18dd14a0ab321b0275999641b-btn-2",
902+
"panel-f1180359be7908472eb7879b7d153c66-0",
903+
"panel-f1180359be7908472eb7879b7d153c66-1",
904+
"panel-f1180359be7908472eb7879b7d153c66-2",
905+
"panel-f1180359be7908472eb7879b7d153c66-btn-0",
906+
"panel-f1180359be7908472eb7879b7d153c66-btn-1",
907+
"panel-f1180359be7908472eb7879b7d153c66-btn-2",
863908
"panels",
864909
"persona",
865910
"pie-chart",

‎layouts/_partials/assets/helpers/image-dimension.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
{{- if hasSuffix $src "svg" -}}
6868
{{- $res = partial "utilities/GetResource.html" (dict "url" $src "page" $args.page) -}}
6969
{{ if not $res }}
70-
{{- $targetURL := strings.TrimPrefix "/static" $src -}}
7170
{{- $u := urls.Parse site.BaseURL }}
72-
{{- $targetURL = strings.TrimPrefix $u.Path $src -}}
71+
{{- $targetURL := strings.TrimPrefix $u.Path $src -}}
72+
{{- $targetURL = strings.TrimPrefix "/static" $src -}}
7373
{{- if not (fileExists (path.Join "/static" $targetURL)) -}}
7474
{{ warnf "Cannot find vector image resource: %q" $src -}}
7575
{{ else }}

‎layouts/_partials/page/sidebar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- $menu := .Scratch.Get "sidebar" -}}
22
{{- $version := .Scratch.Get "version" -}}
3-
{{ if $menu }}
3+
{{ if $menu }}
44
{{ partial "assets/sidebar.html" (dict "page" . "menu" $menu "version" $version) }}
55
{{ end -}}

‎layouts/_partials/utilities/GetIncludeTOC.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{- $includeToc := false -}}
2+
{{- if .Site.Params.navigation.toc -}}
3+
{{- $includeToc = true -}}
4+
{{- if isset .Params "includeToc" -}}
5+
{{- $includeToc = .Params.includeToc -}}
6+
{{- else -}}
7+
{{- with (index site.Params.pages .Type) -}}
8+
{{- if isset . "includetoc" -}}
9+
{{- $includeToc = index . "includetoc" -}}
10+
{{- if ne (printf "%T" $includeToc) "bool" -}}
11+
{{- errorf "Expected bool value in site parameters: pages.%s.includeToc" $.Type -}}
12+
{{- end -}}
13+
{{- end -}}
14+
{{- end -}}
15+
{{- end -}}
16+
{{- end -}}
17+
18+
{{- return $includeToc -}}

‎layouts/baseof.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
{{- /* Define page sharing */ -}}
3030
{{- $.Scratch.Set "sharing" (partial "utilities/GetSharing.html" .) }}
3131

32+
{{- /* Define TOC inclusion */ -}}
33+
{{- $.Scratch.Set "includeToc" (partial "utilities/GetIncludeToc.html" .) }}
34+
3235
{{- /* Prepare content blocks and establish overlay mode */ -}}
3336
{{ $blocks := partial "utilities/RenderContentBlocks.html" (dict "page" . "blocks" .Params.content_blocks) }}
3437
{{ $.Scratch.Set "blocks" $blocks }}

‎layouts/single.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section
2222
<div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top pt-5">
2323
{{ $sidebar | safeHTML }}
2424
</div>
25-
<div class="col-12 col-{{ $breakpoint.current }}-9 col-{{ $breakpoint.next }}-8 mb-5 p-4">
25+
<div class="col-12 col-{{ $breakpoint.current }}-9 col-{{ $breakpoint.next }}-8 mb-5 py-4">
2626
{{ .Render "header" }}
2727

2828
{{ .Render "body" }}

‎layouts/toc.html‎

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,22 @@
11
{{- $download := .Params.download -}}
2+
{{- $includeToc := .Scratch.Get "includeToc" -}}
23

3-
{{- $includeToc := false -}}
4-
{{- if .Site.Params.navigation.toc -}}
5-
{{ $includeToc = true }}
6-
{{ if isset .Params "includeToc" }}
7-
{{ $includeToc = .Params.includeToc }}
8-
{{ else }}
9-
{{- with (index site.Params.pages .Type) -}}
10-
{{ if isset . "includetoc" }}
11-
{{ $includeToc = index . "includetoc" }}
12-
{{ if ne (printf "%T" $includeToc) "bool" }}
13-
{{ errorf "Expected bool value in site parameters: pages.%s.includeToc" $.Type }}
14-
{{ end }}
15-
{{ end }}
16-
{{- end -}}
17-
{{ end }}
18-
{{ end }}
19-
20-
<div class="toc toc-sidebar mb-5 my-md-0 mb-lg-5 p-3 text-body-secondary sticky-top">
21-
{{ if $download }}
22-
<div class="mb-5 p-0">
23-
{{ partial "assets/download.html" (dict
24-
"download" $download
25-
"outline" true
26-
"button-size" "sm"
27-
"order" "last"
28-
) }}
29-
</div>
30-
{{ end }}
4+
{{ if or $download $includeToc }}
5+
<div class="toc toc-sidebar mb-5 my-md-0 mb-lg-5 p-3 text-body-secondary sticky-top">
6+
{{ if $download }}
7+
<div class="mb-5 p-0">
8+
{{ partial "assets/download.html" (dict
9+
"download" $download
10+
"outline" true
11+
"button-size" "sm"
12+
"order" "last"
13+
) }}
14+
</div>
15+
{{ end }}
3116

32-
{{ if $includeToc }}
33-
{{ $index := partial "assets/toc.html" (dict "page" .) }}
34-
{{ $index | safeHTML }}
35-
{{ end -}}
36-
</div>
17+
{{ if $includeToc }}
18+
{{ $index := partial "assets/toc.html" (dict "page" .) }}
19+
{{ $index | safeHTML }}
20+
{{ end -}}
21+
</div>
22+
{{ end }}

0 commit comments

Comments
 (0)