Merge pull request #1021 from gethinode/develop

Add plain argument to navbar-item
Merge branch 'main' into develop
2025-10-07 10:04:22 +00:00 · 2024-07-01 19:10:45 +02:00 · 2024-07-01 19:03:19 +02:00 · 2024-07-01 19:02:40 +02:00 · 2024-07-01 18:03:23 +02:00 · 2024-07-01 17:54:46 +02:00
9 changed files with 60 additions and 12 deletions
--- a/assets/scss/app-dart.scss
+++ b/assets/scss/app-dart.scss
@@ -39,6 +39,7 @@
@import "components/toc.scss";
@import "components/video.scss";
@import "common/animation.scss";
+@import "common/masonry.scss";
@import "common/scrollbar.scss";
@import "common/styles.scss";
@import "layouts/reboot.scss";
--- a/assets/scss/app.scss
+++ b/assets/scss/app.scss
@@ -37,6 +37,7 @@
@import "components/toc.scss";
@import "components/video.scss";
@import "common/animation.scss";
+@import "common/masonry.scss";
@import "common/scrollbar.scss";
@import "common/styles.scss";
@import "layouts/reboot.scss";
--- a/assets/scss/common/_masonry.scss
+++ b/assets/scss/common/_masonry.scss
@@ -0,0 +1,38 @@
+.masonry {
+    --masonry-padding: 4px;
+}
+
+.m-row {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0 var(--masonry-padding);
+}
+
+.m-col {
+    flex: 100%;
+    max-width: 100%;
+    padding: 0 var(--masonry-padding);
+}
+
+.m-col div {
+    margin-top: calc(2 * var(--masonry-padding));
+    border-radius: 5px;
+}
+
+$utilities: map-merge(
+    $utilities,
+    (
+        "m-col": (
+            property: max-width,
+            responsive: true,
+            class: m-col,
+            values: (
+                1: 100%,
+                2: 50%,
+                3: 33.3%,
+                4: 25%,
+                5: 20%,
+            )
+        )
+    )
+);
--- a/data/structures/navbar-item.yml
+++ b/data/structures/navbar-item.yml
@@ -32,3 +32,8 @@ arguments:
    comment: >-
      Flag to indicate if an external link should open in a new tab, defaults
      to setting `main.externalLinks.tab` in the site's parameters.
+  plain:
+    type: bool
+    optional: true
+    comment: >-
+      Renders the navigation item as plain item, ignoring any children.
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/gethinode/mod-fontawesome v1.9.0 // indirect
 	github.com/gethinode/mod-katex v1.1.0 // indirect
 	github.com/gethinode/mod-leaflet v1.1.0 // indirect
-	github.com/gethinode/mod-lottie v1.5.4 // indirect
+	github.com/gethinode/mod-lottie v1.5.5 // indirect
 	github.com/gethinode/mod-utils/v2 v2.3.10 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20240110101704-4c3966709f85 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
--- a/go.sum
+++ b/go.sum
@@ -182,6 +182,8 @@ github.com/gethinode/mod-lottie v1.5.3 h1:fvCjCoZoCEhY2aou30oEsEo6N4tVSI0ijFyXS3
 github.com/gethinode/mod-lottie v1.5.3/go.mod h1:XHVMuPsuJIm9/Eb2ql4jsT49/BQqMlBiirQoty4uHAo=
 github.com/gethinode/mod-lottie v1.5.4 h1:+xbamSsjcnP2tyzGl0CA1enma7gkAp67wenmuP0XELY=
 github.com/gethinode/mod-lottie v1.5.4/go.mod h1:gALqz48aYpoDLxJOI3LzIpdy0Eq/lOBNtlcOxABa9tg=
+github.com/gethinode/mod-lottie v1.5.5 h1:uEJKsz+ovsZtbGkMhPONcIhtG6M3RjYiK+iVoScLOVo=
+github.com/gethinode/mod-lottie v1.5.5/go.mod h1:VTvBxD8VokICwnEqM0VUZFZHBYxLf4/grDFQyEh1DL0=
 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=
--- a/layouts/partials/assets/navbar-item.html
+++ b/layouts/partials/assets/navbar-item.html
@@ -16,6 +16,7 @@
 {{- $page := .page -}}
 {{- $menu := .menu -}}
 {{- $parent := .parent -}}
+{{- $plain := .plain | default false -}}
 {{- $class := .class -}}
 {{- $cue := .cue | default site.Params.main.externalLinks.cue -}}
 {{- $tab := .tab | default site.Params.main.externalLinks.tab -}}
@@ -56,7 +57,7 @@
    {{- $mainNav = urlize (lower $parent.Name) -}}
    {{- $childNav = urlize (lower $menu.Name) -}}
    {{- $anchorClass = "dropdown-item" -}}
