Merge pull request #866 from gethinode/develop

Fix alignment of card buttons

.github/workflows/auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.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'

assets/js/critical/color.js

@@ -20,8 +20,8 @@
   }
 
   const setTheme = function (theme) {
-    if (theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+    if (theme === 'auto') {
-      document.documentElement.setAttribute('data-bs-theme', 'dark')
+      document.documentElement.setAttribute('data-bs-theme', (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'))
     } else {
       document.documentElement.setAttribute('data-bs-theme', theme)
     }

assets/scss/app-dart.scss

@@ -51,8 +51,9 @@
     @include meta.load-css(theme/fonts);
 }
 
-// Import theme placeholder
+// Import theme placeholders
+@import "theme/base.scss";
 @import "theme/theme.scss";
 
-// Import Bootstrap utilities API  (mounted by core Bootstrap module)
+// Import Bootstrap utilities API (mounted by core Bootstrap module)
 @import "modules/bootstrap/utilities/api";

assets/scss/app.scss

@@ -44,17 +44,13 @@
 @import "helpers/colored-links.scss";
 @import "helpers/display.scss";
 
-// TODO: include fonts with following statement in Dart Sass
-// @if $import-fonts {
-//     @include meta.load-css(theme/fonts);
-// }
-
 {{ if (not (hasPrefix (lower site.Params.style.themeFontPath) "http")) }}
     @import "theme/fonts.scss";
 {{ end }}
 
-// Import theme placeholder
+// Import theme placeholders
+@import "theme/base.scss";
 @import "theme/theme.scss";
 
-// Import Bootstrap utilities API  (mounted by core Bootstrap module)
+// Import Bootstrap utilities API (mounted by core Bootstrap module)
 @import "modules/bootstrap/utilities/api";

assets/scss/components/_navbar.scss

@@ -126,6 +126,10 @@
 
 // stylelint-enable annotation-no-unknown
 
+.navbar .dropdown-divider-bg {
+    color: var(--#{$prefix}navbar-color);
+}
+
 :root {
     --dropdown-horizontal-bg: var(--#{$prefix}light);
 }

assets/scss/theme/base.scss

@@ -0,0 +1,2 @@
+// Placeholder for themes extending the core Hinode theme
+// The file is included last in the build pipeline, but prior to theme.scss

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

@@ -162,7 +162,7 @@ arguments:
     parent: cascade
     optional: true
     default: start
-    release: v0.23.0-alpha2
+    release: v0.23.0
     comment: Icon alignment.
     options:
       values:
@@ -173,7 +173,7 @@ arguments:
     type: string
     parent: cascade
     optional: true
-    release: v0.23.0-alpha2
+    release: v0.23.0
     comment: Icon style.
   orientation:
     type: select
@@ -191,15 +191,26 @@ arguments:
     type: bool
     parent: cascade
     optional: true
-    release: v0.23.0-alpha2
+    release: v0.23.0
     comment: Apply subtle background colors.
   button:
     type: bool
     parent: cascade
     optional: true
-    release: v0.23.0-beta
+    release: v0.23.0
     comment: >-
       Flag indicating the cards should include a button that links to the provided address.
+  buttonLabel:
+    type: string
+    optional: true
+    release: v0.23.2
+    comment: >-
+      Label of the link button, defaults to the card title.
+  hook:
+    type: string
+    optional: true
+    comment: Render hook for the image partial.
+    group: partial
 body:
   optional: true
   comment: >-

data/structures/image.yml

@@ -119,4 +119,4 @@ arguments:
     type: string
     optional: true
     comment: Class attribute of the figure caption, e.g. `px-4`.
-    release: v0.23.0-beta
+    release: v0.23.0

exampleSite/config/_default/params.toml

@@ -159,7 +159,6 @@
     themeFontPath = "/fonts" # local path
     themeFontPreload = "/fonts/inter-v12-latin-regular.woff2"
     purge = false # TODO: fix purge setting of example site
-    # purge = true
 # toml-docs-end theme-colors
 
 [schema]

exampleSite/config/postcss.config.js

@@ -12,18 +12,18 @@ const purgecss = require('@fullhuman/postcss-purgecss')({
   dynamicAttributes: ['data-bs-theme'],
   safelist: [
     ...whitelister([
-      '../assets/scss/components/_clipboard.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_clipboard.scss',
-      '../assets/scss/components/_command.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_command.scss',
-      '../assets/scss/components/_nav.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_nav.scss',
-      '../assets/scss/components/_navbar.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_navbar.scss',
-      '../assets/scss/components/_search.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_search.scss',
-      '../assets/scss/components/_syntax.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_syntax.scss',
-      '../assets/scss/components/_syntax-dark.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_syntax-dark.scss',
-      '../assets/scss/components/_syntax-light.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_syntax-light.scss',
-      '../assets/scss/components/_table.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_table.scss',
-      '../assets/scss/components/_video.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/components/_video.scss',
-      '../assets/scss/theme/fonts.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/theme/fonts.scss',
-      '../assets/scss/theme/theme.scss',
+      './_vendor/github.com/gethinode/hinode/assets/scss/theme/theme.scss',
       './_vendor/github.com/gethinode/mod-flexsearch/assets/scss/modules/flexsearch/flexsearch.scss',
       './_vendor/github.com/gethinode/mod-katex/dist/katex.scss',
       './_vendor/github.com/gethinode/mod-leaflet/dist/leaflet.scss',

exampleSite/content/en/about.md

@@ -26,7 +26,7 @@ Additional features include:
 * Support for multiple languages
 * Reusable Bootstrap components through configurable shortcodes and partials
 * Versioned documentation, including sidebar navigation and version switcher
-* Reponsive image handling for multiple screen sizes and resolutions
+* Responsive image handling for multiple screen sizes and resolutions
 * Optimized search results, scoring 100 points for SEO on [PageSpeed Insights]({{< param "links.pagespeed" >}})
 * Secure by default, scoring A+ on [Mozilla Observatory test]({{< param "links.observatory" >}})
 {.tickmark}

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

@@ -125,7 +125,8 @@ En-tête 6 {{</* badge title="Nouveau" */>}}
 
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* card path="about" padding="3" class="col-6 mx-auto" color="body-tertiary" header="publication" footer="none" /*/>}}
+{{</* card path="about" padding="3" class="col-6 mx-auto" color="body-tertiary"
+  header="publication" footer="none" button=true /*/>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->
 

exampleSite/go.mod

@@ -2,4 +2,3 @@ module github.com/gethinode/hinode/exampleSite
 
 go 1.19
 
-require github.com/gethinode/hinode v0.22.5 // indirect

exampleSite/go.sum

@@ -1,3 +1,5 @@
+github.com/gethinode/hinode v0.22.5 h1:zpjSDgWQVbq4BjPduxwexQB18gawFeinzPkaRRTs2Tg=
+github.com/gethinode/hinode v0.22.5/go.mod h1:hsskrlBRnTbpCjrDtGbK8C1VYGML7ezHtCDGDiYL2mQ=
 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-flexsearch v1.9.0 h1:AE+w7QeZTxh36JNTG+CASDLxaqlCZKn+EUD6ulnPGak=

exampleSite/hugo_stats.json

@@ -226,6 +226,7 @@
       "fs-5",
       "fs-6",
       "fs-md-5",
+      "fw-30",
       "fw-bold",
       "fw-semibold",
       "g-0",

go.mod

@@ -4,13 +4,13 @@ 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-flexsearch v1.10.0 // indirect
 	github.com/gethinode/mod-fontawesome v1.8.1 // indirect
-	github.com/gethinode/mod-katex v1.0.5 // indirect
+	github.com/gethinode/mod-katex v1.0.7 // indirect
 	github.com/gethinode/mod-leaflet v1.0.0 // indirect
-	github.com/gethinode/mod-lottie v1.4.3 // indirect
+	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=
@@ -46,6 +50,8 @@ github.com/gethinode/mod-flexsearch v1.8.1 h1:xwPvmmxd8Tdyxp8/rnd9KRGqIDtZs/YwAQ
 github.com/gethinode/mod-flexsearch v1.8.1/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
 github.com/gethinode/mod-flexsearch v1.9.0 h1:AE+w7QeZTxh36JNTG+CASDLxaqlCZKn+EUD6ulnPGak=
 github.com/gethinode/mod-flexsearch v1.9.0/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
+github.com/gethinode/mod-flexsearch v1.10.0 h1:ymlHu5G2635D/h2axG4jgpGS+Vvtzxg07SZX8pJOJSo=
+github.com/gethinode/mod-flexsearch v1.10.0/go.mod h1:L8hrnpupx27cez2ObMX8gWnhbW6qss4HGH1Ea4UaBRQ=
 github.com/gethinode/mod-fontawesome v1.0.2 h1:ZSK6D20/w4y5GnfYfTBB58uHD0ChIfkpKfRGwioS9rg=
 github.com/gethinode/mod-fontawesome v1.0.2/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.1.0 h1:rsDzUI+3ZlS/do2ff3ne8/z3KwHeysmuA+WsXlumXXk=
@@ -94,6 +100,8 @@ github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3
 github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.5 h1:AVhcTINYory0ygChQERf8PcyJkbT1oqhmLRF6ESnWOY=
 github.com/gethinode/mod-katex v1.0.5/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
+github.com/gethinode/mod-katex v1.0.7 h1:FTEhvi3r+O5lPeOxB7OsanFZuAB14yC5fIk3DqhkNyY=
+github.com/gethinode/mod-katex v1.0.7/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-leaflet v0.2.3 h1:QQI4h+IH0jZ7fx4q0um2YIEiYBoW3OAfW8qHzbRCDPk=
 github.com/gethinode/mod-leaflet v0.2.3/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.1 h1:H5MaOa+BB1KuVw7abTqfIn/SNzzRsAyx/WQoSe+2Ykc=
@@ -128,6 +136,8 @@ github.com/gethinode/mod-lottie v1.4.2 h1:rHBhbMVRlkVMxVY+3g1u2kolDv695uL8Zur4mD
 github.com/gethinode/mod-lottie v1.4.2/go.mod h1:H6y1e3/2bBR1ujuM5N1iY39kpyN3RtcSRahX90+tlQI=
 github.com/gethinode/mod-lottie v1.4.3 h1:IKZO8a4yQyPKUwZ6POsZRIH/B++yEzXDe5HxrFF79KA=
 github.com/gethinode/mod-lottie v1.4.3/go.mod h1:nt4wLnDFIhjBGRMuQJJ2bH80VREpbcsBUsdO6uWXjLs=
+github.com/gethinode/mod-lottie v1.4.4 h1:Lv7J+lAMx++aK9h0L7vAgsjyOZgrjux4xPz4Tpza8n4=
+github.com/gethinode/mod-lottie v1.4.4/go.mod h1:7tsZjlFgMlj2iWBIS9uOtHHsCrfx9W7S8OsBrZeSVGU=
 github.com/gethinode/mod-utils v1.0.0 h1:cqHm2xS5uDiJzRm1KfHaNbq6uMVDKLhQa8/BuTZ1nhY=
 github.com/gethinode/mod-utils v1.0.0/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
 github.com/gethinode/mod-utils v1.0.1 h1:jhZGlGFHHL1f5HXbBMXfiZ2gCz4TVafAzjnRPTIBSEE=
@@ -158,3 +168,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=

i18n/fr.yaml

@@ -29,6 +29,8 @@
   translation: "Aucun articles trouvé"
 - id: emptyTags
   translation: "Aucun tags trouvé"
+- id: readMore
+  translation: "Lire plus"
 
 # Languages
 - id: lang_de

i18n/pl.yaml

@@ -0,0 +1,149 @@
+# Single pages
+- id: postedOnDate
+  translation: "Opublikowano {{ . }}"
+- id: lastModified
+  translation: "Ostatnia modyfikacja {{ . }}"
+- id: read
+  translation: "czytania"
+- id: minutesShort
+  translation: "min"
+- id: words
+  translation: "słów"
+- id: photoFull
+  translation: "Zdjęcie autorstwa %s z %s"
+- id: photoShort
+  translation: "Zdjęcie autorstwa {{ . }}"
+- id: photoOn
+  translation: "z"
+- id: draft
+  translation: "Wersja robocza"
+
+# List pages
+- id: article
+  translation: "Artykuł"
+- id: articles
+  translation: "Artykuły"
+- id: more
+  translation: "Więcej {{ . }}"
+- id: emptyList
+  translation: "Brak artykułów"
+- id: emptyTags
+  translation: "Brak tagów"
+
+# Languages
+- id: lang_de
+  translation: "Niemiecki"
+- id: lang_en
+  translation: "Angielski"
+- id: lang_nl
+  translation: "Niderlandzki"
+- id: lang_fr
+  translation: "Francuski"
+
+# Sharing
+- id: shareLink
+  translation: "Udostępnij przez {{ . }}"
+- id: shareSystem
+  translation: "system"
+- id: copyToClipboard
+  translation: "skopiuj do schowka"
+- id: copiedToClipboard
+  translation: "skopiowany do schowka"
+- id: link
+  translation: "Link"
+- id: code
+  translation: "Kod"
+- id: download
+  translation: "Pobierz artykuł"
+
+# Pagination
+- id: paginationNav
+  translation: "Nawigacja strony"
+- id: paginationPrevious
+  translation: "Poprzednia strona"
+- id: paginationNext
+  translation: "Następna strona"
+- id: paginationFirst
+  translation: "Pierwsza strona"
+- id: paginationLast
+  translation: "Ostatnia strona"
+
+# Navigation
+- id: colorMode
+  translation: "Tryb koloru"
+- id: colorLight
+  translation: "Jasny"
+- id: colorDark
+  translation: "Ciemny"
+- id: colorAuto
+  translation: "Automatyczny"
+- id: toggleMainNav
+  translation: "Przełącz główną nawigację"
+- id: home
+  translation: "Strona główna"
+- id: languageSwitcherLabel
+  translation: "Język"
+- id: close
+  translation: "Zamknij"
+
+# Table of contents
+- id: toc
+  translation: "Na tej stronie"
+- id: seeAlso
+  translation: "Zobacz również"
+- id: sectionMenu
+  translation: "Wybierz temat"
+
+# Sidebar
+- id: toggleSidebar
+  translation: "Przełącz nawigację na pasku bocznym"
+
+# Feature
+- id: addedFeature
+  translation: "Dodano w {{ . }}"
+- id: deprecatedFeature
+  translation: "Stała się przestarzała w {{ . }}"
+
+# Versioning
+- id: latest
+  translation: "najnowsza"
+- id: allVersions
+  translation: "Wszystkie wersje"
+- id: newerVersionAlert
+  translation: "Jest dostępna nowsza wersja {{ . }}!"
+
+# 404 page
+- id: pageNotFound
+  translation: "Strona, której szukasz nie istnieje albo wystąpił inny błąd. Spróbuj wrócić do naszej {{ . }}."
+- id: pageNotFoundTitle
+  translation: "Nie znaleziono strony"
+- id: pageNotFoundHome
+  translation: "strony głównej"
+
+# Footer
+- id: copyright
+  translation: "Copyright"
+- id: rights
+  translation: "Wszelkie prawa zastrzeżone"
+- id: poweredBy
+  translation: "Strona oparta o {{ . }}."
+
+# Comments
+- id: show
+  translation: "Pokaż"
+- id: comments
+  translation: "Komentarze" 
+
+# Arguments
+- id: name
+  translation: "Nazwa"
+- id: type
+  translation: "Typ"
+- id: required 
+  translation: "Wymagany"
+- id: default
+  translation: "Domyślny"
+- id: comment
+  translation: Komentarz
+- id: supportedValues
+  translation: "Obsługiwane wartości"

layouts/partials/assets/card-group.html

@@ -32,12 +32,14 @@
 {{- $subtle := .subtle }}
 {{- $loading := .loading -}}
 {{- $button := .button -}}
+{{- $buttonLabel := .buttonLabel -}}
+{{- $hook := .hook | default "assets/card.html" }}
 
 <!-- Override arguments -->
 {{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $pages) }}
 {{ $paginator := "" }}
 {{ if and $isPages $paginate }}
-    {{ $paginator = $page.Paginate $pages }}
+    {{ $paginator = $page.Paginate $pages .max }}
     {{ $pages = first $paginator.PageSize (after (mul (sub $paginator.PageNumber 1) $paginator.PageSize) $pages) }}
 {{ end }}
 
@@ -103,11 +105,12 @@
                 "style" $style
                 "align" $align
                 "button" $button
+                "buttonLabel" $buttonLabel
             ) -}}
             {{- $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">
@@ -118,7 +121,7 @@
         {{if $cards }}{{- print $cards | safeHTML }}{{ end }}
     </div>
 
-    {{ if $paginate }}
+    {{ if $paginator }}
         {{- if gt $paginator.TotalPages 1 -}}
             <div class="pt-3">{{ partial "assets/pagination.html" (dict "page" $page "format" "terse") }}</div>
         {{- end -}} 

layouts/partials/assets/card.html

@@ -30,6 +30,7 @@
 {{- $title := .title -}}
 {{- $subtle := .subtle -}}
 {{- $button := .button -}}
+{{- $buttonLabel := .buttonLabel -}}
 {{- $colorStyle := "" -}}
 {{ if $color }}
     {{ if $subtle }}
@@ -38,6 +39,7 @@
         {{- $colorStyle = printf "bg-%s text-bg-%s" $color $color -}}
     {{ end }}
 {{ end }}
+{{- $hook := .hook | default "assets/image.html" }}
 
 <!-- Override arguments -->
 {{- $page := "" }}
@@ -75,12 +77,16 @@
     {{- 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 }}">
+                {{ . | 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">{{ . | safeHTML }}</div>{{ end -}}
         </div>
     {{- end -}}
 {{- end -}}
@@ -125,7 +131,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)) -}}
@@ -140,7 +146,8 @@
                     </div>
                     {{ if $page }}<div>{{ partial "card-caption.html" (dict "page" $page "keywords" $footer "color" $color) }}</div>{{ end }}
                     {{ if $button }}
-                        <div>{{ partial "assets/button.html" (dict "title" (T "readMore") "href" $href "outline" true "size" "sm" "class" "card-button mb-n4") }}</div>
+                        {{ $label := (or $buttonLabel $title) | default (T "readMore") }}
+                        <div class="d-flex align-items-end">{{ partial "assets/button.html" (dict "title" $label "icon" "fas chevron-right" "href" $href "outline" true "size" "sm" "class" "card-button mb-n4") }}</div>
                     {{ end }}
                 </div>
             </div>
@@ -150,7 +157,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)) -}}
@@ -162,10 +169,11 @@
             {{ if $page }}{{- partial "card-caption.html" (dict "page" $page "keywords" $footer "color" $color) -}}{{ end }}
         </div>
         {{ if $button }}
+            {{ $label := (or $buttonLabel $title) | default (T "readMore") }}
             <div class="row p-{{ $padding }}" >
                 <div class="{{ if eq $orientation "horizontal-sm" }}col-4 col-md-2{{ else if eq $orientation "horizontal" }}col-4{{ end }}"></div>
-                <div class="col {{ if eq $orientation "horizontal-sm" }}px-2{{ else if eq $orientation "horizontal"}}px-1 {{ else }}px-2 pt-1{{ end }}">
+                <div class="col d-flex align-items-end {{ if eq $orientation "horizontal-sm" }}px-2{{ else if eq $orientation "horizontal"}}px-1 {{ else }}px-2 pt-1{{ end }}">
-                    {{ partial "assets/button.html" (dict "title" (T "readMore") "href" $href "outline" true "size" "sm" "class" "card-button") }}
+                    {{ partial "assets/button.html" (dict "title" $label "href" $href "outline" true "size" "sm" "class" "card-button") }}
                 </div>
             </div>
         {{ end }}

layouts/partials/assets/download.html

@@ -1,4 +1,5 @@
 {{- $download := partial "utilities/GetTargetPath.html" (dict "path" .download "page" page) -}}
+{{- $title := .title }}
 {{- $color := .color | default "primary" -}}
 {{- $outline := .outline | default true -}}
 {{- $icon := .icon | default "fas download" -}}
@@ -8,17 +9,18 @@
 {{- $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 }}
-    {{ $title := "" }}
+    {{ if not $title }}
-    {{ if not $minimal }}{{ $title = (T "download" ) }}{{ end }}
+        {{ if not $minimal }}{{ $title = (T "download" ) }}{{ end }}
-    {{ $lang := strings.TrimPrefix "." (path.Ext (path.BaseName .)) }}
+        {{ $lang := strings.TrimPrefix "." (path.Ext (path.BaseName .)) }}
-    {{ if and $lang (ne (string site.LanguageCode) $lang) }}
+        {{ if and $lang (ne (string site.LanguageCode) $lang) }}
-        {{ range site.Languages }}
+            {{ range site.Languages }}
-            {{ if eq .LanguageCode $lang }}
+                {{ if eq .LanguageCode $lang }}
-                {{ $title = printf "%s (%s)" (T "download") (T (printf "lang_%s" .LanguageCode)) }}
+                    {{ $title = printf "%s (%s)" (T "download") (T (printf "lang_%s" .LanguageCode)) }}
+                {{ end }}
             {{ end }}
         {{ end }}
     {{ end }}

layouts/partials/assets/navbar.html

@@ -186,13 +186,13 @@
             <!-- Insert sidebar toggler when applicable -->
             <div class="d-flex align-items-center">
                 {{- if $page.Scratch.Get "sidebar" -}}
-                    <button class="navbar-toggler collapsed p-0 mx-auto" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvass-sidebar" aria-controls="offcanvass-sidebar" aria-label="{{ T "toggleSidebar" }}">
+                    <button class="navbar-toggler collapsed p-0 mx-auto fw-30" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvass-sidebar" aria-controls="offcanvass-sidebar" aria-label="{{ T "toggleSidebar" }}">
-                        {{- partial "assets/icon.html" (dict "icon" "fas ellipsis fa-fw") -}}
+                        {{- partial "assets/icon.html" (dict "icon" "fas ellipsis fa-fw" "spacing" false) -}}
                     </button>
                 {{- else -}}
                     <!-- Insert invisible sidebar toggler to center logo correctly on smaller screens -->
-                    <button class="navbar-toggler collapsed p-0 mx-auto invisible" type="button">
+                    <button class="navbar-toggler collapsed p-0 mx-auto invisible fw-30" type="button">
-                        {{- partial "assets/icon.html" (dict "icon" "fas ellipsis fa-fw") -}}
+                        {{- partial "assets/icon.html" (dict "icon" "fas ellipsis fa-fw" "spacing" false) -}}
                     </button>
                 {{- end -}}
             </div>

layouts/partials/assets/section-menu.html

@@ -30,20 +30,20 @@
             "icon" "fas sort"
             "justify" "between"
             "collapse" "toc-collapse"
-            "order" "last") 
+            "order" "last"
+            "spacing" false
+            ) 
         -}}
     </div>
 
