Merge pull request #830 from gethinode/develop

Enable markdown content for card body

.github/workflows/mod-update.yml

@@ -38,7 +38,7 @@ jobs:
         echo 'EOF' >> $GITHUB_OUTPUT
 
     - name: Create Pull Request
-      uses: gethinode-actions/create-pull-request@v5
+      uses: gethinode-actions/create-pull-request@v6
       with:
         token: ${{ secrets.HUGO_MOD_PR }}
         commit-message: 'fix: update Hugo module dependencies'

data/structures/card-group.yml

@@ -94,3 +94,8 @@ arguments:
     optional: true
     comment: >-
       Flag indicating if the number of columns should be responsive, defaults to `true`.
+  hook:
+    type: string
+    optional: true
+    comment: Render hook for the card partial.
+    group: partial

data/structures/card.yml

@@ -200,6 +200,11 @@ arguments:
     release: v0.23.0-beta
     comment: >-
       Flag indicating the cards should include a button that links to the provided address.
+  hook:
+    type: string
+    optional: true
+    comment: Render hook for the image partial.
+    group: partial
 body:
   optional: true
   comment: >-

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/airbnb/lottie-web v5.12.2+incompatible // indirect
-	github.com/gethinode/mod-bootstrap v1.2.2 // indirect
+	github.com/gethinode/mod-bootstrap v1.2.5 // indirect
 	github.com/gethinode/mod-flexsearch v1.9.0 // indirect
 	github.com/gethinode/mod-fontawesome v1.8.1 // indirect
 	github.com/gethinode/mod-katex v1.0.7 // indirect
@@ -12,5 +12,5 @@ require (
 	github.com/gethinode/mod-lottie v1.4.4 // indirect
 	github.com/gethinode/mod-utils/v2 v2.1.1 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 // indirect
-	github.com/twbs/bootstrap v5.3.2+incompatible // indirect
+	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
 )

go.sum

@@ -12,6 +12,10 @@ github.com/gethinode/mod-bootstrap v1.2.1 h1:z54dgsbhShhlri+X77Z+yLrg0wz/f8C8ojA
 github.com/gethinode/mod-bootstrap v1.2.1/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8=
 github.com/gethinode/mod-bootstrap v1.2.2 h1:Q8E04OKWr9owk7nhQ/NBukUgSFhsECxZsOLEaf5oeiQ=
 github.com/gethinode/mod-bootstrap v1.2.2/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8=
+github.com/gethinode/mod-bootstrap v1.2.4 h1:4CFNpwpRKiZlMVWg9u5+ijSb924j4yM3G1p96Hquas0=
+github.com/gethinode/mod-bootstrap v1.2.4/go.mod h1:CL9IDot6nbXIWJYE/KxfsTdYYEJIGL17BXbAYPn+wVQ=
+github.com/gethinode/mod-bootstrap v1.2.5 h1:h6yAlkMZA34wJU3pLFpLxp1ynEBte/YTY4kGEQtMGPE=
+github.com/gethinode/mod-bootstrap v1.2.5/go.mod h1:CL9IDot6nbXIWJYE/KxfsTdYYEJIGL17BXbAYPn+wVQ=
 github.com/gethinode/mod-flexsearch v1.0.1 h1:FJkRsUzSnQTXl3MWCigT4E6vfff870UWTnkGqaDGIhA=
 github.com/gethinode/mod-flexsearch v1.0.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.1.0 h1:7BCMyQDlYlskNXuazt8Jg/jg9WREexu2xVkYqThkAX4=
@@ -162,3 +166,5 @@ github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 h1:H6xa5YyC
 github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/twbs/bootstrap v5.3.2+incompatible h1:tuiO5acc6xnZUR77Sbi5aKWXxjYxbmsSbJwYrhAKoQQ=
 github.com/twbs/bootstrap v5.3.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/twbs/bootstrap v5.3.3+incompatible h1:goFoqinzdHfkeegpFP7pvhbd0g+A3O2hbU3XCjuNrEQ=
+github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

layouts/partials/assets/card-group.html

@@ -32,6 +32,7 @@
 {{- $subtle := .subtle }}
 {{- $loading := .loading -}}
 {{- $button := .button -}}
+{{- $hook := .hook | default "assets/card.html" }}
 
 <!-- Override arguments -->
 {{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $pages) }}
@@ -107,7 +108,7 @@
             {{- $params = merge $params $element }}
 
             <div class="col">
-                {{- partial "assets/card.html" $params -}}
+                {{- partial $hook $params -}}
             </div>
             {{- if and (lt $index (sub $max 1)) $separator -}}
                 <div class="col d-block d-sm-none">

layouts/partials/assets/card.html

@@ -38,6 +38,7 @@
         {{- $colorStyle = printf "bg-%s text-bg-%s" $color $color -}}
     {{ end }}
 {{ end }}
+{{- $hook := .hook | default "assets/image.html" }}
 
 <!-- Override arguments -->
 {{- $page := "" }}
