Compare commits

..

5 Commits

Author SHA1 Message Date
Mark Dumay
a44b5449f8 Merge pull request #1472 from gethinode/develop
Fix handling of card parent arguments
2025-06-20 11:58:37 +02:00
Mark Dumay
461f53c67e Merge branch 'main' into develop 2025-06-20 11:52:23 +02:00
Mark Dumay
9a5059d8bd Fix handling of card parent arguments 2025-06-20 11:48:08 +02:00
Mark Dumay
c1586ee00e Bump package release 2025-06-20 11:01:50 +02:00
Mark Dumay
88d2a50954 Simplify page layout structure 2025-06-20 11:01:18 +02:00
10 changed files with 117 additions and 119 deletions

View File

@@ -97,12 +97,20 @@
"ball",
"bg-bg-body-tertiary",
"bg-bg-primary-subtle",
"bg-black",
"bg-body",
"bg-body-tertiary",
"bg-danger",
"bg-dark",
"bg-info",
"bg-light",
"bg-opacity-10",
"bg-primary",
"bg-primary-subtle",
"bg-secondary",
"bg-success",
"bg-warning",
"bg-white",
"bi",
"bi-activity",
"border",
@@ -119,27 +127,15 @@
"breadcrumb-item",
"btn",
"btn-close",
"btn-danger",
"btn-dark",
"btn-group",
"btn-info",
"btn-lg",
"btn-light",
"btn-link",
"btn-outline-danger",
"btn-outline-dark",
"btn-outline-info",
"btn-outline-light",
"btn-outline-primary",
"btn-outline-secondary",
"btn-outline-success",
"btn-outline-warning",
"btn-primary",
"btn-secondary",
"btn-sm",
"btn-social",
"btn-success",
"btn-warning",
"btn-xs",
"card",
"card-block-2",
@@ -147,6 +143,7 @@
"card-body-link",
"card-body-margin",
"card-button",
"card-button-link",
"card-container",
"card-container-wrapper",
"card-emphasize",
@@ -197,7 +194,6 @@
"col-sm-12",
"col-sm-3",
"col-sm-6",
"col-sm-8",
"collapse",
"collapsed",
"container",
@@ -219,7 +215,6 @@
"d-sm-block",
"d-sm-none",
"data-table",
"disabled",
"display-1",
"display-4",
"dropdown",
@@ -243,29 +238,24 @@
"fa-angle-left",
"fa-arrow-left",
"fa-arrow-right",
"fa-book-open",
"fa-bootstrap",
"fa-check",
"fa-chevron-right",
"fa-circle",
"fa-circle-check",
"fa-circle-play",
"fa-circle-question",
"fa-code",
"fa-display",
"fa-divide",
"fa-docker",
"fa-ellipsis",
"fa-face-frown",
"fa-facebook",
"fa-fluid",
"fa-font-awesome",
"fa-fw",
"fa-github",
"fa-globe",
"fa-grip",
"fa-h",
"fa-hand-pointer",
"fa-heart",
"fa-house",
"fa-info",
@@ -273,14 +263,11 @@
"fa-link",
"fa-linkedin",
"fa-magnifying-glass",
"fa-markdown",
"fa-medium",
"fa-moon",
"fa-robot",
"fa-rocket",
"fa-rotate-90",
"fa-share-nodes",
"fa-sitemap",
"fa-sort",
"fa-square-check",
"fa-stack",
@@ -288,7 +275,6 @@
"fa-stack-2x",
"fa-sun",
"fa-timeline",
"fa-trash-can",
"fa-up-right-from-square",
"fa-whatsapp",
"fa-wrapper",
@@ -345,20 +331,28 @@
"img-wrap",
"invisible",
"is-search",
"justify-content-around",
"justify-content-between",
"justify-content-center",
"justify-content-end",
"justify-content-evenly",
"justify-content-md-end",
"justify-content-md-start",
"justify-content-start",
"katex",
"label",
"lead",
"leaflet-map",
"link-bg-black",
"link-bg-body",
"link-bg-body-tertiary",
"link-bg-danger",
"link-bg-dark",
"link-bg-footer",
"link-bg-info",
"link-bg-light",
"link-bg-primary",
"link-bg-secondary",
"link-bg-success",
"link-bg-warning",
"link-bg-white",
"link-primary",
"link-secondary",
"link-success",
@@ -391,8 +385,7 @@
"mt-auto",
"mt-md-0",
"multi-docs-collapse-15",
"multi-docs-collapse-19",
"multi-docs-collapse-20",
"multi-docs-collapse-17",
"multi-file-collapse-1",
"multi-file-collapse-5",
"mx-auto",
@@ -421,13 +414,12 @@
"navbar-toggler",
"next",
"no-js",
"offset-md-4",
"offset-sm-2",
"order-0",
"order-1",
"order-first",
"order-md-0",
"order-md-1",
"p-",
"p-0",
"p-1",
"p-2",
@@ -481,6 +473,7 @@
"row-cols-lg-3",
"row-cols-md-2",
"row-cols-md-3",
"row-cols-md-4",
"row-cols-sm-2",
"row-cols-sm-3",
"scrollbar-horizontal",
@@ -510,12 +503,18 @@
"table-wrap",
"tag-link",
"text-",
"text-bg-black",
"text-bg-body",
"text-bg-body-tertiary",
"text-bg-danger",
"text-bg-dark",
"text-bg-info",
"text-bg-light",
"text-bg-primary",
"text-bg-secondary",
"text-bg-success",
"text-bg-warning",
"text-bg-white",
"text-body",
"text-body-secondary",
"text-break",
@@ -523,7 +522,6 @@
"text-decoration-none",
"text-end",
"text-info",
"text-md-end",
"text-muted",
"text-nowrap",
"text-primary",
@@ -601,19 +599,13 @@
"block-diagram",
"blog",
"body-docs-collapse-15",
"body-docs-collapse-19",
"body-docs-collapse-20",
"body-docs-collapse-17",
"body-file-collapse-1",
"body-file-collapse-5",
"bouton",
"breadcrumb",
"build-a-static-website-fast-and-flexible",
"button",
"button-group",
"buttons-with-a-badge",
"buttons-with-a-collapsible-panel",
"buttons-with-a-tooltip",
"buttons-with-an-icon",
"c4-diagram",
"card",
"card-group",
@@ -626,7 +618,7 @@
"cloudinary",
"collapse",
"collapse-1",
"colored-buttons",
"colored-cards",
"command-prompt",
"comment-nous-partageons-vos-informations",
"comment-utilisons-nous-les-cookies-",
@@ -635,78 +627,85 @@
"cookies-etc",
"custom-activity",
"data-tables",
"developer-friendly-and-secure",
"docs",
"documentation",
"elements-type",
"entity-relationship-diagram",
"example",
"examples",
"exemple",
"fa-address-card",
"fa-face-frown",
"fa-font-awesome",
"fa-hand-pointer",
"fa-square-check",
"fab-bootstrap",
"fab-docker",
"fab-facebook",
"fab-github",
"fab-linkedin",
"fab-markdown",
"fab-medium",
"fab-whatsapp",
"fab-x-twitter",
"faq-03262a038417e1bab3887f63db7d440f",
"faq-03262a038417e1bab3887f63db7d440f-heading-faq-03262a038417e1bab3887f63db7d440f",
"faq-03262a038417e1bab3887f63db7d440f-item-0",
"faq-03262a038417e1bab3887f63db7d440f-item-1",
"faq-03262a038417e1bab3887f63db7d440f-item-2",
"faq-516ddc5b7dd16bc24b857082a9aab4ed",
"faq-516ddc5b7dd16bc24b857082a9aab4ed-heading-faq-516ddc5b7dd16bc24b857082a9aab4ed",
"faq-516ddc5b7dd16bc24b857082a9aab4ed-item-0",
"faq-516ddc5b7dd16bc24b857082a9aab4ed-item-1",
"faq-516ddc5b7dd16bc24b857082a9aab4ed-item-2",
"faq-56ff67870957c4eb63627fad0245b8b7",
"faq-56ff67870957c4eb63627fad0245b8b7-heading-faq-56ff67870957c4eb63627fad0245b8b7",
"faq-56ff67870957c4eb63627fad0245b8b7-item-0",
"faq-56ff67870957c4eb63627fad0245b8b7-item-1",
"faq-56ff67870957c4eb63627fad0245b8b7-item-2",
"faq-a65942a4e80d8b9331232f2839b0b404",
"faq-a65942a4e80d8b9331232f2839b0b404-heading-faq-a65942a4e80d8b9331232f2839b0b404",
"faq-a65942a4e80d8b9331232f2839b0b404-item-0",
"faq-a65942a4e80d8b9331232f2839b0b404-item-1",
"faq-a65942a4e80d8b9331232f2839b0b404-item-2",
"faq-b7d43cad454395dd12765b2970e95cbc",
"faq-b7d43cad454395dd12765b2970e95cbc-heading-faq-b7d43cad454395dd12765b2970e95cbc",
"faq-b7d43cad454395dd12765b2970e95cbc-item-0",
"faq-b7d43cad454395dd12765b2970e95cbc-item-1",
"faq-b7d43cad454395dd12765b2970e95cbc-item-2",
"faq-c411b9f9b15c4b7a1a0d1de458f85fc9",
"faq-c411b9f9b15c4b7a1a0d1de458f85fc9-heading-faq-c411b9f9b15c4b7a1a0d1de458f85fc9",
"faq-c411b9f9b15c4b7a1a0d1de458f85fc9-item-0",
"faq-c411b9f9b15c4b7a1a0d1de458f85fc9-item-1",
"faq-c411b9f9b15c4b7a1a0d1de458f85fc9-item-2",
"faq-e6bc2b3599e2d94773085876d5822076",
"faq-e6bc2b3599e2d94773085876d5822076-heading-faq-e6bc2b3599e2d94773085876d5822076",
"faq-e6bc2b3599e2d94773085876d5822076-item-0",
"faq-e6bc2b3599e2d94773085876d5822076-item-1",
"faq-e6bc2b3599e2d94773085876d5822076-item-2",
"faq-053659d52c3204ebc73c1b387efbbb07",
"faq-053659d52c3204ebc73c1b387efbbb07-heading-faq-053659d52c3204ebc73c1b387efbbb07",
"faq-053659d52c3204ebc73c1b387efbbb07-item-0",
"faq-053659d52c3204ebc73c1b387efbbb07-item-1",
"faq-053659d52c3204ebc73c1b387efbbb07-item-2",
"faq-3b4f420cc7621af32c96109c12bca758",
"faq-3b4f420cc7621af32c96109c12bca758-heading-faq-3b4f420cc7621af32c96109c12bca758",
"faq-3b4f420cc7621af32c96109c12bca758-item-0",
"faq-3b4f420cc7621af32c96109c12bca758-item-1",
"faq-3b4f420cc7621af32c96109c12bca758-item-2",
"faq-4f19b6f4505f05eaa5bbf531aed406b8",
"faq-4f19b6f4505f05eaa5bbf531aed406b8-heading-faq-4f19b6f4505f05eaa5bbf531aed406b8",
"faq-4f19b6f4505f05eaa5bbf531aed406b8-item-0",
"faq-4f19b6f4505f05eaa5bbf531aed406b8-item-1",
"faq-4f19b6f4505f05eaa5bbf531aed406b8-item-2",
"faq-637b21f5a6c607752e51e0633243d2bf",
"faq-637b21f5a6c607752e51e0633243d2bf-heading-faq-637b21f5a6c607752e51e0633243d2bf",
"faq-637b21f5a6c607752e51e0633243d2bf-item-0",
"faq-637b21f5a6c607752e51e0633243d2bf-item-1",
"faq-637b21f5a6c607752e51e0633243d2bf-item-2",
"faq-9b51ee909251b9ba0de086282b0afc7a",
"faq-9b51ee909251b9ba0de086282b0afc7a-heading-faq-9b51ee909251b9ba0de086282b0afc7a",
"faq-9b51ee909251b9ba0de086282b0afc7a-item-0",
"faq-9b51ee909251b9ba0de086282b0afc7a-item-1",
"faq-9b51ee909251b9ba0de086282b0afc7a-item-2",
"faq-aa0a1905cab279bfffa949e96810a3a8",
"faq-aa0a1905cab279bfffa949e96810a3a8-heading-faq-aa0a1905cab279bfffa949e96810a3a8",
"faq-aa0a1905cab279bfffa949e96810a3a8-item-0",
"faq-aa0a1905cab279bfffa949e96810a3a8-item-1",
"faq-aa0a1905cab279bfffa949e96810a3a8-item-2",
"faq-d2df4da095dc8a0c45487af207ebf623",
"faq-d2df4da095dc8a0c45487af207ebf623-heading-faq-d2df4da095dc8a0c45487af207ebf623",
"faq-d2df4da095dc8a0c45487af207ebf623-item-0",
"faq-d2df4da095dc8a0c45487af207ebf623-item-1",
"faq-d2df4da095dc8a0c45487af207ebf623-item-2",
"faq-f7b27a38c3ee12525d7d0dc8acc1c600",
"faq-f7b27a38c3ee12525d7d0dc8acc1c600-heading-faq-f7b27a38c3ee12525d7d0dc8acc1c600",
"faq-f7b27a38c3ee12525d7d0dc8acc1c600-item-0",
"faq-f7b27a38c3ee12525d7d0dc8acc1c600-item-1",
"faq-f7b27a38c3ee12525d7d0dc8acc1c600-item-2",
"faq-fe0f1a534c1ceb0781d73fb79ec3eea1",
"faq-fe0f1a534c1ceb0781d73fb79ec3eea1-heading-faq-fe0f1a534c1ceb0781d73fb79ec3eea1",
"faq-fe0f1a534c1ceb0781d73fb79ec3eea1-item-0",
"faq-fe0f1a534c1ceb0781d73fb79ec3eea1-item-1",
"faq-fe0f1a534c1ceb0781d73fb79ec3eea1-item-2",
"faq-fe3528d7eb9c1abb5256a70492433843",
"faq-fe3528d7eb9c1abb5256a70492433843-heading-faq-fe3528d7eb9c1abb5256a70492433843",
"faq-fe3528d7eb9c1abb5256a70492433843-item-0",
"faq-fe3528d7eb9c1abb5256a70492433843-item-1",
"faq-fe3528d7eb9c1abb5256a70492433843-item-2",
"fas-1",
"fas-2",
"fas-3",
"fas-angle-left",
"fas-arrow-left",
"fas-arrow-right",
"fas-book-open",
"fas-check",
"fas-chevron-right",
"fas-circle",
"fas-circle-check",
"fas-circle-play",
"fas-circle-question",
"fas-code",
"fas-display",
"fas-divide",
"fas-ellipsis",
"fas-globe",
@@ -718,23 +717,18 @@
"fas-link",
"fas-magnifying-glass",
"fas-moon",
"fas-robot",
"fas-rocket",
"fas-share-nodes",
"fas-sitemap",
"fas-sort",
"fas-sun",
"fas-timeline",
"fas-trash-can",
"fas-up-right-from-square",
"fichier",
"fil-dariane",
"file",
"flexible--ready-to-use",
"flowchart",
"footer-docs-collapse-15",
"footer-docs-collapse-19",
"footer-docs-collapse-20",
"footer-docs-collapse-17",
"footer-file-collapse-1",
"footer-file-collapse-5",
"formula-katex",
@@ -791,11 +785,9 @@
"navbar-sample-collapse",
"navigation",
"notification",
"outlined-buttons",
"overview",
"persona",
"pie-chart",
"powered-by-open-source",
"projecten",
"projects",
"projets",
@@ -807,10 +799,8 @@
"réduire",
"security",
"sequence-diagram",
"sized-buttons",
"spinner",
"state-diagram",
"stateful-buttons",
"sub",
"sup",
"sécurité",

