Merge pull request #507 from gethinode/develop

Fix issues with table and link

assets/scss/app.scss

@@ -30,6 +30,7 @@
 @import "components/popover.scss";
 @import "components/sidebar.scss";
 @import "components/syntax.scss";
+@import "components/table.scss";
 @import "components/timeline.scss";
 @import "components/toc.scss";
 @import "components/vimeo.scss";

assets/scss/components/_card.scss

@@ -48,6 +48,10 @@
     color: $body-color if($enable-important-utilities, !important, null);
 }
 
+.card-body-margin {
+    margin-bottom: $spacer * 1.5; // equals mb-4
+}
+
 @if $enable-dark-mode {
     @include color-mode(dark) {
         .card-body-link {

assets/scss/components/_table.scss

@@ -0,0 +1,13 @@
+@if $enable-dark-mode {
+    @include color-mode(dark) {
+        .table-striped, .table-striped-columns {
+            --bs-table-striped-bg: var(--bs-tertiary-bg);
+            --bs-table-striped-color: var(--bs-body-color);
+        }
+
+        .table-hover {
+            --bs-table-hover-bg: var(--bs-tertiary-bg);
+            --bs-table-striped-color: var(--bs-body-color);
+        }
+    }
+}

config/_default/params.toml

@@ -116,7 +116,7 @@
 #         header = "full"
 #         footer = "none"
 #         orientation = "stacked"
-#         style = "border-0 card-zoom"
+#         style = "border-0 card-zoom card-body-margin"
 #         homepage = 3
 #         separator = true
 # toml-docs-end sections

config/postcss.config.js

@@ -19,6 +19,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
       './assets/scss/components/_syntax.scss',
       './assets/scss/components/_syntax-dark.scss',
       './assets/scss/components/_syntax-light.scss',
+      './assets/scss/components/_table.scss',
       './assets/scss/theme/fonts.scss',
       './assets/scss/theme/theme.scss',
       './_vendor/github.com/gethinode/mod-flexsearch/assets/scss/modules/flexsearch/flexsearch.scss',

exampleSite/config/_default/params.toml

@@ -98,7 +98,7 @@
         header = "full"
         footer = "none"
         orientation = "stacked"
-        style = "border-0 card-zoom"
+        style = "border-0 card-zoom card-body-margin"
         homepage = 3
         separator = true
     [sections.projects]
@@ -113,7 +113,7 @@
         padding = "3"
         header = "none"
         footer = "tags"
-        orientation = "horizontal"
+        orientation = "horizontal-sm"
         style = "border-1 card-emphasize"
         homepage = 3
         separator = false

exampleSite/content/en/blog/bootstrap-elements.md

@@ -135,7 +135,7 @@ As an example, the following shortcode displays a card group of three elements.
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* card-group padding="3" */>}}
+{{</* card-group padding="3" gutter="3" */>}}
     {{</* card title="Bootstrap framework" icon="fab bootstrap" */>}}
         Build fast, responsive sites with Bootstrap 5. Easily customize your site with the source
         Sass files.

exampleSite/content/fr/blog/bootstrap-elements.md

@@ -1,6 +1,7 @@
 ---
 author: Mark Dumay
 title: Éléments Bootstrap
+slug: elements-bootstrap
 date: 2023-08-12
 description: Utilisez des shortcodes pour ajouter facilement des éléments Bootstrap courants.
 tags: ["bootstrap", "shortcode"]
@@ -14,6 +15,16 @@ thumbnail:
 
 Hinode propose plusieurs shortcodes qui enveloppent des composants Bootstrap courants. Consultez la [documentation officielle]({{< param "links.hinode_docs" >}}) pour plus de détails.
 
+## Abbr
+
+À titre d'exemple, le shortcode suivant affiche le texte complet d'une abréviation lorsque survolé.
+
+<!-- markdownlint-disable MD037 -->
+{{< example lang="hugo" >}}
+{{</* abbr "CI/CD" */>}}
+{{< /example >}}
+<!-- markdownlint-enable MD037 -->
+
 ## Accordéon
 
 À titre d'exemple, le shortcode suivant affiche un accordéon avec trois éléments, dont le premier élément est déplié.
@@ -124,7 +135,7 @@ En-tête 6 {{</* badge title="Nouveau" */>}}
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* card-group padding="3" */>}}
+{{</* card-group padding="3" gutter="3" */>}}
     {{</* card title="Framework Bootstrap" icon="fab bootstrap" */>}}
         Créez des sites rapides et réactifs avec Bootstrap 5. Personnalisez facilement votre site
         avec les fichiers source Sass.
@@ -293,6 +304,16 @@ Utilisez le shortcode `file` pour afficher et mettre en évidence le contenu com
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->
 
+## Mark
+
+Utilisez le shortcode `mark` pour mettre en évidence le texte. Le contenu interne est utilisé en tant qu'entrée.
+
+<!-- markdownlint-disable MD037 -->
+{{< example lang="hugo" >}}
+Utilisez le shortcode `mark` pour {{</* mark >}}mettre en évidence{{< /mark */>}} un texte spécifique.
+{{< /example >}}
+<!-- markdownlint-enable MD037 -->
+
 ## Navigation
 
 À titre d'exemple, le shortcode suivant affiche un groupe d'onglets avec des onglets alignés verticalement.
@@ -346,6 +367,26 @@ Chargement...
 {{< /example>}}
 <!-- markdownlint-enable MD037 -->
 
