Merge pull request #1553 from gethinode/develop

fix: remove navbar item suffix when displaying icon only
Merge branch 'main' into develop
2025-10-07 10:04:22 +00:00 · 2025-08-27 19:37:49 +02:00 · 2025-08-27 19:32:22 +02:00 · 2025-08-27 19:31:50 +02:00 · 2025-08-27 19:15:19 +02:00 · 2025-08-27 19:09:27 +02:00
5 changed files with 34 additions and 30 deletions
--- a/assets/scss/components/_toc.scss
+++ b/assets/scss/components/_toc.scss
@@ -3,11 +3,11 @@
 //
 // scss-docs-start toc
 .toc-sidebar {
-    grid-area: toc;
    right: 0;
    z-index: 2;
    overflow-y: auto;
    top: 5rem;
+    max-height: calc(100vh - var(--navbar-offset));
 }

 // scss-docs-end toc
--- a/layouts/_partials/assets/helpers/navbar-item.html
+++ b/layouts/_partials/assets/helpers/navbar-item.html
@@ -113,14 +113,16 @@
            {{ end -}}
            <span class="{{ if $isActive }}active{{ end }} {{ with $args.breakpoint }}d-{{ . }}-none {{ end }}">
                {{ $title }}
+                {{- with $menu.Post }}{{ . }}{{ end -}}
+                {{- with $suffix }}&nbsp;{{ . }}{{ end -}}
            </span>
            {{ if not $isIcon }}
            <span class="{{ if $isActive }}active{{ end }} {{ with $args.breakpoint }}d-none d-{{ . }}-block{{ end }}">
                {{ $title }}
+                {{- with $menu.Post }}{{ . }}{{ end -}}
+                {{- with $suffix }}&nbsp;{{ . }}{{ end -}}
            </span>
            {{ end }}
-            {{- with $menu.Post }}{{ . }}{{ end -}}
-            {{- with $suffix }}&nbsp;{{ . }}{{ end -}}
        {{ cond (ne $menuURL "") "</a>" "</div>" | safeHTML }}
    {{ end }}
 {{ end }}
--- a/layouts/_partials/assets/toc-parse-content.html
+++ b/layouts/_partials/assets/toc-parse-content.html
@@ -24,14 +24,16 @@
        {{ $result = $result | append $rendered }}
    {{ end }}

-    {{ range $item.Headings }}
-        {{ $result = $result | append (partial "inline/toc-item.html" (dict
-            "base"           $base
-            "item"           .
-            "startLevel"     $startLevel
-            "endLevel"       $endLevel
-            "maxNumHeadings" $maxNumHeadings
-        )) }}
+    {{ if lt $item.Level $endLevel }}
+        {{ range $item.Headings }}
+            {{ $result = $result | append (partial "inline/toc-item.html" (dict
+                "base"           $base
+                "item"           .
+                "startLevel"     $startLevel
+                "endLevel"       $endLevel
+                "maxNumHeadings" $maxNumHeadings
+            )) }}
+        {{ end }}
    {{ end }}

    {{ return $result }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,8 +11,8 @@
      "dependencies": {
        "@fullhuman/postcss-purgecss": "^7.0.2",
        "autoprefixer": "^10.4.21",
-        "cssnano": "^7.1.0",
-        "cssnano-preset-advanced": "^7.0.8",
+        "cssnano": "^7.1.1",
+        "cssnano-preset-advanced": "^7.0.9",
        "hugo-bin": "0.145.2",
        "purgecss-whitelister": "^2.4.0"
      },
@@ -4410,12 +4410,12 @@
      }
    },
    "node_modules/cssnano": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.1.0.tgz",
-      "integrity": "sha512-Pu3rlKkd0ZtlCUzBrKL1Z4YmhKppjC1H9jo7u1o4qaKqyhvixFgu5qLyNIAOjSTg9DjVPtUqdROq2EfpVMEe+w==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.1.1.tgz",
+      "integrity": "sha512-fm4D8ti0dQmFPeF8DXSAA//btEmqCOgAc/9Oa3C1LW94h5usNrJEfrON7b4FkPZgnDEn6OUs5NdxiJZmAtGOpQ==",
      "license": "MIT",
      "dependencies": {
-        "cssnano-preset-default": "^7.0.8",
+        "cssnano-preset-default": "^7.0.9",
        "lilconfig": "^3.1.3"
      },
      "engines": {
@@ -4430,14 +4430,14 @@
      }
    },
    "node_modules/cssnano-preset-advanced": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-7.0.8.tgz",
-      "integrity": "sha512-KYw7gH8xmIzTwHefuM/m3lkMz4jn5EbjxZO2RHVsOGvrXCxSjbc0/f/gELWW9ZIgbQdJMCkijEo76gBYGY4S3Q==",
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-7.0.9.tgz",
+      "integrity": "sha512-nczUlcRbMuupYDIjlYTQ6nqWh2AjV1omdf5OkUEKpOqPuRb8CZp/KgpZjD2eelX/sfFh6V/aybfgu7lVJH7Z/w==",
      "license": "MIT",
      "dependencies": {
        "autoprefixer": "^10.4.21",
        "browserslist": "^4.25.1",
-        "cssnano-preset-default": "^7.0.8",
+        "cssnano-preset-default": "^7.0.9",
        "postcss-discard-unused": "^7.0.4",
        "postcss-merge-idents": "^7.0.1",
        "postcss-reduce-idents": "^7.0.1",
@@ -4451,9 +4451,9 @@
      }
    },
    "node_modules/cssnano-preset-default": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.8.tgz",