-    <p>
+    <div class="collapse border bg-body-tertiary rounded p-1 navbar-nav-scroll" id="toc-collapse">
-        <div class="collapse border bg-body-tertiary rounded p-1 navbar-nav-scroll" id="toc-collapse">
+        <div class="toc toc-panel section-menu text-body p-2 fs-6">
-            <div class="toc toc-panel section-menu text-body p-2 fs-6">
+            {{- range $items }}
-                    {{- range $items }}
+                {{ $active := eq $page.RelPermalink .RelPermalink }}
-                        {{ $active := eq $page.RelPermalink .RelPermalink }}
+                <a class="nav-link{{ if $active }} active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a>
-                        <a class="nav-link{{ if $active }} active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a>
+            {{- end }}
-                    {{- end }}
-            </div>
         </div>
-    </p>
+    </div>
 
     <nav class="navbar navbar-expand navbar-services p-0 fs-5 d-none d-md-block">
         <div class="container-fluid p-0 pb-3">

layouts/partials/assets/sharing.html

@@ -62,8 +62,17 @@
                 {{ partial "assets/button.html" (dict "href" "#!" "icon" "fas share-nodes fa-fw" "id" "btn-webshare" "class" "btn-social p-0" "attributes" $attr "label" (T "shareLink" (T "shareSystem")) "spacing" false) }}
             {{- end -}}
             {{ with $download }}