+## Sub
+
+À titre d'exemple, le shortcode suivant affiche du texte en indice.
+
+<!-- markdownlint-disable MD037 -->
+{{< example >}}
+H{{</* sub 2 */>}}O est un liquide.
+{{< /example >}}
+<!-- markdownlint-enable MD037 -->
+
+## Sup
+
+À titre d'exemple, le shortcode suivant affiche du texte en exposant.
+
+<!-- markdownlint-disable MD037 -->
+{{< example >}}
+2{{</* sup 10 */>}} équivaut à 1024.
+{{< /example >}}
+<!-- markdownlint-enable MD037 -->
+
 ## Chronologie
 
 À titre d'exemple, le shortcode suivant affiche une chronologie avec le fichier `data/timeline-fr.yml` en tant que données.

exampleSite/content/fr/blog/components.md

@@ -1,6 +1,7 @@
 ---
 author: Mark Dumay
 title: Composents
+slug: composents
 date: 2023-07-21
 description: Utilisez des shortcodes pour ajouter des composants prédéfinis alimentés par des bibliothèques externes.
 tags: ["bootstrap", "shortcode"]

exampleSite/hugo_stats.json

@@ -94,6 +94,7 @@
       "card",
       "card-body",
       "card-body-link",
+      "card-body-margin",
       "card-emphasize",
       "card-img-top",
       "card-img-wrap",
@@ -213,6 +214,7 @@
       "fw-semibold",
       "g-0",
       "g-3",
+      "g-4",
       "gap-2",
       "gap-3",
       "gradient",
@@ -262,7 +264,6 @@
       "mt-3",
       "mt-5",
       "mt-auto",
-      "multi-docs-collapse-14",
       "multi-docs-collapse-15",
       "multi-file-collapse-1",
       "mx-auto",
@@ -309,7 +310,6 @@
       "ps-1",
       "ps-3",
       "ps-xl-3",
-      "pt-3",
       "px-3",
       "px-4",
       "px-xxl-0",
@@ -422,7 +422,6 @@
       "alerte",
       "badge",
       "barre-de-navigation",
-      "body-docs-collapse-14",
       "body-docs-collapse-15",
       "body-file-collapse-1",
       "bouton",
@@ -447,7 +446,6 @@
       "fichier",
       "fil-dariane",
       "file",
-      "footer-docs-collapse-14",
       "footer-docs-collapse-15",
       "footer-file-collapse-1",
       "formula-katex",
@@ -494,4 +492,4 @@
       "tooltip"
     ]
   }
-}
+}

hugo_stats.json

@@ -16,7 +16,6 @@
       "link",
       "meta",
       "nav",
-      "ol",
       "p",
       "path",
       "script",
@@ -38,12 +37,9 @@
       "bg-primary",
       "bottom-0",
       "bottom-bar",
-      "breadcrumb",
-      "breadcrumb-item",
       "btn",
       "btn-close",
       "btn-primary",
-      "btn-social",
       "col",
       "col-12",
       "col-lg-2",
@@ -84,17 +80,12 @@
       "fa-circle-half-stroke",
       "fa-ellipsis",
       "fa-face-frown",
-      "fa-facebook",
       "fa-fw",
       "fa-github",
-      "fa-link",
       "fa-linkedin",
       "fa-medium",
       "fa-moon",
-      "fa-share-nodes",
       "fa-sun",
-      "fa-whatsapp",
-      "fa-x-twitter",
       "fab",
       "fas",
       "feature",
@@ -108,21 +99,16 @@
       "fs-3",
       "fw-30",
       "fw-bold",
-      "gap-2",
       "h-100",
-      "hstack",
       "img-fluid",
       "img-wrap",
       "invisible",
       "is-search",
       "justify-content-center",
-      "lead",
       "link-bg-footer",
       "link-secondary",
       "main-nav-toggler",
-      "mb-3",
       "mb-4",
-      "mb-5",
       "me-auto",
       "middle-bar",
       "min-vh-100",
@@ -161,13 +147,11 @@
       "px-4",
       "px-xxl-0",
       "py-2",
-      "py-3",
       "py-5",
       "py-md-1",
       "rounded",
       "row",
       "row-cols-1",
-      "row-cols-2",
       "row-cols-sm-3",
       "row-cols-sm-4",
       "search",
@@ -176,13 +160,10 @@
       "shadow",
       "svg-inline--fa",
       "switch-mode-collapsed",
-      "text-body-secondary",
       "text-center",
       "text-decoration-none",
-      "text-end",
       "text-secondary",
       "text-sm-start",
-      "text-uppercase",
       "theme-icon",
       "theme-icon-active",
       "toast",
@@ -197,11 +178,9 @@
     "ids": [
       "-theme",
       "-theme-collapsed",
-      "btn-webshare",
       "navbar-0-collapse",
       "toast-container",
-      "toast-copied-code-message",
-      "toast-message-email-4"
+      "toast-copied-code-message"
     ]
   }
-}
+}

layouts/_default/list.html

@@ -1,7 +1,5 @@
 {{- define "main" -}}