@@ -75,12 +76,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 {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">{{ . }}</p>{{ end -}}
+            {{ with $description }}<div class="card-text {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">{{ . | page.RenderString | safeHTML }}</div>{{ end -}}
         </a>
     {{- else -}}
         <div>
             {{ with $title }}<p class="card-title fs-5 fw-bold">{{ . }}</p>{{ end -}}
-            {{ with $description }}<p class="card-text">{{ . }}</p>{{ end -}}
+            {{ with $description }}<div class="card-text">{{ . | page.RenderString | safeHTML }}</div>{{ end -}}
         </div>
     {{- end -}}
 {{- end -}}
@@ -125,7 +126,7 @@
         <div class="row g-0 row-cols-1 h-100{{ if $button }} pb-5{{ end }}">
             <div class="{{ if eq $orientation "horizontal-sm" }}col-4 col-md-2{{ else }}col-4{{ end }}">
                 {{- if $thumbnail -}}
-                    {{- partial "assets/image.html" (dict "url" $thumbnail "ratio" (or $ratio "1x1") "wrapper" "h-100 card-img-wrap" "class" "rounded-start card-img-h100" "title" $title "loading" $loading) -}}
+                    {{- partial $hook (dict "url" $thumbnail "ratio" (or $ratio "1x1") "wrapper" "h-100 card-img-wrap" "class" "rounded-start card-img-h100" "title" $title "loading" $loading) -}}
                 {{- else if $icon -}}
                     <div class="card-icon p-{{ $padding }} h-100 fa-wrapper d-flex align-items-{{ $align}} justify-content-center {{ $iconStyle }}">
                         {{- partial "assets/icon.html" (dict "icon" (printf "%s %s" $icon $style)) -}}
@@ -151,7 +152,7 @@
     <!-- Render stacked / default card -->
     <div class="card {{ $colorStyle }} {{ $class }} text-{{ $align }}">
         {{- if $thumbnail -}}
-            {{- partial "assets/image.html" (dict "url" $thumbnail "ratio" (or $ratio "16x9") "wrapper" "card-img-wrap" "class" "card-img-top" "title" (or $alt $title) "loading" $loading) -}}
+            {{- partial $hook (dict "url" $thumbnail "ratio" (or $ratio "16x9") "wrapper" "card-img-wrap" "class" "card-img-top" "title" (or $alt $title) "loading" $loading) -}}
         {{- else if $icon -}}
             <div class="card-icon p-{{ $padding }} {{ $iconStyle }} text-{{ $align }}">
                 {{- partial "assets/icon.html" (dict "icon" (printf "%s %s" $icon $style)) -}}

layouts/partials/assets/download.html

@@ -9,7 +9,7 @@
 {{- $minimal := .minimal | default false -}}
 
 {{- if and $download (not (fileExists (path.Join "static" $download))) -}}
-    {{- errorf "Cannot find download file for page '%s': %s" page.File.Path $download -}}
+    {{- warnf "Cannot find download file for page '%s': %s" page.File.Path $download -}}
 {{- end -}}
 
 {{ with $download }}

layouts/partials/head/icons.html

@@ -36,6 +36,8 @@
 {{- end -}}
 
 {{- range $index, $element := resources.Match "icons/**.svg" -}}
-    {{- $icon := resources.Get $element | resources.ExecuteAsTemplate $element $params -}}
-    {{- $icon.Publish -}}
+    {{ with resources.Get $element }}
+        {{- $icon := . | resources.ExecuteAsTemplate $element $params -}}
+        {{- $icon.Publish -}}
+    {{ end }}
 {{- end -}}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.23.0-beta7",
+  "version": "0.23.0-rc.2",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",
@@ -68,17 +68,17 @@
   "homepage": "https://gethinode.com",
   "devDependencies": {
     "@fullhuman/postcss-purgecss": "^5.0.0",
-    "@gethinode/netlify-plugin-dartsass": "^0.2.0",
+    "@gethinode/netlify-plugin-dartsass": "^0.3.0",
     "@netlify/plugin-lighthouse": "^6.0.0",
-    "autoprefixer": "^10.4.17",
-    "cssnano": "^6.0.5",
-    "cssnano-preset-advanced": "^6.0.5",
+    "autoprefixer": "^10.4.18",
+    "cssnano": "^6.1.0",
+    "cssnano-preset-advanced": "^6.1.0",
     "eslint": "^8.57.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-promise": "^6.1.1",
-    "hugo-bin": "^0.119.0",
+    "hugo-bin": "^0.120.8",
     "markdownlint-cli2": "^0.12.1",
     "netlify-plugin-hugo-cache-resources": "^0.2.1",
     "npm-run-all": "^4.1.5",
@@ -87,11 +87,11 @@
     "replace-in-files-cli": "^2.2.0",
     "rimraf": "^5.0.5",
     "shx": "^0.3.4",
-    "stylelint": "^15.11.0",
-    "stylelint-config-standard-scss": "^11.1.0"
+    "stylelint": "^16.2.1",
+    "stylelint-config-standard-scss": "^13.0.0"
   },
   "optionalDependencies": {
-    "@gethinode/netlify-plugin-dartsass": "^0.2.0",
+    "@gethinode/netlify-plugin-dartsass": "^0.3.0",
     "@netlify/plugin-lighthouse": "*",
     "fsevents": "*",
     "netlify-plugin-hugo-cache-resources": "^0.2.1"