+                {{ $label := (T "download" ) }}
+                {{ $lang := strings.TrimPrefix "." (path.Ext (path.BaseName .)) }}
+                {{ if and $lang (ne (string site.LanguageCode) $lang) }}
+                    {{ range site.Languages }}
+                        {{ if eq .LanguageCode $lang }}
+                            {{ $label = printf "%s (%s)" (T "download") (T (printf "lang_%s" .LanguageCode)) }}
+                        {{ end }}
+                    {{ end }}
+                {{ end }}
                 {{ $attr := dict "download" (path.Base .) }}
-                {{ partial "assets/button.html" (dict "href" . "icon" "fas download fa-fw" "class" "btn-social p-0" "attributes" $attr "spacing" false) }}
+                {{ partial "assets/button.html" (dict "href" . "icon" "fas download fa-fw" "label" $label "class" "btn-social p-0" "attributes" $attr "spacing" false) }}
             {{- end -}}
         </div>
     {{- end -}}

layouts/partials/head/icons.html

@@ -35,7 +35,7 @@
     {{- end }}
 {{- end -}}
 
-{{- range $index, $element := resources.Match "icons/**.svg" -}}
+{{- range resources.Match "icons/**.svg" -}}
-    {{- $icon := resources.Get $element | resources.ExecuteAsTemplate $element $params -}}
+    {{- $icon := . | resources.ExecuteAsTemplate .RelPermalink $params -}}
     {{- $icon.Publish -}}
 {{- end -}}

