Skip to content

fix: improve overall padding and layout #1858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markdumay merged 4 commits into from
Apr 6, 2026
Merged

fix: improve overall padding and layout #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f9deee
fix: improve overall padding and layout
markdumay Apr 5, 2026
ebe24e0
Merge branch 'main' into develop
markdumay Apr 5, 2026
8a6ec7a
fix: adjust top padding on blocks embedded on docs pages
markdumay Apr 5, 2026
cfc00a2
fix: update dependencies
markdumay Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exampleSite/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.19
require (
github.com/FortAwesome/Font-Awesome v0.0.0-20260210181720-337dd2045d56 // indirect
github.com/cloudcannon/bookshop/hugo/v3 v3.18.2 // indirect
github.com/gethinode/mod-blocks v1.18.1 // indirect
github.com/gethinode/mod-blocks v1.19.1 // indirect
github.com/gethinode/mod-bootstrap-icons v1.4.1 // indirect
github.com/gethinode/mod-cookieyes/v2 v2.2.6 // indirect
github.com/gethinode/mod-docs v1.11.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exampleSite/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20260210181720-337dd2045d56 h1:wZEHFC
github.com/FortAwesome/Font-Awesome v0.0.0-20260210181720-337dd2045d56/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
github.com/cloudcannon/bookshop/hugo/v3 v3.18.2 h1:j3XUvvuCv/7SfGKzd7gzb3WEgs1DurqTRDe7gdMAAvU=
github.com/cloudcannon/bookshop/hugo/v3 v3.18.2/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
github.com/gethinode/mod-blocks v1.18.1 h1:FjMDAqgiNyZcRQYkHeQjzN7tyDEwxNrq4SCyHKxVYMs=
github.com/gethinode/mod-blocks v1.18.1/go.mod h1:sAMe4iLdX14DQQ8cl0GN6k1TTjZzpRnKQ9OafgN9rAw=
github.com/gethinode/mod-blocks v1.19.1 h1:rBr+GRFJCvm9k7tm+q26X6r3uX25wTeH7X4U9y0qtJg=
github.com/gethinode/mod-blocks v1.19.1/go.mod h1:sAMe4iLdX14DQQ8cl0GN6k1TTjZzpRnKQ9OafgN9rAw=
github.com/gethinode/mod-bootstrap-icons v1.4.1 h1:XgP3VU8YiH3FLbF35yltddZKoD6gMC53PYEq3GJ9U4M=
github.com/gethinode/mod-bootstrap-icons v1.4.1/go.mod h1:Zerq06ruLGV3V2IcvG1UDaJzCrNN4KcfgJAM3LXgXm0=
github.com/gethinode/mod-cookieyes/v2 v2.2.6 h1:/DQm8OYpms0On8wuosQER47TplVu/3z7MZHwbBKXCAg=
Expand Down
160 changes: 80 additions & 80 deletions exampleSite/hugo_stats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,10 +998,10 @@
"docs",
"dropdown-callout-1",
"dropdown-nav-0",
"dropdown-panel-2b1b4f360c8f8e734bc2855145885663",
"dropdown-panel-3f56152912d745e119052c0258044b22",
"dropdown-panel-cbcea5acc67a7532649c8139f7a626d0",
"dropdown-panel-efd4a1ff966b96864dca703cb84a026b",
"dropdown-panel-148737acec1435b545468e8dd90bedfb",
"dropdown-panel-6954a3a71953ed422bc29c584f4b02a9",
"dropdown-panel-81bd783a685471dbd0aecda05c758920",
"dropdown-panel-98f83a4d0a6a7ac28af0d75d281f9c36",
"dropdown-pills-1",
"dropdown-tabs-1",
"dropdown-underline-1",
Expand All @@ -1025,11 +1025,11 @@
"fab-whatsapp",
"fab-x-twitter",
"faq",
"faq-f633e5459b21f0df0493c50eeecb6181",
"faq-f633e5459b21f0df0493c50eeecb6181-heading-faq-f633e5459b21f0df0493c50eeecb6181",
"faq-f633e5459b21f0df0493c50eeecb6181-item-0",
"faq-f633e5459b21f0df0493c50eeecb6181-item-1",
"faq-f633e5459b21f0df0493c50eeecb6181-item-2",
"faq-aa060f21f2b52385956cc83fa604f383",
"faq-aa060f21f2b52385956cc83fa604f383-heading-faq-aa060f21f2b52385956cc83fa604f383",
"faq-aa060f21f2b52385956cc83fa604f383-item-0",
"faq-aa060f21f2b52385956cc83fa604f383-item-1",
"faq-aa060f21f2b52385956cc83fa604f383-item-2",
"far-square",
"fas-1",
"fas-2",
Expand Down Expand Up @@ -1185,10 +1185,10 @@
"nav-0-btn-2",
"nav-callout-1",
"nav-nav-0",
"nav-panel-2b1b4f360c8f8e734bc2855145885663",
"nav-panel-3f56152912d745e119052c0258044b22",
"nav-panel-cbcea5acc67a7532649c8139f7a626d0",
"nav-panel-efd4a1ff966b96864dca703cb84a026b",
"nav-panel-148737acec1435b545468e8dd90bedfb",
"nav-panel-6954a3a71953ed422bc29c584f4b02a9",
"nav-panel-81bd783a685471dbd0aecda05c758920",
"nav-panel-98f83a4d0a6a7ac28af0d75d281f9c36",
"nav-pills-1",
"nav-tabs-1",
"nav-underline-1",
Expand Down Expand Up @@ -1225,30 +1225,30 @@
"over-mij",
"overview",
"page-link",
"panel-2b1b4f360c8f8e734bc2855145885663-0",
"panel-2b1b4f360c8f8e734bc2855145885663-1",
"panel-2b1b4f360c8f8e734bc2855145885663-2",
"panel-2b1b4f360c8f8e734bc2855145885663-btn-0",
"panel-2b1b4f360c8f8e734bc2855145885663-btn-1",
"panel-2b1b4f360c8f8e734bc2855145885663-btn-2",
"panel-3f56152912d745e119052c0258044b22-0",
"panel-3f56152912d745e119052c0258044b22-1",
"panel-3f56152912d745e119052c0258044b22-2",
"panel-3f56152912d745e119052c0258044b22-btn-0",
"panel-3f56152912d745e119052c0258044b22-btn-1",
"panel-3f56152912d745e119052c0258044b22-btn-2",
"panel-cbcea5acc67a7532649c8139f7a626d0-0",
"panel-cbcea5acc67a7532649c8139f7a626d0-1",
"panel-cbcea5acc67a7532649c8139f7a626d0-2",
"panel-cbcea5acc67a7532649c8139f7a626d0-btn-0",
"panel-cbcea5acc67a7532649c8139f7a626d0-btn-1",
"panel-cbcea5acc67a7532649c8139f7a626d0-btn-2",
"panel-efd4a1ff966b96864dca703cb84a026b-0",
"panel-efd4a1ff966b96864dca703cb84a026b-1",
"panel-efd4a1ff966b96864dca703cb84a026b-2",
"panel-efd4a1ff966b96864dca703cb84a026b-btn-0",
"panel-efd4a1ff966b96864dca703cb84a026b-btn-1",
"panel-efd4a1ff966b96864dca703cb84a026b-btn-2",
"panel-148737acec1435b545468e8dd90bedfb-0",
"panel-148737acec1435b545468e8dd90bedfb-1",
"panel-148737acec1435b545468e8dd90bedfb-2",
"panel-148737acec1435b545468e8dd90bedfb-btn-0",
"panel-148737acec1435b545468e8dd90bedfb-btn-1",
"panel-148737acec1435b545468e8dd90bedfb-btn-2",
"panel-6954a3a71953ed422bc29c584f4b02a9-0",
"panel-6954a3a71953ed422bc29c584f4b02a9-1",
"panel-6954a3a71953ed422bc29c584f4b02a9-2",
"panel-6954a3a71953ed422bc29c584f4b02a9-btn-0",
"panel-6954a3a71953ed422bc29c584f4b02a9-btn-1",
"panel-6954a3a71953ed422bc29c584f4b02a9-btn-2",
"panel-81bd783a685471dbd0aecda05c758920-0",
"panel-81bd783a685471dbd0aecda05c758920-1",
"panel-81bd783a685471dbd0aecda05c758920-2",
"panel-81bd783a685471dbd0aecda05c758920-btn-0",
"panel-81bd783a685471dbd0aecda05c758920-btn-1",
"panel-81bd783a685471dbd0aecda05c758920-btn-2",
"panel-98f83a4d0a6a7ac28af0d75d281f9c36-0",
"panel-98f83a4d0a6a7ac28af0d75d281f9c36-1",
"panel-98f83a4d0a6a7ac28af0d75d281f9c36-2",
"panel-98f83a4d0a6a7ac28af0d75d281f9c36-btn-0",
"panel-98f83a4d0a6a7ac28af0d75d281f9c36-btn-1",
"panel-98f83a4d0a6a7ac28af0d75d281f9c36-btn-2",
"panels",
"persona",
"pie-chart",
Expand All @@ -1266,50 +1266,50 @@
"powershell",
"premier-article",
"preview",
"preview-0d769bdc778af3070f29603625c58d61-desktop",
"preview-0d769bdc778af3070f29603625c58d61-desktop-tab",
"preview-0d769bdc778af3070f29603625c58d61-mobile",
"preview-0d769bdc778af3070f29603625c58d61-mobile-tab",
"preview-0d769bdc778af3070f29603625c58d61-tablet",
"preview-0d769bdc778af3070f29603625c58d61-tablet-tab",
"preview-1",
"preview-2",
"preview-693fe51c664328a7916e28f2db27855d-desktop",
"preview-693fe51c664328a7916e28f2db27855d-mobile",
"preview-693fe51c664328a7916e28f2db27855d-tablet",
"preview-6c18393748139552a3bf7ac07a0f8e77-desktop",
"preview-6c18393748139552a3bf7ac07a0f8e77-desktop-tab",
"preview-6c18393748139552a3bf7ac07a0f8e77-mobile",
"preview-6c18393748139552a3bf7ac07a0f8e77-mobile-tab",
"preview-6c18393748139552a3bf7ac07a0f8e77-tablet",
"preview-6c18393748139552a3bf7ac07a0f8e77-tablet-tab",
"preview-8a61ce43963da4727eb00ba95203a8a4-desktop",
"preview-8a61ce43963da4727eb00ba95203a8a4-desktop-tab",
"preview-8a61ce43963da4727eb00ba95203a8a4-mobile",
"preview-8a61ce43963da4727eb00ba95203a8a4-mobile-tab",
"preview-8a61ce43963da4727eb00ba95203a8a4-tablet",
"preview-8a61ce43963da4727eb00ba95203a8a4-tablet-tab",
"preview-94e9a6a5e9ec21196624da64f64b36fb-desktop",
"preview-94e9a6a5e9ec21196624da64f64b36fb-mobile",
"preview-94e9a6a5e9ec21196624da64f64b36fb-tablet",
"preview-9f1bdf6890b6800fa5dc4d7e4c47ac9c-desktop",
"preview-9f1bdf6890b6800fa5dc4d7e4c47ac9c-desktop-tab",
"preview-9f1bdf6890b6800fa5dc4d7e4c47ac9c-mobile",
"preview-9f1bdf6890b6800fa5dc4d7e4c47ac9c-mobile-tab",
"preview-9f1bdf6890b6800fa5dc4d7e4c47ac9c-tablet",
"preview-9f1bdf6890b6800fa5dc4d7e4c47ac9c-tablet-tab",
"preview-b8d0c22bf6ad242a06f409087f27228a-desktop",
"preview-b8d0c22bf6ad242a06f409087f27228a-desktop-tab",
"preview-b8d0c22bf6ad242a06f409087f27228a-mobile",
"preview-b8d0c22bf6ad242a06f409087f27228a-mobile-tab",
"preview-b8d0c22bf6ad242a06f409087f27228a-tablet",
"preview-b8d0c22bf6ad242a06f409087f27228a-tablet-tab",
"preview-c66498e515983593b7e78b765f49e650-desktop",
"preview-c66498e515983593b7e78b765f49e650-desktop-tab",
"preview-c66498e515983593b7e78b765f49e650-mobile",
"preview-c66498e515983593b7e78b765f49e650-mobile-tab",
"preview-c66498e515983593b7e78b765f49e650-tablet",
"preview-c66498e515983593b7e78b765f49e650-tablet-tab",
"preview-35ddc1828bc9f1f925d28e1ecbae5823-desktop",
"preview-35ddc1828bc9f1f925d28e1ecbae5823-desktop-tab",
"preview-35ddc1828bc9f1f925d28e1ecbae5823-mobile",
"preview-35ddc1828bc9f1f925d28e1ecbae5823-mobile-tab",
"preview-35ddc1828bc9f1f925d28e1ecbae5823-tablet",
"preview-35ddc1828bc9f1f925d28e1ecbae5823-tablet-tab",
"preview-5380a6a7baa1d8d8d0534716092f6ade-desktop",
"preview-5380a6a7baa1d8d8d0534716092f6ade-desktop-tab",
"preview-5380a6a7baa1d8d8d0534716092f6ade-mobile",
"preview-5380a6a7baa1d8d8d0534716092f6ade-mobile-tab",
"preview-5380a6a7baa1d8d8d0534716092f6ade-tablet",
"preview-5380a6a7baa1d8d8d0534716092f6ade-tablet-tab",
"preview-62f4f4c6d446b9a84449f6577c6fe66e-desktop",
"preview-62f4f4c6d446b9a84449f6577c6fe66e-mobile",
"preview-62f4f4c6d446b9a84449f6577c6fe66e-tablet",
"preview-85aee138571b9a812a9b3f33f624fe10-desktop",
"preview-85aee138571b9a812a9b3f33f624fe10-mobile",
"preview-85aee138571b9a812a9b3f33f624fe10-tablet",
"preview-9da06958306472f31db712f4ff1386aa-desktop",
"preview-9da06958306472f31db712f4ff1386aa-desktop-tab",
"preview-9da06958306472f31db712f4ff1386aa-mobile",
"preview-9da06958306472f31db712f4ff1386aa-mobile-tab",
"preview-9da06958306472f31db712f4ff1386aa-tablet",
"preview-9da06958306472f31db712f4ff1386aa-tablet-tab",
"preview-baf5e0bd8db2f18bda536894665690a2-desktop",
"preview-baf5e0bd8db2f18bda536894665690a2-desktop-tab",
"preview-baf5e0bd8db2f18bda536894665690a2-mobile",
"preview-baf5e0bd8db2f18bda536894665690a2-mobile-tab",
"preview-baf5e0bd8db2f18bda536894665690a2-tablet",
"preview-baf5e0bd8db2f18bda536894665690a2-tablet-tab",
"preview-d9f3846bc4b6a9ed1d1fc593c633e459-desktop",
"preview-d9f3846bc4b6a9ed1d1fc593c633e459-desktop-tab",
"preview-d9f3846bc4b6a9ed1d1fc593c633e459-mobile",
"preview-d9f3846bc4b6a9ed1d1fc593c633e459-mobile-tab",
"preview-d9f3846bc4b6a9ed1d1fc593c633e459-tablet",
"preview-d9f3846bc4b6a9ed1d1fc593c633e459-tablet-tab",
"preview-f19d892195d20fdb102b2f55aaf6f2a3-desktop",
"preview-f19d892195d20fdb102b2f55aaf6f2a3-desktop-tab",
"preview-f19d892195d20fdb102b2f55aaf6f2a3-mobile",
"preview-f19d892195d20fdb102b2f55aaf6f2a3-mobile-tab",
"preview-f19d892195d20fdb102b2f55aaf6f2a3-tablet",
"preview-f19d892195d20fdb102b2f55aaf6f2a3-tablet-tab",
"preview-unavailable",
"preview-unavailable-alert-only",
"preview-with-specific-device",
Expand Down Expand Up @@ -1375,7 +1375,7 @@
"tabs-1-btn-2",
"team",
"testimonial",
"testimonial-carousel-1f4ebf75ce47e780f1e841b6f2006c4d",
"testimonial-carousel-23e28bfd6db634577c6414bbf926b014",
"testimonial-with-avatar",
"testimonial-with-case-study",
"testimonial-with-icon",
Expand Down
26 changes: 12 additions & 14 deletions layouts/_partials/page/articles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@
{{- $padding := partial "utilities/GetPadding.html" -}}

{{/* Render basic header for list page */}}
<div class="container-xxl px-{{ $padding.x }} px-xxl-0">
{{ if .Site.Params.navigation.breadcrumb }}
{{ partial "assets/breadcrumb.html" (dict "page" .) }}
{{ end }}
{{ partial "assets/section-title.html" (dict
"heading" (dict
"title" .Title
"content" .Description
"align" "start"
)
"use-title" true
) }}
</div>
{{ if .Site.Params.navigation.breadcrumb }}
{{ partial "assets/breadcrumb.html" (dict "page" .) }}
{{ end }}
{{ partial "assets/section-title.html" (dict
"heading" (dict
"title" .Title
"content" .Description
"align" "start"
)
"use-title" true
) }}

{{/* Init the card styling */}}
{{ $articlesParams := $.Scratch.Get "articlesParams" }}
Expand All @@ -41,7 +39,7 @@
{{ $result := partial "assets/live-pages.html" (dict "page" . "sort" $sort "reverse" $reverse) }}
{{ $pages := $result.pages }}
{{ if gt (len $pages) 0 }}
<div class="container-xxl py-{{ $padding.y }} px-{{ $padding.x }} px-xxl-0">
<div class="container-fluid p-0 width-100">
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4">
{{ if site.Params.env_bookshop_live }}
{{ range $pages }}
Expand Down
3 changes: 2 additions & 1 deletion layouts/docs/all.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
{{/* Render the page content using responsive columns */}}
<div class="container-xxl flex-fill py-{{ $padding.y }} px-{{ $padding.x }} px-xxl-0">
<div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2 row-cols-{{ $breakpoint.next }}-3">
<div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top">
<div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top p-0">
{{ $sidebar | safeHTML }}
</div>
<div class="col-12 col-{{ $breakpoint.current }}-9 col-{{ $breakpoint.next }}-8 mb-5">
{{/* Render the defined content blocks, using the default articles element as fallback for list pages */}}
{{ if .Params.content_blocks }}
{{- $.Scratch.Set "blocks_embed" true -}}
{{- partial "page/blocks.html" . -}}
{{ else if eq .Kind "section" }}
{{ $.Scratch.Set "articlesParams" (dict
Expand Down
6 changes: 5 additions & 1 deletion layouts/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
{{ if .Params.content_blocks }}
{{- partial "page/blocks.html" . -}}
{{ else }}
{{ partial "page/articles.html" . }}
{{ with partial "page/articles.html" . }}
<div class="container-xxl py-{{ $padding.y }} px-xxl-0 px-{{ $padding.x }} py-0 my-auto h-100">
{{ . | safeHTML }}
</div>
{{ end }}
{{ end }}

<!-- Render the list page content as full width, if any -->
Expand Down
2 changes: 1 addition & 1 deletion layouts/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{ if (gt (len .RawContent) 0) }}
<div class="container-xxl flex-fill py-{{ $padding.y }} px-{{ $padding.x }} px-xxl-0">
<div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2 row-cols-{{ $breakpoint.next }}-3">
<div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top">
<div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top p-0">
{{ $sidebar | safeHTML }}
</div>
<div class="col-12 col-{{ $breakpoint.current }}-9 col-{{ $breakpoint.next }}-8 mb-5">
Expand Down
Loading