Merge pull request #750 from gethinode/develop

Restrict max range

README.md

@@ -75,6 +75,14 @@ The installation instructions in this readme install Hinode as a regular Hugo th
 
 ## Installation
 
+<!-- markdownlint-disable MD033 -->
+<details>
+<summary>Installation notes for Windows</summary>
+
+The installation for Windows requires PowerShell v7. Download it from the Microsoft Store as needed. Check your current version with the command `$PSVersionTable`.
+</details>
+<!-- markdownlint-enable MD033 -->
+
 Start a new Hinode project in three steps:
 
 1. **Create a new site**
@@ -83,14 +91,15 @@ Start a new Hinode project in three steps:
     hugo new site my-hinode-site && cd my-hinode-site
     ```
 
-1. **Initialize the module system**
+2. **Initialize the module system**
 
     ```bash
     hugo mod init example.com/my-hinode-site
-    echo "[[module.imports]]\npath = 'github.com/gethinode/hinode'" >> hugo.toml
+    echo "[[module.imports]]" >> hugo.toml
+    echo "path = 'github.com/gethinode/hinode'" >> hugo.toml
     ```
 
-1. **Start a development server**
+3. **Start a development server**
 
     ```bash
     hugo server

assets/scss/components/_navbar.scss

@@ -5,6 +5,7 @@
 
 .navbar {
     --bs-navbar-expanded-color: var(--bs-body-bg);
+    --bs-navbar-toggler-color: var(--bs-navbar-hover-color);
 
     transition: 0.5s ease-in-out;
     background-color: transparent;
@@ -16,6 +17,7 @@
 
 .nav-active, .navbar-expanded {
     background-color: var(--bs-navbar-expanded-color);
+    border-bottom: 1px solid var(--bs-secondary-bg);
 }
 
 .nav-link {
@@ -32,6 +34,7 @@
     --bs-navbar-hover-color: white !important;
     --bs-navbar-disabled-color: white !important;
     --bs-navbar-active-color: white !important;
+    --bs-navbar-toggler-color: white;
 }
 
 .navbar-expanded {
@@ -46,6 +49,7 @@
     --bs-navbar-brand-color: #{$navbar-dark-brand-color};
     --bs-navbar-brand-hover-color: #{$navbar-dark-brand-hover-color};
     --bs-navbar-toggler-border-color: #{$navbar-dark-toggler-border-color};
+    --bs-navbar-toggler-color: white;
 }
 
 .navbar-overlay-light, .navbar-overlay-dark.nav-active, .navbar-overlay-dark.navbar-expanded {
@@ -56,6 +60,7 @@
     --bs-navbar-brand-color: #{$navbar-light-brand-color};
     --bs-navbar-brand-hover-color: #{$navbar-light-brand-hover-color};
     --bs-navbar-toggler-border-color: #{$navbar-light-toggler-border-color};
+    --bs-navbar-toggler-color: black;
 }
 
 .nav-item .vr {
@@ -128,19 +133,11 @@
 
 /* Color of Toggler when collapsed */
 .navbar-toggler.collapsed .toggler-icon {
-    background-color: #777;
+    background-color: var(--bs-navbar-toggler-color);
 }
 
-.emphasis-light {
+.emphasis, .emphasis-dark, .emphasis-light {
-    background-color: $black if($enable-important-utilities, !important, null);
+    background-color: var(--bs-navbar-toggler-color);
-}
-
-.emphasis-dark {
-    background-color: $white if($enable-important-utilities, !important, null);
-}
-
-.emphasis {
-    background-color: $black if($enable-important-utilities, !important, null);
 }
 
 @include color-mode(dark) {

config/_default/params.toml

@@ -24,6 +24,9 @@
     disableTemplate = ["katex"]
     [modules.katex]
         state = "defer"
+    [modules.flexsearch]
+        frontmatter = false
+        filter = ""
     [modules.fontawesome]
         inline = true
         debug = true

data/structures/card-group.yml

@@ -27,10 +27,11 @@ arguments:
     release: v0.19.0
   list:
     type:
-      - page.Pages
+      - 'page.Pages'
-      - resource.Resources
+      - 'resource.Resources'
+      - '[]map[string]interface {}'
     optional: true
-    comment: Array of pages to be rendered as cards.
+    comment: Array of pages or structured content to be rendered as cards.
     group: partial
   cards:
     type: string
@@ -42,6 +43,9 @@ arguments:
     optional: true
     comment: Maximum number of cards to display.
     group: partial
+    options:
+      min: 1
+      max: 10
   cols:
     type: select
     optional: true

data/structures/card.yml

@@ -159,6 +159,7 @@ arguments:
       Font Awesome icon, displayed on top or the left of the card.
   align:
     type: select
+    parent: cascade
     optional: true
     default: start
     release: v0.23.0-alpha2
@@ -170,6 +171,7 @@ arguments:
         - center
   style:
     type: string
+    parent: cascade
     optional: true
     release: v0.23.0-alpha2
     comment: Icon style.
@@ -187,6 +189,7 @@ arguments:
         - none
   subtle:
     type: bool
+    parent: cascade
     optional: true
     release: v0.23.0-alpha2
     comment: Apply subtle background colors.

exampleSite/config/_default/params.toml

@@ -20,6 +20,9 @@
     disableTemplate = ["katex"]
     [modules.katex]
         state = "defer"
+    [modules.flexsearch]
+        frontmatter = false
+        filter = ""
     [modules.fontawesome]
         inline = true
         debug = true
@@ -129,7 +132,7 @@
         padding = "3"
         header = "none"
         footer = "tags"
-        orientation = "horizontal-sm"
+        orientation = "horizontal"
         style = "border-1 card-emphasize"
         homepage = 3
         separator = false

exampleSite/content/en/about.md

@@ -8,7 +8,7 @@ showComments: false
 
 {{< image src="/img/logo_var.svg#logo" class="img-fluid w-50" wrapper="text-center" >}}
 
-{{< card-group class="text-center border-0" padding="3" >}}
+{{< card-group align="center" class="border-0" padding="3" >}}
     {{< card title="Bootstrap framework" icon="fab bootstrap" >}}
         Build fast, responsive sites with Bootstrap 5. Easily customize your site with the source Sass files.
     {{< /card >}}

exampleSite/content/fr/about.md

@@ -9,7 +9,7 @@ showComments: false
 
 {{< image src="/img/logo_var.svg#logo" class="img-fluid w-50" wrapper="text-center" >}}
 
-{{< card-group class="text-center border-0" padding="3" >}}
+{{< card-group align="center" class="border-0" padding="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.
     {{< /card >}}

exampleSite/content/nl/about.md

@@ -10,7 +10,7 @@ showComments: false
 
 {{< image src="/img/logo_var.svg#logo" class="img-fluid w-50" wrapper="text-center" >}}
 
-{{< card-group class="text-center border-0" padding="3" >}}
+{{< card-group align="center" class="border-0" padding="3" >}}
     {{< card title="Bootstrap raamwerk" icon="fab bootstrap" >}}
         Bouw snelle websites geschikt voor mobiele en desktop schermen met Bootstrap 5. Pas de site eenvoudig aan met bronbestanden in Sass.
     {{< /card >}}

exampleSite/hugo_stats.json

@@ -126,11 +126,13 @@
       "col-3",
       "col-4",
       "col-6",
+      "col-8",
       "col-9",
       "col-auto",
       "col-lg-2",
       "col-lg-4",
       "col-lg-8",
+      "col-md-10",
       "col-md-2",
       "col-md-3",
       "col-md-4",

go.mod

@@ -5,12 +5,12 @@ 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-flexsearch v1.8.1 // indirect
+	github.com/gethinode/mod-flexsearch v1.9.0 // indirect
 	github.com/gethinode/mod-fontawesome v1.8.0 // indirect
 	github.com/gethinode/mod-katex v1.0.5 // indirect
 	github.com/gethinode/mod-leaflet v0.4.0 // indirect
 	github.com/gethinode/mod-lottie v1.4.1 // indirect
-	github.com/gethinode/mod-utils v1.0.3 // indirect
+	github.com/gethinode/mod-utils v1.0.4 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 // indirect
 	github.com/twbs/bootstrap v5.3.2+incompatible // indirect
 )

go.sum

@@ -44,6 +44,8 @@ github.com/gethinode/mod-flexsearch v1.8.0 h1:rKu9ackmbGAD/CRJYUDUhy/3nDCEj0IgYD
 github.com/gethinode/mod-flexsearch v1.8.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.8.1 h1:xwPvmmxd8Tdyxp8/rnd9KRGqIDtZs/YwAQJ1i9oQMiM=
 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-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=
@@ -126,6 +128,8 @@ github.com/gethinode/mod-utils v1.0.2 h1:0b3i+/bBHY1Td9N6khDbL1nf3d5HGc4QzI4BbEW
 github.com/gethinode/mod-utils v1.0.2/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
 github.com/gethinode/mod-utils v1.0.3 h1:FF6lnam0Bcdj7G1E5P+qi5ByPrl1npL+3uS5YoPx1C0=
 github.com/gethinode/mod-utils v1.0.3/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
+github.com/gethinode/mod-utils v1.0.4 h1:Lr7hAVaWHv0O5TJXhRHGhvlOvWwIATJm9mpLQhCsopM=
+github.com/gethinode/mod-utils v1.0.4/go.mod h1:ONJm3pHCq7nvaPNjusLZNCeCbhOhSBH4HVKHwK1FdYE=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3 h1:H/qVR5O4BXjRjD+5PZB+r4ug2BSJ2Of4RtwOntd+OKo=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg=

layouts/partials/assets/breadcrumb.html

@@ -16,18 +16,20 @@
 {{ $page := .page }}
 
 <!-- Main code -->
-<nav aria-label="breadcrumb">
+{{ if not $error }}
-    <ol class="breadcrumb">
+    <nav aria-label="breadcrumb">
-        {{- range $index, $item := $page.Ancestors.Reverse -}}
+        <ol class="breadcrumb">
-            {{- $title := .LinkTitle -}}
+            {{- range $index, $item := $page.Ancestors.Reverse -}}
-            {{- if .IsHome }}{{ $title = T "home" }}{{ end -}} 
+                {{- $title := .LinkTitle -}}
-            {{- $address := or .RelPermalink (.Params.Redirect | relLangURL) -}}
+                {{- if .IsHome }}{{ $title = T "home" }}{{ end -}} 
-            {{ if $address }}
+                {{- $address := or .RelPermalink (.Params.Redirect | relLangURL) -}}
-                <li class="breadcrumb-item"><a href="{{ $address }}">{{ $title }}</a></li>
+                {{ if $address }}
-            {{ else }}
+                    <li class="breadcrumb-item"><a href="{{ $address }}">{{ $title }}</a></li>
-                <li class="breadcrumb-item">{{ $title }}</li>
+                {{ else }}
-            {{ end }}
+                    <li class="breadcrumb-item">{{ $title }}</li>
-        {{- end -}}
+                {{ end }}
-        <li class="breadcrumb-item active" aria-current="page">{{ $page.LinkTitle }}</li>
+            {{- end -}}
-    </ol>
+            <li class="breadcrumb-item active" aria-current="page">{{ $page.LinkTitle }}</li>
-</nav>
+        </ol>
+    </nav>
+{{ end }}

layouts/partials/assets/card-group.html

@@ -33,31 +33,36 @@
 {{- $loading := .loading -}}
 
 <!-- Override arguments -->
+{{ $isPages := in (slice "page.Pages" "resource.Resources") (printf "%T" $pages) }}
 {{ $paginator := "" }}
-{{ if $paginate }}
+{{ if and $isPages $paginate }}
     {{ $paginator = $page.Paginate $pages }}
     {{ $pages = first $paginator.PageSize (after (mul (sub $paginator.PageNumber 1) $paginator.PageSize) $pages) }}
 {{ end }}
 
 {{ $list := slice }}
-{{ range $index, $element := $pages }}
+{{ if $isPages }}
-    {{ $params := dict }}
+    {{ range $index, $element := $pages }}
-    <!-- regular page -->
+        {{ $params := dict }}
-    {{- if and $element.RelPermalink $element.File -}}
+        <!-- regular page -->
-        {{- $params = merge $params (dict "path" $element.File.Path) -}}
+        {{- if and $element.RelPermalink $element.File -}}
-    <!-- headless page -->
+            {{- $params = merge $params (dict "path" $element.File.Path) -}}
-    {{- else -}}
+        <!-- headless page -->
-        {{- $thumbnail := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.url) $element.Params.Thumbnail) -}}
+        {{- else -}}
-        {{- $params = merge $params (dict
+            {{- $thumbnail := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.url) $element.Params.Thumbnail) -}}
-            "title" $element.Title
+            {{- $params = merge $params (dict
-            "href" $element.RelPermalink
+                "title" $element.Title
-            "description" (partial "utilities/GetDescription.html" $element)
+                "href" $element.RelPermalink
-            "thumbnail" $thumbnail
+                "description" (partial "utilities/GetDescription.html" $element)
-            "icon" $element.Params.icon
+                "thumbnail" $thumbnail
-        ) -}}
+                "icon" $element.Params.icon
-    {{- end -}}
+            ) -}}
+        {{- end -}}
 
-    {{- $list = $list | append $params }}
+        {{- $list = $list | append $params }}
+    {{ end }}
+{{ else if $pages }}
+    {{ $list = $list | append $pages }}
 {{ end }}
 
 {{- $count := len $list -}}

layouts/partials/assets/card.html

@@ -24,7 +24,7 @@
 {{- $style := .style | default "" -}}
 {{- $loading := .loading -}}
 {{- $orientation := .orientation | default "stacked" -}}
-{{- $padding := .padding | default "auto" -}}
+{{- $padding := (string .padding) | default "auto" -}}
 {{- $ratio := .ratio -}}
 {{- $thumbnail := .thumbnail -}}
 {{- $title := .title -}}
@@ -121,7 +121,7 @@
     <!-- Render horizontal card -->
     <div class="card {{ $colorStyle }} {{ $class }}">
         <div class="row g-0 row-cols-1 h-100">
-            <div class="{{ if eq $orientation "horizontal-sm" }}col-2{{ else }}col-4{{ 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) -}}
                 {{- else if $icon -}}
@@ -130,7 +130,7 @@
                     </div>
                 {{- end -}}
             </div>
-            <div class="{{ if eq $orientation "horizontal-sm" }}col-10{{ else }}col-8{{ end }}">
+            <div class="{{ if eq $orientation "horizontal-sm" }}col-8 col-md-10{{ else }}col-8{{ end }}">
                 <div class="card-body d-flex p-{{ $padding }} flex-column h-100">
                     {{ if $page }}<div>{{ partial "card-caption.html" (dict "page" $page "keywords" $header "color" $color) }}</div>{{ end }}
                     <div class="h-100">

package-lock.json

@@ -1,17 +1,17 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha2",
+  "version": "0.23.0-alpha6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.23.0-alpha2",
+      "version": "0.23.0-alpha6",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",
         "@gethinode/netlify-plugin-dartsass": "^0.2.0",
-        "@netlify/plugin-lighthouse": "^5.0.0",
+        "@netlify/plugin-lighthouse": "^6.0.0",
         "autoprefixer": "^10.4.17",
         "cssnano": "^6.0.3",
         "cssnano-preset-advanced": "^6.0.3",
@@ -20,7 +20,7 @@
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-n": "^16.6.2",
         "eslint-plugin-promise": "^6.1.1",
-        "hugo-bin": "^0.118.1",
+        "hugo-bin": "^0.119.0",
         "markdownlint-cli2": "^0.12.1",
         "netlify-plugin-hugo-cache-resources": "^0.2.1",
         "npm-run-all": "^4.1.5",
@@ -562,9 +562,9 @@
       }
     },
     "node_modules/@netlify/plugin-lighthouse": {
-      "version": "5.0.0",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugin-lighthouse/-/plugin-lighthouse-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@netlify/plugin-lighthouse/-/plugin-lighthouse-6.0.0.tgz",
-      "integrity": "sha512-tCaoVYxCU3OB592vChtFkANzUL4kDUNaIk9VCGp3qBecBnH+yFrILUlcqy2d08Is4ecstjTacyHqV+ixKbNYGQ==",
+      "integrity": "sha512-Uqqy9A7huuDT+1RIBWDoWhp+ntlLE1ibp1jXFpiizWy8QProWkLm8E7PFLu0Bf+aAwgjV2eJPj6ocIbk+jBANQ==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.1.0",
@@ -577,7 +577,7 @@
         "puppeteer": "^18.0.0"
       },
       "engines": {
-        "node": ">=14.15 <20"
+        "node": ">=18.14.0"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -4365,9 +4365,9 @@
       "dev": true
     },
     "node_modules/hugo-bin": {
-      "version": "0.118.1",
+      "version": "0.119.0",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.118.1.tgz",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.119.0.tgz",
-      "integrity": "sha512-WIS4kLNySb5u2+iwk//N7ClLUCksmyjvqdkGQTFc5v7Bqjpn1yLcIIBWwxU3R4SBc2Lr772/auxlzzsRffGbVA==",
+      "integrity": "sha512-RnjlxHKdOjo7i7yRX/001t53142tC9NTa5JVrnPCTpX2kNQQCz5XdI/WWX7emf0dNkxipj55Z58EsA2ft9W16g==",
       "dev": true,
       "funding": [
         {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha2",
+  "version": "0.23.0-alpha6",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",
@@ -69,7 +69,7 @@
   "devDependencies": {
     "@fullhuman/postcss-purgecss": "^5.0.0",
     "@gethinode/netlify-plugin-dartsass": "^0.2.0",
-    "@netlify/plugin-lighthouse": "^5.0.0",
+    "@netlify/plugin-lighthouse": "^6.0.0",
     "autoprefixer": "^10.4.17",
     "cssnano": "^6.0.3",
     "cssnano-preset-advanced": "^6.0.3",
@@ -78,7 +78,7 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-promise": "^6.1.1",
-    "hugo-bin": "^0.118.1",
+    "hugo-bin": "^0.119.0",
     "markdownlint-cli2": "^0.12.1",
     "netlify-plugin-hugo-cache-resources": "^0.2.1",
     "npm-run-all": "^4.1.5",