-{{- else if $menu.HasChildren -}}
+{{- else if and (not $plain) $menu.HasChildren -}}
    {{- $anchorClass = "nav-link dropdown-toggle" -}}
    {{- $button = " role=\"button\" data-bs-toggle=\"dropdown\" aria-expanded=\"false\"" -}}
 {{- else -}}
@@ -78,7 +79,7 @@
            "size" "sm"
        )}}
    {{ else }}
-        <a class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{. }}{{ end }}" 
+        <a class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{ . }}{{ end }}" 
            {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
            data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
            href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }} {{ $button | safeHTMLAttr }}>
@@ -90,7 +91,7 @@
                    {{ partial "assets/icon.html" (dict "icon" (string .) )}}
                {{ end }}
            {{ end -}}
-            <span {{ if $isActive }} class="active"{{ end }}>{{ if not $isIcon }}{{ $menu.Name }}{{ end }}</span>
+            <span {{ if $isActive }} class="active"{{ end }}>{{ if or (not $isIcon) $plain }}{{ $menu.Name }}{{ end }}</span>
            {{- with $menu.Post }}{{ . }}{{ end -}}
            {{- if not $isIcon }}&nbsp;{{ $suffix }}{{ end -}}
        </a>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.11",
+  "version": "0.24.12",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.24.11",
+      "version": "0.24.12",
      "license": "MIT",
      "dependencies": {
        "@fullhuman/postcss-purgecss": "^6.0.0",
@@ -22,7 +22,7 @@
        "eslint-config-standard": "^17.1.0",
        "eslint-plugin-import": "^2.29.1",
        "eslint-plugin-n": "^16.6.2",
-        "eslint-plugin-promise": "^6.2.0",
+        "eslint-plugin-promise": "^6.4.0",
        "markdownlint-cli2": "^0.13.0",
        "netlify-plugin-hugo-cache-resources": "^0.2.1",
        "npm-run-all": "^4.1.5",
@@ -2325,9 +2325,9 @@
      }
    },
    "node_modules/eslint-plugin-promise": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz",
-      "integrity": "sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.4.0.tgz",
+      "integrity": "sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==",
      "dev": true,
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.24.11",
+  "version": "0.24.12",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -80,7 +80,7 @@
    "eslint-config-standard": "^17.1.0",
    "eslint-plugin-import": "^2.29.1",
    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.2.0",
+    "eslint-plugin-promise": "^6.4.0",
    "markdownlint-cli2": "^0.13.0",
    "netlify-plugin-hugo-cache-resources": "^0.2.1",
    "npm-run-all": "^4.1.5",
Author	SHA1	Message	Date
Mark Dumay	1ec9568997	Merge pull request #1021 from gethinode/develop Add plain argument to navbar-item	2024-07-01 19:10:45 +02:00
Mark Dumay	9a0f907bd4	Merge branch 'main' into develop	2024-07-01 19:03:19 +02:00
Mark Dumay	1d59a914b8	Add plain argument to navbar-item	2024-07-01 19:02:40 +02:00
Mark Dumay	91090aa87e	Merge pull request #1020 from gethinode/develop Add initial support for masonry layout	2024-07-01 18:03:23 +02:00
Mark Dumay	e1a3109a95	Merge branch 'main' into develop	2024-07-01 17:54:46 +02:00
Mark Dumay	c53d653751	Bump package release	2024-07-01 17:54:10 +02:00
Mark Dumay	e95b99a742	Merge pull request #1018 from gethinode/hugo-mod-dependencies Update Hugo module dependencies	2024-07-01 16:34:40 +02:00
Mark Dumay	548f1f7107	Merge branch 'main' into hugo-mod-dependencies	2024-07-01 16:17:34 +02:00
Mark Dumay	0a59f1ea2b	Add initial support for masonry layout	2024-07-01 16:16:41 +02:00
github-actions[bot]	4b96b405ec	Merge pull request #1019 from gethinode/dependabot/npm_and_yarn/eslint-plugin-promise-6.4.0 Bump eslint-plugin-promise from 6.2.0 to 6.4.0	2024-07-01 13:24:46 +00:00
dependabot[bot]	aaa6ced022	Bump eslint-plugin-promise from 6.2.0 to 6.4.0 Bumps [eslint-plugin-promise](https://github.com/eslint-community/eslint-plugin-promise) from 6.2.0 to 6.4.0. - [Release notes](https://github.com/eslint-community/eslint-plugin-promise/releases) - [Changelog](https://github.com/eslint-community/eslint-plugin-promise/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint-community/eslint-plugin-promise/compare/v6.2.0...v6.4.0) --- updated-dependencies: - dependency-name: eslint-plugin-promise dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-01 13:19:34 +00:00
markdumay	0582716f19	fix: update Hugo module dependencies	2024-06-29 03:06:03 +00:00