Skip to content

Commit 8ee8a0e

Browse files
markdumaymarkdumay
authored
Merge pull request #1663 from gethinode/templatev2
Templatev2
2 parents d9135a9 + ab6b8d3 commit 8ee8a0e

File tree

3 files changed

+67
-113
lines changed

3 files changed

+67
-113
lines changed

‎exampleSite/hugo_stats.json‎

Lines changed: 45 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,6 @@
249249
"fa-activity",
250250
"fa-address-card",
251251
"fa-angle-left",
252-
"fa-angle-right",
253-
"fa-angles-left",
254-
"fa-angles-right",
255252
"fa-arrow-left",
256253
"fa-arrow-right",
257254
"fa-bootstrap",
@@ -685,16 +682,11 @@
685682
"docs",
686683
"documentation",
687684
"dropdown-nav-0",
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",
685+
"dropdown-panel-09e1caf3d35900ec9e554aa013bc7718",
686+
"dropdown-panel-15c3eacc9c7e6b9ed20823131c62b844",
687+
"dropdown-panel-4aaac121a9ec08b2d56814d7241861db",
688+
"dropdown-panel-bc7366f7a5120882799aac079bcb7d1d",
689+
"dropdown-panel-e48c61c0da5661ffefb8a80d38558427",
698690
"eerste-artikel",
699691
"elements-type",
700692
"entity-relationship-diagram",
@@ -715,24 +707,16 @@
715707
"fab-whatsapp",
716708
"fab-x-twitter",
717709
"faq",
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",
710+
"faq-42f85408b9240c6e1283f918ad1cc293",
711+
"faq-42f85408b9240c6e1283f918ad1cc293-heading-faq-42f85408b9240c6e1283f918ad1cc293",
712+
"faq-42f85408b9240c6e1283f918ad1cc293-item-0",
713+
"faq-42f85408b9240c6e1283f918ad1cc293-item-1",
714+
"faq-42f85408b9240c6e1283f918ad1cc293-item-2",
728715
"fas-1",
729716
"fas-2",
730717
"fas-3",
731718
"fas-address-card",
732719
"fas-angle-left",
733-
"fas-angle-right",
734-
"fas-angles-left",
735-
"fas-angles-right",
736720
"fas-arrow-left",
737721
"fas-arrow-right",
738722
"fas-chevron-right",
@@ -826,16 +810,11 @@
826810
"nav-0-btn-1",
827811
"nav-0-btn-2",
828812
"nav-nav-0",
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",
813+
"nav-panel-09e1caf3d35900ec9e554aa013bc7718",
814+
"nav-panel-15c3eacc9c7e6b9ed20823131c62b844",
815+
"nav-panel-4aaac121a9ec08b2d56814d7241861db",
816+
"nav-panel-bc7366f7a5120882799aac079bcb7d1d",
817+
"nav-panel-e48c61c0da5661ffefb8a80d38558427",
839818
"navbar",
840819
"navbar-0-collapse",
841820
"navbar-mode",
@@ -845,66 +824,36 @@
845824
"notification",
846825
"over-mij",
847826
"overview",
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",
827+
"panel-09e1caf3d35900ec9e554aa013bc7718-0",
828+
"panel-09e1caf3d35900ec9e554aa013bc7718-1",
829+
"panel-09e1caf3d35900ec9e554aa013bc7718-2",
830+
"panel-09e1caf3d35900ec9e554aa013bc7718-btn-0",
831+
"panel-09e1caf3d35900ec9e554aa013bc7718-btn-1",
832+
"panel-09e1caf3d35900ec9e554aa013bc7718-btn-2",
833+
"panel-15c3eacc9c7e6b9ed20823131c62b844-0",
834+
"panel-15c3eacc9c7e6b9ed20823131c62b844-1",
835+
"panel-15c3eacc9c7e6b9ed20823131c62b844-2",
836+
"panel-15c3eacc9c7e6b9ed20823131c62b844-btn-0",
837+
"panel-15c3eacc9c7e6b9ed20823131c62b844-btn-1",
838+
"panel-15c3eacc9c7e6b9ed20823131c62b844-btn-2",
839+
"panel-4aaac121a9ec08b2d56814d7241861db-0",
840+
"panel-4aaac121a9ec08b2d56814d7241861db-1",
841+
"panel-4aaac121a9ec08b2d56814d7241861db-2",
842+
"panel-4aaac121a9ec08b2d56814d7241861db-btn-0",
843+
"panel-4aaac121a9ec08b2d56814d7241861db-btn-1",
844+
"panel-4aaac121a9ec08b2d56814d7241861db-btn-2",
845+
"panel-bc7366f7a5120882799aac079bcb7d1d-0",
846+
"panel-bc7366f7a5120882799aac079bcb7d1d-1",
847+
"panel-bc7366f7a5120882799aac079bcb7d1d-2",
848+
"panel-bc7366f7a5120882799aac079bcb7d1d-btn-0",
849+
"panel-bc7366f7a5120882799aac079bcb7d1d-btn-1",
850+
"panel-bc7366f7a5120882799aac079bcb7d1d-btn-2",
851+
"panel-e48c61c0da5661ffefb8a80d38558427-0",
852+
"panel-e48c61c0da5661ffefb8a80d38558427-1",
853+
"panel-e48c61c0da5661ffefb8a80d38558427-2",
854+
"panel-e48c61c0da5661ffefb8a80d38558427-btn-0",
855+
"panel-e48c61c0da5661ffefb8a80d38558427-btn-1",
856+
"panel-e48c61c0da5661ffefb8a80d38558427-btn-2",
908857
"panels",
909858
"persona",
910859
"pie-chart",