layouts/shortcodes/image.html

@@ -19,6 +19,7 @@
 {{- $class := "" -}}
 {{- $title := "" -}}
 {{- $caption := "" -}}
+{{- $figclass := "" -}}
 {{- $mode := false -}}
 {{- $portrait := false -}}
 {{- $loading := "" -}}
@@ -33,6 +34,7 @@
     {{- $loading = .Get "loading" | default "" -}}
     {{ $title = .Get "title" | default "" -}}
     {{ $caption = .Get "caption" | default "" -}}
+    {{ $figclass = .Get "figclass" | default "" -}}
     {{ with .Get "mode" }}{{ $mode = partial "utilities/CastBool.html" . }}{{ end -}}
     {{ with .Get "portrait" }}{{ $portrait = partial "utilities/CastBool.html" . }}{{ end -}}
 {{ else -}}
@@ -53,6 +55,7 @@
         "class" $class
         "title" $title
         "caption" $caption
+        "figclass" $figclass
         "mode" $mode
         "portrait" $portrait
         "loading" $loading

netlify.toml

@@ -4,8 +4,8 @@
     command = "npm run build:example"
 
 [build.environment]
-    DART_SASS_VERSION = "1.71.1"
+    DART_SASS_VERSION = "1.72.0"
-    HUGO_VERSION = "0.122.0"
+    HUGO_VERSION = "0.124.0"
     HUGO_ENV = "production"
     HUGO_ENABLEGITINFO = "true"
     NODE_VERSION = "18.19.1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.23.0-beta6",
+  "version": "0.23.6",
   "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",
+    "autoprefixer": "^10.4.19",
-    "cssnano": "^6.0.4",
+    "cssnano": "^6.1.2",
-    "cssnano-preset-advanced": "^6.0.4",
+    "cssnano-preset-advanced": "^6.1.2",
-    "eslint": "^8.56.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.121.1",
     "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": "^16.3.1",
-    "stylelint-config-standard-scss": "^11.1.0"
+    "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"