Merge pull request #743 from gethinode/develop

Refine responsive icon size on cards
Merge branch 'main' into develop
2025-10-15 14:03:19 +00:00 · 2024-02-03 05:29:15 +01:00 · 2024-02-03 05:14:42 +01:00 · 2024-02-03 05:13:45 +01:00 · 2024-01-31 13:45:11 +00:00 · 2024-01-31 13:39:13 +00:00
12 changed files with 69 additions and 55 deletions
--- a/README.md
+++ b/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
--- a/assets/scss/components/_navbar.scss
+++ b/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;
@@ -32,6 +33,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 +48,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 +59,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 +132,11 @@

 /* Color of Toggler when collapsed */
 .navbar-toggler.collapsed .toggler-icon {
-    background-color: #777;
+    background-color: var(--bs-navbar-toggler-color);
 }

-.emphasis-light {
-    background-color: $black if($enable-important-utilities, !important, null);
-}
-
-.emphasis-dark {
-    background-color: $white if($enable-important-utilities, !important, null);
-}
-
-.emphasis {
-    background-color: $black if($enable-important-utilities, !important, null);
+.emphasis, .emphasis-dark, .emphasis-light {
+    background-color: var(--bs-navbar-toggler-color);
 }

@include color-mode(dark) {
--- a/data/structures/card-group.yml
+++ b/data/structures/card-group.yml
@@ -27,10 +27,11 @@ arguments:
    release: v0.19.0
  list:
    type:
-      - page.Pages
-      - resource.Resources
+      - 'page.Pages'
+      - '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
--- a/data/structures/card.yml
+++ b/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.
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@@ -129,7 +129,7 @@
        padding = "3"
        header = "none"
        footer = "tags"
-        orientation = "horizontal-sm"
+        orientation = "horizontal"
        style = "border-1 card-emphasize"
        homepage = 3
        separator = false
--- a/exampleSite/content/en/about.md
+++ b/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 >}}
--- a/exampleSite/content/fr/about.md
+++ b/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 >}}
--- a/exampleSite/content/nl/about.md
+++ b/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 >}}
--- a/layouts/partials/assets/card-group.html
+++ b/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 }}
-    {{ $params := dict }}
-    <!-- regular page -->
-    {{- if and $element.RelPermalink $element.File -}}
-        {{- $params = merge $params (dict "path" $element.File.Path) -}}
-    <!-- headless page -->
-    {{- else -}}
-        {{- $thumbnail := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.url) $element.Params.Thumbnail) -}}
-        {{- $params = merge $params (dict
-            "title" $element.Title
-            "href" $element.RelPermalink
-            "description" (partial "utilities/GetDescription.html" $element)
-            "thumbnail" $thumbnail
-            "icon" $element.Params.icon
-        ) -}}
-    {{- end -}}
+{{ if $isPages }}
+    {{ range $index, $element := $pages }}
+        {{ $params := dict }}
+        <!-- regular page -->
+        {{- if and $element.RelPermalink $element.File -}}
+            {{- $params = merge $params (dict "path" $element.File.Path) -}}
+        <!-- headless page -->
+        {{- else -}}
+            {{- $thumbnail := (or (and (reflect.IsMap $element.Params.Thumbnail) $element.Params.Thumbnail.url) $element.Params.Thumbnail) -}}
+            {{- $params = merge $params (dict
+                "title" $element.Title
+                "href" $element.RelPermalink
+                "description" (partial "utilities/GetDescription.html" $element)
+                "thumbnail" $thumbnail
+                "icon" $element.Params.icon
+            ) -}}
+        {{- end -}}

-    {{- $list = $list | append $params }}
+        {{- $list = $list | append $params }}
+    {{ end }}
+{{ else if $pages }}
+    {{ $list = $list | append $pages }}
 {{ end }}

 {{- $count := len $list -}}
--- a/layouts/partials/assets/card.html
+++ b/layouts/partials/assets/card.html
@@ -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">
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,17 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha2",
+  "version": "0.23.0-alpha4",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.23.0-alpha2",
+      "version": "0.23.0-alpha4",
      "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",