‎layouts/list.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{{ define "main" -}}
22
{{- $breakpoint := $.Scratch.Get "breakpoint" -}}
33
{{- $blocks := $.Scratch.Get "blocks" -}}
4+
{{- $content := partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) }}
45

56
{{ $blocks | safeHTML }}
67

7-
<div class="container-xxl flex-fill p-4 px-xxl-0">
8-
{{ .Render "body" }}
9-
</div>
8+
{{ with $content }}
9+
<div class="container-xxl flex-fill p-4 px-xxl-0">
10+
{{ . }}
11+
</div>
12+
{{ end }}
1013
{{ end -}}

‎layouts/single.html‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,23 @@ <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section
1717

1818
{{ $blocks | safeHTML }}
1919

20-
<div class="container-xxl flex-fill p-4 px-xxl-0">
21-
<div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2 row-cols-{{ $breakpoint.next }}-3">
22-
<div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top pt-5">
23-
{{ $sidebar | safeHTML }}
24-
</div>
25-
<div class="col-12 col-{{ $breakpoint.current }}-9 col-{{ $breakpoint.next }}-8 mb-5 py-4">
26-
{{ .Render "header" }}
20+
{{ if or (not $blocks) (gt (len .RawContent) 0) }}
21+
<div class="container-xxl flex-fill p-4 px-xxl-0">
22+
<div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2 row-cols-{{ $breakpoint.next }}-3">
23+
<div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top pt-5">
24+
{{ $sidebar | safeHTML }}
25+
</div>
26+
<div class="col-12 col-{{ $breakpoint.current }}-9 col-{{ $breakpoint.next }}-8 mb-5 py-4">
27+
{{ .Render "header" }}
2728

28-
{{ .Render "body" }}
29-
30-
{{ .Render "footer" }}
31-
</div>
32-
<div class="col col-{{ $breakpoint.current }}-3 col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.current }}-block pt-5">
33-
{{ .Render "toc" }}
29+
{{ .Render "body" }}
30+
31+
{{ .Render "footer" }}
32+
</div>
33+
<div class="col col-{{ $breakpoint.current }}-3 col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.current }}-block pt-5">
34+
{{ .Render "toc" }}
35+
</div>
3436
</div>
3537
</div>
36-
</div>
38+
{{ end }}
3739
{{ end -}}

0 commit comments

Comments
 (0)