View File

@@ -203,9 +203,22 @@
{{- end -}}
<div class="{{ $col2 }}">
<div class="card-body d-flex p-{{ $args.padding }} flex-column h-100 flex-fill">
{{ if $page }}<div>{{ partial "inline/card-caption.html" (dict "page" $page "keywords" $args.headerStyle "color" $args.color) }}</div>{{ end }}
{{ if $page }}
<div>{{ partial "inline/card-caption.html" (dict
"page" $page
"keywords" $args.headerStyle
"color" $args.color
) }}
</div>
{{ end }}
<div class="flex-fill">
{{- partial "inline/card-body.html" (dict "title" $title "href" $href "color" $args.color "description" $description "button" $args.button) -}}
{{- partial "inline/card-body.html" (dict
"title" $title
"href" $href
"color" $args.color
"description" $description
"button" $args.button
) -}}
</div>
{{ if $page }}<div>{{ partial "inline/card-caption.html" (dict "page" $page "keywords" $args.footerStyle "color" $args.color) }}</div>{{ end }}
{{ if and $href $args.button }}

View File

@@ -33,10 +33,6 @@
{{ end }}
{{ else }}
{{- $thumbnail = $page.Params.Thumbnail -}}
{{ if or $page.Params.photoCredits $page.Params.photoSource }}
{{ warnf "DEPRECATED: frontmatter variables `photoCredits` and `photoSource` have been deprecated in release v0.18: %s" $page.RelPermalink }}
{{ end }}
{{- if and $page.Params.photoCredits $page.Params.PhotoSource }}{{ $credits = printf (T "photoFull") $page.Params.photoCredits $page.Params.PhotoSource }}{{ end -}}
{{- end -}}
{{ if $thumbnail -}}