-      "integrity": "sha512-d+3R2qwrUV3g4LEMOjnndognKirBZISylDZAF/TPeCWVjEwlXS2e4eN4ICkoobRe7pD3H6lltinKVyS1AJhdjQ==",
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.9.tgz",
+      "integrity": "sha512-tCD6AAFgYBOVpMBX41KjbvRh9c2uUjLXRyV7KHSIrwHiq5Z9o0TFfUCoM3TwVrRsRteN3sVXGNvjVNxYzkpTsA==",
      "license": "MIT",
      "dependencies": {
        "browserslist": "^4.25.1",
@@ -4461,7 +4461,7 @@
        "cssnano-utils": "^5.0.1",
        "postcss-calc": "^10.1.1",
        "postcss-colormin": "^7.0.4",
-        "postcss-convert-values": "^7.0.6",
+        "postcss-convert-values": "^7.0.7",
        "postcss-discard-comments": "^7.0.4",
        "postcss-discard-duplicates": "^7.0.2",
        "postcss-discard-empty": "^7.0.1",
@@ -13284,9 +13284,9 @@
      }
    },
    "node_modules/postcss-convert-values": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.6.tgz",
-      "integrity": "sha512-MD/eb39Mr60hvgrqpXsgbiqluawYg/8K4nKsqRsuDX9f+xN1j6awZCUv/5tLH8ak3vYp/EMXwdcnXvfZYiejCQ==",
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.7.tgz",
+      "integrity": "sha512-HR9DZLN04Xbe6xugRH6lS4ZQH2zm/bFh/ZyRkpedZozhvh+awAfbA0P36InO4fZfDhvYfNJeNvlTf1sjwGbw/A==",
      "license": "MIT",
      "dependencies": {
        "browserslist": "^4.25.1",
--- a/package.json
+++ b/package.json
@@ -73,8 +73,8 @@
  "dependencies": {
    "@fullhuman/postcss-purgecss": "^7.0.2",
    "autoprefixer": "^10.4.21",
-    "cssnano": "^7.1.0",
-    "cssnano-preset-advanced": "^7.0.8",
+    "cssnano": "^7.1.1",
+    "cssnano-preset-advanced": "^7.0.9",
    "hugo-bin": "0.145.2",
    "purgecss-whitelister": "^2.4.0"
  },
Author	SHA1	Message	Date
Mark Dumay	cb02c25ac4	Merge pull request #1553 from gethinode/develop fix: remove navbar item suffix when displaying icon only	2025-08-27 19:37:49 +02:00
Mark Dumay	39ef3c5372	Merge branch 'main' into develop	2025-08-27 19:32:22 +02:00
Mark Dumay	546003c9d4	fix: remove navbar item suffix when displaying icon only	2025-08-27 19:31:50 +02:00
Mark Dumay	6b4a1334bb	Merge pull request #1552 from gethinode/develop TOC	2025-08-27 19:15:19 +02:00
Mark Dumay	90ee71a536	fix: adjust vertical scroll of TOC	2025-08-27 19:09:27 +02:00
Mark Dumay	0c6b2929dc	Merge branch 'main' into develop	2025-08-27 18:41:39 +02:00
Mark Dumay	2cb60efc38	fix: remove incorrect tokens for nested TOC items beyond endLevel	2025-08-27 18:40:54 +02:00
github-actions[bot]	26f1bf3c7f	Merge pull request #1547 from gethinode/dependabot/npm_and_yarn/cssnano-preset-advanced-7.0.9 build(deps): bump cssnano-preset-advanced from 7.0.8 to 7.0.9	2025-08-27 06:39:29 +00:00
dependabot[bot]	ec8176c1e3	build(deps): bump cssnano-preset-advanced from 7.0.8 to 7.0.9 Bumps [cssnano-preset-advanced](https://github.com/cssnano/cssnano) from 7.0.8 to 7.0.9. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/cssnano-preset-advanced@7.0.8...cssnano-preset-advanced@7.0.9) --- updated-dependencies: - dependency-name: cssnano-preset-advanced dependency-version: 7.0.9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-27 06:33:47 +00:00
github-actions[bot]	20b1cfb59e	Merge pull request #1548 from gethinode/dependabot/npm_and_yarn/cssnano-7.1.1 build(deps): bump cssnano from 7.1.0 to 7.1.1	2025-08-27 06:32:34 +00:00
Mark Dumay	09a6125834	Merge branch 'main' into dependabot/npm_and_yarn/cssnano-7.1.1	2025-08-27 08:26:53 +02:00
dependabot[bot]	f543c012bd	build(deps): bump cssnano from 7.1.0 to 7.1.1 Bumps [cssnano](https://github.com/cssnano/cssnano) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/cssnano/cssnano/releases) - [Commits](https://github.com/cssnano/cssnano/compare/cssnano@7.1.0...cssnano@7.1.1) --- updated-dependencies: - dependency-name: cssnano dependency-version: 7.1.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-26 03:14:31 +00:00