-      "resolved": "https://registry.npmjs.org/@netlify/plugin-lighthouse/-/plugin-lighthouse-5.0.0.tgz",
-      "integrity": "sha512-tCaoVYxCU3OB592vChtFkANzUL4kDUNaIk9VCGp3qBecBnH+yFrILUlcqy2d08Is4ecstjTacyHqV+ixKbNYGQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugin-lighthouse/-/plugin-lighthouse-6.0.0.tgz",
+      "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",
-      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.118.1.tgz",
-      "integrity": "sha512-WIS4kLNySb5u2+iwk//N7ClLUCksmyjvqdkGQTFc5v7Bqjpn1yLcIIBWwxU3R4SBc2Lr772/auxlzzsRffGbVA==",
+      "version": "0.119.0",
+      "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.119.0.tgz",
+      "integrity": "sha512-RnjlxHKdOjo7i7yRX/001t53142tC9NTa5JVrnPCTpX2kNQQCz5XdI/WWX7emf0dNkxipj55Z58EsA2ft9W16g==",
      "dev": true,
      "funding": [
        {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.23.0-alpha2",
+  "version": "0.23.0-alpha4",
  "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",
Author	SHA1	Message	Date
Mark Dumay	e924bd96ec	Merge pull request #743 from gethinode/develop Refine responsive icon size on cards	2024-02-03 05:29:15 +01:00
Mark Dumay	e234240e74	Merge branch 'main' into develop	2024-02-03 05:14:42 +01:00
Mark Dumay	33473b0db1	Refine responsive icon size on cards	2024-02-03 05:13:45 +01:00
github-actions[bot]	cfad29f9d4	Merge pull request #741 from gethinode/dependabot/npm_and_yarn/netlify/plugin-lighthouse-6.0.0 Bump @netlify/plugin-lighthouse from 5.0.0 to 6.0.0	2024-01-31 13:45:11 +00:00
dependabot[bot]	7ffdbea3ec	Bump @netlify/plugin-lighthouse from 5.0.0 to 6.0.0 Bumps [@netlify/plugin-lighthouse](https://github.com/netlify/netlify-plugin-lighthouse) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/netlify/netlify-plugin-lighthouse/releases) - [Changelog](https://github.com/netlify/netlify-plugin-lighthouse/blob/main/CHANGELOG.md) - [Commits](https://github.com/netlify/netlify-plugin-lighthouse/compare/v5.0.0...v6.0.0) --- updated-dependencies: - dependency-name: "@netlify/plugin-lighthouse" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-31 13:39:13 +00:00
github-actions[bot]	2c2fb4d305	Merge pull request #740 from gethinode/dependabot/npm_and_yarn/hugo-bin-0.119.0 Bump hugo-bin from 0.118.1 to 0.119.0	2024-01-29 13:44:24 +00:00
dependabot[bot]	709172c506	Bump hugo-bin from 0.118.1 to 0.119.0 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.118.1 to 0.119.0. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.118.1...v0.119.0) --- updated-dependencies: - dependency-name: hugo-bin dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-29 13:37:22 +00:00
Mark Dumay	8727ee50ee	Merge pull request #739 from gethinode/develop Update installation instructions for Windows	2024-01-29 11:21:28 +01:00
mark	04d4d20ba6	Fix linting issue	2024-01-29 11:11:47 +01:00
Mark Dumay	e77ea9358e	Merge branch 'main' into develop	2024-01-29 10:50:44 +01:00
Mark Dumay	6263dc0649	Update installation instructions for Windows	2024-01-29 10:50:12 +01:00
Mark Dumay	52eccfc384	Merge pull request #737 from gethinode/develop Fix navbar toggler color in overlay mode	2024-01-28 08:28:47 +01:00
Mark Dumay	13085416e2	Merge branch 'main' into develop	2024-01-28 07:15:32 +01:00
Mark Dumay	f7efa99fc3	Bump package release	2024-01-28 07:15:09 +01:00
Mark Dumay	32d6b8844a	Fix navbar toggler color in overlay mode	2024-01-28 07:14:27 +01:00
Mark Dumay	1c4287a3ed	Merge pull request #735 from gethinode/develop Add support for card group data	2024-01-27 12:26:50 +01:00
Mark Dumay	354fa85f38	Fix alignment of features	2024-01-27 11:40:42 +01:00
Mark Dumay	78fb0760f3	Merge branch 'main' into develop	2024-01-27 11:33:14 +01:00
Mark Dumay	dfdda4d27f	Bump package release	2024-01-27 11:32:34 +01:00
Mark Dumay	6d8f90bdce	Add support for card group data	2024-01-27 11:32:24 +01:00
Mark Dumay	3e531da29c	Add support for card group data	2024-01-27 11:31:53 +01:00
Mark Dumay	6065ebb6b4	Fix card-group args	2024-01-27 10:11:15 +01:00