View File

@@ -26,27 +26,27 @@
{{- $class := partial "utilities/GetArgParent" (dict "page" . "arg" "class" "merge" true) -}}
{{- $color := partial "utilities/GetArgParent" (dict "page" . "arg" "color") -}}
{{- $description := trim .Inner " \r\n" | .Page.RenderString | safeHTML -}}
{{- $footer := partial "utilities/GetArgParent" (dict "page" . "arg" "footer-style") | partial "utilities/GetArgParent" (dict "page" . "arg" "footer") | default "none" -}}
{{- $gutter := partial "utilities/GetArgParent" (dict "page" . "arg" "gutter") | default "0" -}}
{{- $header := partial "utilities/GetArgParent" (dict "page" . "arg" "header-style") | partial "utilities/GetArgParent" (dict "page" . "arg" "header") | default "full" -}}
{{- $footer := or (partial "utilities/GetArgParent" (dict "page" . "arg" "footer-style")) (partial "utilities/GetArgParent" (dict "page" . "arg" "footer")) -}}
{{- $gutter := partial "utilities/GetArgParent" (dict "page" . "arg" "gutter") -}}
{{- $header := or (partial "utilities/GetArgParent" (dict "page" . "arg" "header-style")) (partial "utilities/GetArgParent" (dict "page" . "arg" "header")) -}}
{{- $icon := .Get "icon" -}}
{{- $iconRounded := partial "utilities/GetArgParent" (dict "page" . "arg" "icon-rounded") | partial "utilities/GetArgParent" (dict "page" . "arg" "iconRounded") | default false -}}
{{- $align := partial "utilities/GetArgParent" (dict "page" . "arg" "align") | default "start" -}}
{{- $style := partial "utilities/GetArgParent" (dict "page" . "arg" "icon-style") | partial "utilities/GetArgParent" (dict "page" . "arg" "style") | default "" -}}
{{- $subtle := partial "utilities/GetArgParent" (dict "page" . "arg" "subtle") | default false -}}
{{- $iconRounded := or (partial "utilities/GetArgParent" (dict "page" . "arg" "icon-rounded")) (partial "utilities/GetArgParent" (dict "page" . "arg" "iconRounded")) -}}
{{- $align := partial "utilities/GetArgParent" (dict "page" . "arg" "align") -}}
{{- $style := or (partial "utilities/GetArgParent" (dict "page" . "arg" "icon-style")) (partial "utilities/GetArgParent" (dict "page" . "arg" "style")) -}}
{{- $subtle := partial "utilities/GetArgParent" (dict "page" . "arg" "subtle") -}}
{{- $loading := .Get "loading" -}}
{{- $orientation := partial "utilities/GetArgParent" (dict "page" . "arg" "orientation") | default "stacked" -}}
{{- $padding := partial "utilities/GetArgParent" (dict "page" . "arg" "padding") | default 3 -}}
{{- $ratio := partial "utilities/GetArgParent" (dict "page" . "arg" "ratio") | default "" -}}
{{- $orientation := partial "utilities/GetArgParent" (dict "page" . "arg" "orientation") -}}
{{- $padding := partial "utilities/GetArgParent" (dict "page" . "arg" "padding") -}}
{{- $ratio := partial "utilities/GetArgParent" (dict "page" . "arg" "ratio") -}}
{{- $page := .Page -}}
{{- $path := .Get "path" -}}
{{- $thumbnail := .Get "thumbnail" -}}
{{- $anchor := .Get "anchor" -}}
{{- $title := .Get "title" -}}
{{- $button := partial "utilities/GetArgParent" (dict "page" . "arg" "button") | default false -}}
{{- $linkType := partial "utilities/GetArgParent" (dict "page" . "arg" "link-type") | partial "utilities/GetArgParent" (dict "page" . "arg" "buttonType") | default "" -}}
{{- $cols := partial "utilities/GetArgParent" (dict "page" . "arg" "cols") | default 3 -}}
{{- $scroll := partial "utilities/GetArgParent" (dict "page" . "arg" "scroll") | default false -}}
{{- $button := partial "utilities/GetArgParent" (dict "page" . "arg" "button") -}}
{{- $linkType := or (partial "utilities/GetArgParent" (dict "page" . "arg" "link-type")) (partial "utilities/GetArgParent" (dict "page" . "arg" "buttonType")) -}}
{{- $cols := partial "utilities/GetArgParent" (dict "page" . "arg" "cols") -}}
{{- $scroll := partial "utilities/GetArgParent" (dict "page" . "arg" "scroll") -}}
{{- $wrapper := "" -}}
{{/* Override arguments */}}
@@ -66,7 +66,6 @@
{{ $wrapper = printf "card-block-%d p-0" $cols }}
{{ end }}
{{/* Main code */}}
{{ if not $error -}}
{{/* Render card */}}

View File

@@ -1,3 +1,3 @@
{{- partial "single/thumbnail.html" (dict "page" . "wrapper" "mb-5") -}}
{{- partial "page/thumbnail.html" (dict "page" . "wrapper" "mb-5") -}}
{{ partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) }}

View File

@@ -1,7 +1,7 @@
{{ define "main" -}}
{{- $breakpoint := $.Scratch.Get "breakpoint" -}}
{{- $sidebar := partial "body/sidebar" . -}}
{{- $toc := partial "body/panel-toc" . -}}
{{- $sidebar := partial "page/sidebar" . -}}
{{- $toc := partial "page/panel-toc" . -}}
{{ with $sidebar }}
<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-labelledby="offcanvas-label">

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@gethinode/hinode",
"version": "1.0.0-beta2",
"version": "1.0.0-beta3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@gethinode/hinode",
"version": "1.0.0-beta2",
"version": "1.0.0-beta3",
"license": "MIT",
"dependencies": {
"@fullhuman/postcss-purgecss": "^7.0.2",

View File

@@ -1,6 +1,6 @@
{
"name": "@gethinode/hinode",
"version": "1.0.0-beta2",
"version": "1.0.0-beta3",
"description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
"keywords": [
"hugo",