-    <!-- Ignore empty content, see https://github.com/gohugoio/hugo/issues/11406 -->
-    {{- $content := "" -}}
-    {{- if .Content }}{{ $content = partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) }}{{ end -}}
+    {{- $content := partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) -}}
     {{- partial "assets/section-list.html" (dict 
         "page" .
         "section" .Type

layouts/_default/single.html

@@ -84,8 +84,7 @@
         {{ end -}}
     {{ end }}
 
-    <!-- Ignore empty content, see https://github.com/gohugoio/hugo/issues/11406 -->
-    {{- if .Content }}{{ partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) }}{{ end -}}
+    {{ partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) }}
 {{ end -}}
 
 {{ define "partials/footer.html" -}}

layouts/partials/assets/card-group.html

@@ -10,6 +10,7 @@
     "cards"         Optional string of rendered cards.
     "max"           Required maximum number of cards to display.
     "cols"          Required number of columns for the grid, must be a value between 1 and 5.
+    "gutter"        Gutter between columns in a group, either "0", "1", "2", "3", "4" (default), or "5".
     "title"         Optional title of the card group.
     "paginate"      Optional flag indicating if pagination should be added to the card group, if the list exceeds the
                     maximum number of cards to display. 
@@ -17,6 +18,8 @@
                     maximum number of cards to display.
     "hrefTitle"     Optional title of the button or hyperlink as companion to href.
     "separator"     Optional flag to indicate a horizontal line should be added between items on small screens.
+    "wrapper"       Optional class attributes of the wrapper element, e.g. "p-4 px-xxl-0".
+    "responsive"    Optional flag if the number of columns should be responsive, defaults to "true".
 
     In addition, the following arguments are passed to the individual cards.
     "class"         Optional class attribute of the card element, e.g. “w-50”.
@@ -89,15 +92,31 @@
 {{- end -}}
 {{- $max = math.Min $max $count -}}
 
-{{- $cols := .cols -}}
-{{- if or (lt $cols 1) (gt $cols 5) -}}
-    {{- errorf "partial [assets/card-group.html] - Invalid value for param 'cols': %d" $cols -}}
+{{- $responsive := .responsive | default true -}}
+{{- with .responsive -}}
+    {{- if ne (printf "%T" .) "bool" -}}
+        {{- errorf "partial [assets/card-group.html] - Invalid value for param 'responsive'" -}}
+    {{- end -}}
+{{- end -}}
+
+{{- $cols := string .cols | default "3" -}}
+{{- $supportedCols := slice "0" "1" "2" "3" "4" "5" "auto" -}}
+{{- if not (in $supportedCols $cols) -}}
+    {{- errorf "partial [assets/card-group.html] - Invalid value for param 'cols': %s" $cols -}}
+{{- end -}}
+{{- $colGrid := "" -}}
+{{- if eq $cols "1" }}{{ $colGrid = "row-cols-1" -}}
+{{- else if eq $cols "2" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-1 row-cols-md-2" }}{{ else }}{{ $colGrid = "row-cols-2" }}{{ end -}}
+{{- else if eq $cols "3" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-2 row-cols-md-3" }}{{ else }}{{ $colGrid = "row-cols-3" }}{{ end -}}
+{{- else if eq $cols "4" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-2 row-cols-md-4" }}{{ else }}{{ $colGrid = "row-cols-4" }}{{ end -}}
+{{- else if eq $cols "5" }}{{ if $responsive }}{{ $colGrid = "row-cols-1 row-cols-sm-3 row-cols-md-5" }}{{ else }}{{ $colGrid = "row-cols-5" }}{{ end -}}
+{{ end -}}
+
+{{- $gutter := .gutter | default "4" -}}
+{{- $supportedGutters := slice "0" "1" "2" "3" "4" "5" -}}
+{{- if not (in $supportedGutters $gutter) -}}
+    {{- errorf "partial [assets/card-group.html] - Invalid value for param 'gutter': %s" $gutter -}}
 {{- end -}}
-{{- $colGrid := "row-cols-1" -}}
-{{- if eq $cols 2 }}{{ $colGrid = "row-cols-1 row-cols-sm-1 row-cols-md-2" -}}
-{{- else if eq $cols 3 }}{{ $colGrid = "row-cols-1 row-cols-sm-2 row-cols-md-3" -}}
-{{- else if eq $cols 4 }}{{ $colGrid = "row-cols-1 row-cols-sm-2 row-cols-md-4" -}}
-{{- else if eq $cols 5 }}{{ $colGrid = "row-cols-1 row-cols-sm-3 row-cols-md-5" }}{{ end -}}
 
 {{- if not $paginate -}}
     {{- $list = first $max $list -}}
@@ -120,11 +139,12 @@
 {{- $header := .header -}}
 {{- $footer := .footer -}}
 {{- $orientation := .orientation -}}
+{{- $wrapper := .wrapper | default "p-4 px-xxl-0" -}}
 
 {{- if and (eq $cols 1) (eq $orientation "horizontal") }}{{ $orientation = "horizontal-sm" }}{{ end -}}
 
-<div class="container-fluid p-4 px-xxl-0 ">
-    <div class="row {{ $colGrid }}">
+<div class="container-fluid {{ $wrapper }}">
+    <div class="row {{ $colGrid }} g-{{ $gutter }}">
         {{ range $index, $element := $list }}
             {{- $params := (dict
                 "class" (printf "h-100 %s" $class)
@@ -136,7 +156,7 @@
             ) -}}
             {{- $params = merge $params $element }}
 
-            <div class="col pt-3 pb-3">
+            <div class="col">
                 {{- partial "assets/card.html" $params -}}
             </div>
             {{- if and (lt $index (sub $max 1)) $separator -}}

layouts/partials/assets/card.html

@@ -11,6 +11,7 @@
                     "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary". By default, no
                     color is specified.
     "padding":      Optional padding of the content, either "0", "1", "2", "3", "4", "5", or "auto" (default).
+    "gutter"        Gutter between columns in a group, either "0" (default), "1", "2", "3", "4", or "5".
     "header"        Optional header components of the card, displayed in small caps. Supported values are "full"
                     (default), "publication", "tags", and "none".
     "footer"        Optional footer components of the card, displayed in small caps. Supported values are "full",
@@ -33,12 +34,12 @@
     {{- if $href -}}
         <a href="{{ $href }}" class="{{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }} stretched-link">
                 <p class="card-title fs-5 fw-bold">{{ $title }}</p>
-            {{ with $description }}<p class="card-text mb-4 {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">{{ . }}</p>{{ end -}}
+            {{ with $description }}<p class="card-text {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">{{ . }}</p>{{ end -}}
         </a>
     {{- else -}}
         <div>
-            <p class="card-title fs-5 fw-bold">{{ $title }}</p>
-            {{ with $description }}<p class="card-text mb-4">{{ . }}</p>{{ end -}}
+            {{ with $title }}<p class="card-title fs-5 fw-bold">{{ . }}</p>{{ end -}}
+            {{ with $description }}<p class="card-text">{{ . }}</p>{{ end -}}
         </div>
     {{- end -}}
 {{- end -}}
@@ -128,6 +129,12 @@
     {{- errorf "partial [assets/card.html] - Invalid value for param 'padding': %s" $padding -}}
 {{- end -}}
 
+{{- $gutter := .gutter | default "0" -}}
+{{ $supportedGutters:= slice "0" "1" "2" "3" "4" "5" -}}
+{{ if not (in $supportedGutters $gutter) -}}
+    {{- errorf "partial [assets/card.html] - Invalid value for param 'gutter': %s" $gutter -}}
+{{ end -}}
+
 {{- $orientation := "stacked" -}}
 {{- with .orientation }}{{ $orientation = . }}{{ end -}}
 {{- $supportedOrientations := slice "stacked" "horizontal" "horizontal-sm" "none" -}}
@@ -136,6 +143,7 @@
 {{- end -}}
 {{- if eq $orientation "none" }}{{ $thumbnail = "" }}{{ $icon = "" }}{{ end -}}
 
+{{ if ne $gutter "0" }}<div class="g-{{ $gutter }}">{{ end }}
 {{- if hasPrefix $orientation "horizontal" -}}
     <div class="card {{ with $color }}bg-{{ . }} text-bg-{{ . }}{{ end }} {{ $class }}">
         <div class="row g-0 row-cols-1 h-100">
@@ -175,3 +183,4 @@
         </div>
     </div>
 {{- end -}}
+{{ if ne $gutter "0" }}</div>{{ end }}

layouts/partials/utilities/GetArg.html

@@ -7,7 +7,8 @@
 {{ $page := .page -}}
 {{ $arg := .arg -}}
 {{ $merge := .merge -}}
-{{ $val := $page.Get $arg }}
+{{ $val := "" }}
+{{ with $page.Get $arg }}{{ $val = . }}{{ end }}
 
 {{- with $page.Parent -}}
     {{ with .Get $arg }}

layouts/shortcodes/abbr.html

@@ -35,7 +35,7 @@
     {{ $error = true }}
 {{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{ if not $error }}
     {{/* Try language-specific file first */}}

layouts/shortcodes/accordion-item.html

@@ -12,7 +12,7 @@
 {{- end -}}
 
 {{- $id := .Ordinal -}}
-{{ $header := .Get "header" -}}
+{{ $header := .Get "header" | default "" -}}
 {{ if not $header -}}
     {{ if .Parent }}
         {{ errorf "Missing value for param 'header': %s" .Parent.Position -}}
@@ -21,7 +21,7 @@
     {{ end }}
 {{ end -}}
 
-{{ $class := .Get "class" -}}
+{{ $class := .Get "class" | default "" -}}
 {{ $body := trim .Inner " \r\n" -}}
 {{ if not $body -}}
     {{ if .Parent }}

layouts/shortcodes/accordion.html

@@ -10,7 +10,7 @@
 {{ with .Get "id" }}
     {{ $id = . }}
 {{ end }}
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{- $openParam := "false" -}}
 {{- $open := false -}}

layouts/shortcodes/alert.html

@@ -49,7 +49,7 @@
     {{ $error = true -}}
 {{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{- if not $error -}}
     <div class="d-flex alert alert-{{ $color }} {{ if $dismissible }}alert-dismissible fade show{{ end }}{{ with $class }} {{ . }}{{ end }}" role="alert">

layouts/shortcodes/badge.html

@@ -7,8 +7,8 @@
 -->
 
 {{- $error := false -}}
-{{- $title := .Get "title" -}}
-{{- $class := .Get "class" -}}
+{{- $title := .Get "title" | default "" -}}
+{{- $class := .Get "class" | default "" -}}
 {{- $color := "secondary" -}}
 {{- with .Get "color" }}{{ $color = . }}{{ end -}}
 {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" -}}

layouts/shortcodes/breadcrumb.html

@@ -5,7 +5,7 @@
 
 {{- $error := false -}}
 {{- $page := . -}}
-{{- $path := .Get "path"}}
+{{- $path := .Get "path" | default "" }}
 {{- if $path -}}
     {{- $page = .Site.GetPage $path -}}
     {{- if not $page -}}

layouts/shortcodes/button.html

@@ -31,7 +31,7 @@
 {{ $error := false }}
 {{ $type := "button" -}}
 
-{{- $icon := .Get "icon" }}
+{{- $icon := .Get "icon" | default "" }}
 {{ $title := trim .Inner " \r\n" | .Page.RenderString -}}
 {{ if not (or $title $icon) -}}
     {{ errorf "Missing icon or inner element text: %s" .Position -}}
@@ -71,17 +71,17 @@
     {{ errorf "Invalid value for param 'outline': %s" .Position -}}
 {{ end -}}
 
-{{ $badge := .Get "badge" -}}
-{{ $label := .Get "aria-label" -}}
-{{ $tooltip := .Get "tooltip" -}}
-{{ $collapse := .Get "collapse" -}}
-{{ $href := .Get "href" -}}
-{{ $relref := .Get "relref" }}
-{{ $id := .Get "id" -}}
+{{ $badge := .Get "badge" | default "" -}}
+{{ $label := .Get "aria-label" | default "" -}}
+{{ $tooltip := .Get "tooltip" | default "" -}}
+{{ $collapse := .Get "collapse" | default "" -}}
+{{ $href := .Get "href" | default "" -}}
+{{ $relref := .Get "relref" | default "" -}}
+{{ $id := .Get "id" | default "" -}}
 {{ if $relref }}
     {{ $href = relref . $relref }}
 {{ end }}
-{{ $class := .Get "class" -}}
+{{ $class := .Get "class" | default "" -}}
 
 {{ $placement := "top" -}}
 {{ with .Get "placement" }}{{ $placement = . }}{{ end -}}
@@ -91,7 +91,7 @@
     {{ $error = true }}
 {{ end -}}
 
-{{- $toast := .Get "toast" -}}
+{{- $toast := .Get "toast" | default "" -}}
 
 {{- $order := "last" -}}
 {{- with .Get "order" }}{{ $order = . }}{{ end -}}

layouts/shortcodes/card-group.html

@@ -8,7 +8,9 @@
     "cols"          Required number of columns for the grid, must be a value between 1 and 5.
     "title"         Optional title of the card group.
     "separator"     Optional flag to indicate a horizontal line should be added between items on small screens.
-    "gutter"        Gutter between columns in a group, either "0", "1", "2", "3" (default), "4", or "5".
+    "gutter"        Gutter between columns in a group, either "0", "1", "2", "3", "4" (default), or "5".
+    "wrapper"       Optional class attributes of the wrapper element, e.g. "p-4 px-xxl-0".
+    "responsive"    Optional flag if the number of columns should be responsive, defaults to "true".
 
     In addition, the following arguments are passed to the individual cards.
     "class"         Optional class attribute of the card element, e.g. “w-50”.
@@ -22,24 +24,35 @@
     "orientation"   Optional placecement of the thumbnail, either "stacked" (default), "horizontal", or "none".
 -->
 
-{{- $cols := 3 -}}
-{{ with .Get "cols" }}{{ $cols = int . }}{{ end -}}
-{{- $title := .Get "title" -}}
-{{- $separator := .Get "separator" -}}
-{{- $class := .Get "class" -}}
-{{- $wrapper := .Get "wrapper" -}}
-{{- $color := .Get "color" -}}
+{{- $cols := .Get "cols" | default "3" -}}
+{{- $gutter := .Get "gutter" | default "4" -}}
+{{- $title := .Get "title" | default "" -}}
+{{- $separator := .Get "separator" | default "" -}}
+{{- $class := .Get "class" | default "" -}}
+{{- $wrapper := .Get "wrapper" | default "" -}}
+{{- $responsive := .Get "responsive" | default true -}}
+{{- $color := .Get "color" | default "" -}}
 {{- $padding := .Get "padding" | default "3" -}}
-{{- $header := .Get "header" -}}
-{{- $footer := .Get "footer" -}}
-{{- $orientation := .Get "orientation" -}}
+{{- $header := .Get "header" | default "" -}}
+{{- $footer := .Get "footer" | default "" -}}
+{{- $orientation := .Get "orientation" | default "" -}}
+
+{{ $inner := .Scratch.Get "inner" }}
+{{ $input := trim .Inner " \r\n" }}
+{{ if $input }}
+    {{ $input = replace $input "\n" "\n  " }}
+    {{ warnf "Unexpected inner content: %s\r\n      %s" .Position $input }}
+{{ end }}
 
 {{- partial "assets/card-group.html" (dict 
     "page" .Page
-    "cards" .Inner
+    "cards" $inner
     "cols" $cols
+    "gutter" $gutter
     "title" $title
     "separator" $separator
+    "wrapper" $wrapper
+    "responsive" $responsive
     "class" $class
     "color" $color
     "padding" $padding

layouts/shortcodes/card.html

@@ -8,7 +8,7 @@
                     "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary". By default, no
                     color is specified.
     "padding"       Optional padding of the content, either "0", "1", "2", "3", "4", "5", or "auto" (default).
-    "gutter"        Gutter between columns in a group, either "0", "1", "2", "3" (default), "4", or "5".
+    "gutter"        Gutter between columns in a group, either "0" (default), "1", "2", "3", "4", or "5".
     "header"        Optional header components of the card, displayed in small caps. Supported values are "full"
                     (default), "publication", "tags", and "none".
     "footer"        Optional footer components of the card, displayed in small caps. Supported values are "full",
@@ -21,7 +21,7 @@
 
 {{ $error := false }}
 
-{{ $path := .Get "path" }}
+{{ $path := or (.Get "path") "" }}
 {{ $page := .Page }}
 {{ with $path }}
     {{ $page = $.Site.GetPage $path }}
@@ -60,7 +60,7 @@
     {{ $error = true -}}
 {{ end -}}
 
-{{- $gutter := partial "utilities/GetArg" (dict "page" . "arg" "gutter") | default "3" -}}
+{{- $gutter := partial "utilities/GetArg" (dict "page" . "arg" "gutter") | default "0" -}}
 {{ $supportedGutters:= slice "0" "1" "2" "3" "4" "5" -}}
 {{ if not (in $supportedGutters $gutter) -}}
     {{ errorf "Invalid value for param 'gutter': %s" .Position -}}
@@ -82,26 +82,36 @@
 {{ end -}}
 
 {{ $description := trim .Inner " \r\n" | .Page.RenderString | safeHTML }}
-{{ $title := .Get "title" }}
-{{ $alt := .Get "alt" }}
-{{ $icon := .Get "icon" }}
-{{ $thumbnail := .Get "thumbnail" }}
+{{ $title := .Get "title" | default "" -}}
+{{ $alt := .Get "alt" | default "" -}}
+{{ $icon := .Get "icon" | default "" -}}
+{{ $thumbnail := .Get "thumbnail" | default "" -}}
 
 {{ if not $error -}}
-    <div class="g-{{ $gutter }}">
-        {{- partial "assets/card.html" (dict 
-            "path" $path
-            "title" $title
-            "class" (printf "h-100 %s" $class)
-            "color" $color
-            "padding" $padding
-            "header" $header
-            "footer" $footer
-            "orientation" $orientation
-            "description" $description
-            "icon" $icon
-            "thumbnail" $thumbnail
-            "alt" $alt
-        ) -}}
-    </div>
+    {{- $output := partial "assets/card.html" (dict 
+        "path" $path
+        "title" $title
+        "class" (printf "h-100 %s" $class)
+        "gutter" $gutter
+        "color" $color
+        "padding" $padding
+        "header" $header
+        "footer" $footer
+        "orientation" $orientation
+        "description" $description
+        "icon" $icon
+        "thumbnail" $thumbnail
+        "alt" $alt
+    ) -}}
+
+    {{ with .Parent }}
+        {{ $current := .Scratch.Get "inner" }}
+        {{ if $current }}
+            {{ .Scratch.Set "inner" (print $current $output) }}
+        {{ else }}
+            {{ .Scratch.Set "inner" $output }}
+        {{ end }}
+    {{ else }}
+        {{ print $output | safeHTML }}
+    {{ end }}
 {{ end -}}

layouts/shortcodes/carousel.html

@@ -14,7 +14,7 @@
     {{ $id = . }}
 {{ end }}
 
-{{ $class := .Get "class" -}}
+{{ $class := .Get "class" | default "" -}}
 
 {{ $inner := .Scratch.Get "inner" }}
 {{ $input := trim .Inner " \r\n" }}

layouts/shortcodes/collapse.html

@@ -4,12 +4,12 @@
     "class"         Optional class attribute of the inner panel element, e.g. “p-3”.
 -->
 
-{{ $id := .Get "id" -}}
+{{ $id := .Get "id" | default "" -}}
 {{ if not $id -}}
     {{ errorf "Missing value for param 'id': %s" .Position -}}
 {{ end -}}
 
-{{ $class := .Get "class" }}
+{{ $class := .Get "class" | default "" }}
 
 {{- $body := trim .Inner " \r\n" -}}
 {{ if not $body -}}

layouts/shortcodes/command.html

@@ -8,9 +8,9 @@
     "class"         Optional class attribute of the command element.
 -->
 
-{{- $host := .Get "host" -}}
-{{- $user := .Get "user" -}}
-{{- $prompt := .Get "prompt" -}}
+{{- $host := .Get "host" | default "" -}}
+{{- $user := .Get "user" | default "" -}}
+{{- $prompt := .Get "prompt" | default "" -}}
 {{- $filter := "(out)" -}}
 {{- $input := trim .Inner " \t\r\n" -}}
 
@@ -70,7 +70,7 @@
     {{- $output = (replace $output "<span class=\"c\">#" "<span class=\"c\">" | safeHTML) -}}
 {{- end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 <div class="mb-3 syntax-highlight{{ with $class }} {{ . }}{{ end }}">
     {{- $output -}}

layouts/shortcodes/docs.html

@@ -19,9 +19,9 @@
     "class"         Optional class argument of the tab control.
 -->
 
-{{- $name := .Get "name" -}}
+{{- $name := .Get "name" | default "" -}}
 {{- $basePath := .Site.Params.docs.basePath -}}
-{{- $file := .Get "file" }}
+{{- $file := .Get "file" | default "" -}}
 {{- if hasPrefix $file "./" -}}
     {{- $file = path.Clean $file -}}
 {{- else -}}
@@ -68,7 +68,7 @@
     {{ errorf "Invalid value for param 'full': %s" $fullParam -}}
 {{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{- /* If any parameters are missing, print an error and exit */ -}}
 {{- if or (not $name) (not $file) -}}

layouts/shortcodes/example.html

@@ -11,8 +11,8 @@
     "class"         Optional class attributes of the element's container.
 -->
 
-{{- $id := .Get "id" -}}
-{{- $class := .Get "class" -}}
+{{- $id := .Get "id" | default "" -}}
+{{- $class := .Get "class" | default "" -}}
 {{- $lang := .Get "lang" | default "markdown" -}}
 {{- $show_markup := .Get "show_markup" | default true -}}
 {{- $show_preview := .Get "show_preview" | default true -}}

layouts/shortcodes/file.html

@@ -14,7 +14,7 @@
 -->
 
 {{- $basePath := .Site.Params.docs.basePath -}}
-{{- $file := .Get "path" }}
+{{- $file := .Get "path" | default "" -}}
 {{- if hasPrefix $file "./" -}}
     {{- $file = path.Clean $file -}}
 {{- else -}}
@@ -47,7 +47,7 @@
     {{ errorf "Invalid value for param 'full': %s" $fullParam -}}
 {{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{- /* If any parameters are missing, print an error and exit */ -}}
 {{- if not $file -}}

layouts/shortcodes/image.html

@@ -16,19 +16,19 @@
 -->
 
 {{- if isset .Params "src" -}}
-    {{ $url := .Get "src" -}}
+    {{ $url := .Get "src" | default "" -}}
     {{- $validRatios := slice "1x1" "3x2" "4x3" "16x9" "21x9" -}}
-    {{ $ratio := .Get "ratio" -}}
+    {{ $ratio := .Get "ratio" | default "" -}}
     {{ if $ratio -}}
         {{ if not (in $validRatios $ratio) -}}
             {{ errorf "Invalid value for param 'ratio': %s" .Position -}}
         {{ end -}}
     {{ end -}}
     
-    {{- $class := .Get "class" -}}
-    {{- $wrapper := .Get "wrapper" -}}
-    {{ $title := .Get "title" -}}
-    {{ $caption := .Get "caption" -}}
+    {{- $class := .Get "class" | default "" -}}
+    {{- $wrapper := .Get "wrapper" | default "" -}}
+    {{ $title := .Get "title" | default "" -}}
+    {{ $caption := .Get "caption" | default "" -}}
     {{ $supportedFlags := slice "true" "false" -}}
     {{ $modeParam := "false" -}}
     {{ $mode := false -}}

layouts/shortcodes/img.html

@@ -12,9 +12,9 @@
 {{ if not .Parent }}
     {{ errorf "The img shortcode should be contained within a carousel shortcode: %s" .Position }}
 {{ else }}
-    {{- $src := .Get "src" -}}
+    {{- $src := .Get "src" | default "" -}}
     {{- if $src -}}
-        {{- $caption := .Get "caption" -}}
+        {{- $caption := .Get "caption" | default "" -}}
         {{- $ratio := partial "utilities/GetArg" (dict "page" . "arg" "ratio") -}}
         {{- $portrait := partial "utilities/GetArg" (dict "page" . "arg" "portrait") | default false -}}
         {{- $active := eq .Ordinal 0 -}}

layouts/shortcodes/kbd.html

@@ -10,7 +10,7 @@
 {{- $error := false -}}
 {{- $title := "" -}}
 {{- if .IsNamedParams }}{{ $title = .Get "title" }}{{ else }}{{ $title = .Get 0 }}{{ end }}
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 {{- $color := "" -}}
 {{- with .Get "color" }}{{ $color = . }}{{ end -}}
 {{- $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" -}}

layouts/shortcodes/link.html

@@ -30,13 +30,13 @@
 {{- $anchor := "" -}}
 
 {{ if .IsNamedParams }}
-    {{ $href = .Get "href" }}
-    {{ $name = .Get "name" }}
-    {{ $url = .Get "url" }}
-    {{ $cue = .Get "cue" | default site.Params.main.externalLinks.cue }}
-    {{ $tab = .Get "tab" | default site.Params.main.externalLinks.tab }}
-    {{ $case = .Get "case" | default true }}
-    {{- $class := .Get "class" -}}
+    {{- $href = .Get "href" | default "" -}}
+    {{- $name = .Get "name" | default "" -}}
+    {{- $url = .Get "url" | default "" -}}
+    {{- $cue = .Get "cue" | default site.Params.main.externalLinks.cue -}}
+    {{- $tab = .Get "tab" | default site.Params.main.externalLinks.tab -}}
+    {{- $case = .Get "case" | default true -}}
+    {{- $class = .Get "class" | default "" -}}
 {{ else }}
     {{ $href = .Get 0 }}
 {{ end }}
@@ -63,8 +63,7 @@
             {{- $url = index $segments 0 -}}            
             {{- $anchor = index $segments 1 -}}            
             {{ if not $url }}
-                {{- $url = strings.TrimSuffix "/" .Page.RelPermalink -}}
-                {{- with .Page.Language }}{{ $url = strings.TrimPrefix (path.Join "/" .Lang) $url}}{{ end -}}
+                {{ $url = .Page.File.Path }}
             {{ end }}
         {{ end }}
     {{ else }}

layouts/shortcodes/mark.html

@@ -7,14 +7,14 @@
 -->
 
 {{- $error := false -}}
-{{ $color := .Get "color" -}}
+{{ $color := .Get "color" | default "" -}}
 {{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" -}}
 {{ if and $color (not (in $supportedColors $color)) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $error = true -}}
 {{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{- if $color }}{{ $class = printf "%s text-bg-%s" $class $color }}{{ end -}}
 

layouts/shortcodes/nav-item.html

@@ -22,12 +22,12 @@
         {{- $fade = true -}}
     {{- end -}}
 
-    {{- $header := .Get "header" -}}
+    {{- $header := .Get "header" | default "" -}}
     {{- if not $header -}}
         {{- errorf "Missing value for param 'header': %s" .Parent.Position -}}
     {{- end -}}
 
-    {{- $class := .Get "class" -}}
+    {{- $class := .Get "class" | default "" -}}
     {{- $body := trim .Inner " \r\n" | .Page.RenderString -}}
 
     {{- $supportedFlags := slice "true" "false" -}}

layouts/shortcodes/nav.html

@@ -12,8 +12,8 @@
     {{ $id = . }}
 {{ end }}
 
-{{- $class := .Get "class" -}}
-{{ $type := .Get "type" -}}
+{{- $class := .Get "class" | default "" -}}
+{{ $type := .Get "type" | default "" -}}
 {{ $supportedNavTypes := slice "tabs" "pills" "underline" -}}
 {{ if $type }}
     {{ if not (in $supportedNavTypes $type) -}}

layouts/shortcodes/navbar.html

@@ -27,7 +27,7 @@
     {{ $id = . }}
 {{ end }}
 
-{{ $path := .Get "path" }}
+{{ $path := .Get "path" | default "" }}
 {{ $page := .Site.GetPage $path }}
 {{ if not $page }}
     {{ errorf "Invalid or missing value for param 'path': %s" $path -}}
@@ -86,7 +86,7 @@
 {{ $title := "" -}}
 {{ with .Get "title" }}{{ $title = . }}{{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{ if not $error -}}
     {{- partial "assets/navbar.html" (dict 

layouts/shortcodes/persona.html

@@ -9,14 +9,14 @@
 
 {{- $error := false -}}
 
-{{- $path := .Get "path" -}}
+{{- $path := .Get "path" | default "" -}}
 {{- $page := .Site.GetPage $path -}}
 {{- if not $page -}}
     {{- errorf "Invalid or missing value for param 'path': %s" .Position -}}
     {{- $error = true -}}
 {{- end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{- $color := "" -}}
 {{- with .Get "color" }}{{ $color = . }}{{ end -}}

layouts/shortcodes/release.html

@@ -10,11 +10,10 @@
 -->
 
 {{- $error := false -}}
-{{- $version := .Get "version" -}}
+{{- $version := .Get "version" | default "" -}}
 {{- $inline := false -}}
 
-{{- $state := "new" -}}
-{{- with .Get "state" }}{{ $state = . }}{{ end -}}
+{{- $state := .Get "state" | default "new" -}}
 {{- $supportedStates := slice "new" "deprecated" -}}
 {{- if not (in $supportedStates $state) -}}
     {{- errorf "Invalid value for param 'state': %s" .Position -}}
@@ -84,7 +83,7 @@
     {{- $error = true -}}
 {{- end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{- if not $error -}}
     {{- if not $inline }}<div class="pb-3">{{ end -}}

layouts/shortcodes/sub.html

@@ -2,6 +2,6 @@
     Displays text as subscript, provided as unnamed argument.
 -->
 
-{{- $text := .Get 0 -}}
+{{- $text := .Get 0 | default "" -}}
 
 <sub>{{ $text | .Page.RenderString -}}</sub>

layouts/shortcodes/sup.html

@@ -2,6 +2,6 @@
     Displays text as superscript, provided as unnamed argument.
 -->
 
-{{- $text := .Get 0 -}}
+{{- $text := .Get 0 | default "" -}}
 
 <sup>{{ $text | .Page.RenderString -}}</sup>

layouts/shortcodes/timeline.html

@@ -14,7 +14,7 @@
 {{ $error := false }}
 {{- $page := .Page -}}
 
-{{- $data := .Get "data" -}}
+{{- $data := .Get "data" | default "" -}}
 {{ if not $data -}}
     {{ errorf "Missing param 'data': %s" .Position -}}
     {{ $error = true }}
@@ -40,7 +40,7 @@
     {{ $error = true -}}
 {{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 <!-- Inline partial to render icon -->
 {{- define "partials/timeline-icon.html" -}}

layouts/shortcodes/toast.html

@@ -8,10 +8,10 @@
 {{- $error := false -}}
 {{- $id := printf "toast-message-%d" .Ordinal -}}
 {{- with .Get "id" }}{{ $id = . }}{{ end -}}
-{{ $header := .Get "header" -}}
+{{ $header := .Get "header" | default "" -}}
 {{ $message := trim .Inner " \r\n" | .Page.RenderString -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{ if not $message -}}
     {{ errorf "Missing inner element text: %s" .Position -}}

layouts/shortcodes/tooltip.html

@@ -25,9 +25,9 @@
     {{ $error = true }}
 {{ end -}}
 
-{{ $tooltip := .Get "title" -}}
+{{ $tooltip := .Get "title" | default "" -}}
 
-{{ $href := .Get "href" -}}
+{{ $href := .Get "href" | default "" -}}
 {{ if not $href -}}
     {{ errorf "Missing value for param 'href': %s" .Position -}}
     {{ $error = true }}
@@ -41,7 +41,7 @@
     {{ $error = true }}
 {{ end -}}
 
-{{- $class := .Get "class" -}}
+{{- $class := .Get "class" | default "" -}}
 
 {{ if not $error }}
     <div class="d-inline-flex">

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.19.0-beta2",
+  "version": "0.19.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.19.0-beta2",
+      "version": "0.19.0",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",
@@ -18,7 +18,7 @@
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-n": "^16.0.2",
         "eslint-plugin-promise": "^6.1.1",
-        "hugo-bin": "^0.113.0",
+        "hugo-bin": "^0.114.2",
         "markdownlint-cli2": "^0.9.2",
         "npm-run-all": "^4.1.5",
         "postcss-cli": "^10.1.0",
@@ -3278,9 +3278,9 @@
       }
     },
     "node_modules/hugo-bin": {
-      "version": "0.113.0",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.113.0.tgz",
-      "integrity": "sha512-LivqvBvXU/sAydUTH4eMMdsvrUEcJvwJHyWyZX+PfXPyvkCVTUekJcJ0Pg+oYBZrg/nyriyB/xfBFi6JlgTGpg==",
+      "version": "0.114.2",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.114.2.tgz",
+      "integrity": "sha512-a7F8wArDACHm10cQnpDe9kljNc3zcsy5uK3myD5TTVU5QZ+75ZYi0IcP9YmQNDg57jos9p0ggOCu510SueH1yw==",
       "dev": true,
       "funding": [
         {
@@ -9957,9 +9957,9 @@
       }
     },
     "hugo-bin": {
-      "version": "0.113.0",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.113.0.tgz",
-      "integrity": "sha512-LivqvBvXU/sAydUTH4eMMdsvrUEcJvwJHyWyZX+PfXPyvkCVTUekJcJ0Pg+oYBZrg/nyriyB/xfBFi6JlgTGpg==",
+      "version": "0.114.2",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.114.2.tgz",
+      "integrity": "sha512-a7F8wArDACHm10cQnpDe9kljNc3zcsy5uK3myD5TTVU5QZ+75ZYi0IcP9YmQNDg57jos9p0ggOCu510SueH1yw==",
       "dev": true,
       "requires": {
         "@xhmikosr/bin-wrapper": "^11.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.19.0-beta2",
+  "version": "0.19.0",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",
@@ -75,7 +75,7 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-n": "^16.0.2",
     "eslint-plugin-promise": "^6.1.1",
-    "hugo-bin": "^0.113.0",
+    "hugo-bin": "^0.114.2",
     "markdownlint-cli2": "^0.9.2",
     "npm-run-all": "^4.1.5",
     "postcss-cli": "^10.1.0",

theme.toml

@@ -6,7 +6,7 @@ homepage = "https://gethinode.com"
 demosite = "https://demo.gethinode.com"
 tags = ["blog", "documentation", "minimal", "modern", "customizable", "search", "bootstrap"]
 features = ["security aware", "fast by default", "seo-ready", "development tools", "bootstrap framework", "netlify-ready", "full text search", "page layouts", "versioned documentation"]
-min_version = "0.110.0"
+min_version = "0.118.0" # fixes Hugo issue #11406
 
 [author]
   name = "Mark Dumay"