Merge pull request #355 from gethinode/develop

Fix behavior in default state
Merge branch 'main' into develop
2025-10-08 18:44:24 +00:00 · 2023-07-22 14:57:41 +02:00 · 2023-07-22 14:46:19 +02:00 · 2023-07-22 14:45:17 +02:00 · 2023-07-22 14:44:46 +02:00 · 2023-07-22 13:13:40 +02:00
9 changed files with 38 additions and 15 deletions
--- a/README.md
+++ b/README.md
@@ -56,10 +56,11 @@
 - [PageSpeed Insights][pagespeed]
 - [Mozilla Observatory][observatory]
-Hinode is a clean documentation and blog theme for [Hugo][hugo], an open-source static site generator. Based on the [Bootstrap 5][bootstrap] framework, the rendered site is fast, secure, and responsive. Hinode uses [FlexSearch][flexsearch] to enable full text search across your site. Finally, the theme uses [Node Package Manager][npm] to automate the build process and to keep track of dependencies.
+Hinode is a clean documentation and blog theme for [Hugo][hugo], an open-source static site generator. Based on the [Bootstrap 5][bootstrap] framework, the rendered site is fast, secure, and responsive. Hinode uses [FlexSearch][flexsearch] to enable full text search across your site. Finally, the theme supports [Node Package Manager][npm] to automate the build process and to keep track of dependencies.
 Additional features include:
 - Flexible configuration of Hugo modules
 - Switching between light mode and dark mode
 - Support for multiple languages
 - Reusable Bootstrap components through configurable shortcodes and partials
--- a/assets/scss/app.scss
+++ b/assets/scss/app.scss
@@ -5,10 +5,6 @@
@import "common/variables.scss";
@import "common/icons.scss";
 {{ if not (in site.Params.modules.core "bootstrap") }}
    {{ errorf "Bootstrap is a required module, please add it to 'modules.core' in your site parameters" }}
 {{ end }}
 // Import Bootstrap configuration (mounted by core Bootstrap module)
@import "bootstrap.scss";
--- a/assets/scss/components/_syntax.scss
+++ b/assets/scss/components/_syntax.scss
@@ -10,6 +10,7 @@
 .syntax-highlight {
    background-color: var(--bs-light) if($enable-important-utilities, !important, null);
    overflow-x: auto;
 }
 .preview-background {
@@ -29,6 +30,7 @@
        .syntax-highlight {
            background-color: var(--bs-tertiary-bg) if($enable-important-utilities, !important, null);
            overflow-x: auto;
        }
        .bg,
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -12,6 +12,10 @@
    {{- end -}}
 {{- end -}}
 {{- if and .IsPage (not (in .Site.Params.modules.core "bootstrap")) -}}
    {{- errorf "Bootstrap is a required module, please add it to 'modules.core' in your site parameters" -}}
 {{- end -}}
 <!doctype html>
 <html lang="{{ .Site.Language.Lang }}" class="no-js">
    <head>
--- a/layouts/partials/assets/navbar.html
+++ b/layouts/partials/assets/navbar.html
@@ -105,11 +105,14 @@
    {{- errorf "partial [assets/navbar.html] - Missing value for param 'page'" -}}
 {{- end -}}
-{{- $menuName := "main" }}
+{{- $defaultMenu := "main" }}
-{{- with .menus }}{{ $menuName = .}}{{ end -}}
+{{- $menuName := $defaultMenu }}
 {{- with .menus }}{{ $menuName = . }}{{ end -}}
 {{- $menus := index site.Menus $menuName -}}
 {{- if or (ne (printf "%T" $menus) "navigation.Menu") (ne (index $menus 0).Menu $menuName) -}}
-    {{- errorf "partial [assets/navbar.html] - Invalid value for param 'menus': %s" $menuName -}}
+    {{- if ne $menuName $defaultMenu }}
        {{- errorf "partial [assets/navbar.html] - Invalid value for param 'menus': %s" $menuName -}}
    {{- end -}}
 {{- end -}}
 {{- $size := "md" -}}
@@ -238,7 +241,7 @@
                    {{- end -}}
                    <!-- Insert divider if applicable -->
-                    {{- if or $enableLanguage $enableVersions -}}
+                    {{- if and $menus (or $enableLanguage $enableVersions) -}}
                        <li class="nav-item py-2 py-md-1 col-12 col-md-auto d-none d-{{ $size }}-block">
                            <div class="vr d-none d-md-flex h-100 mx-md-2"></div>
                        </li>
--- a/layouts/shortcodes/docs.html
+++ b/layouts/shortcodes/docs.html
@@ -44,6 +44,14 @@
    {{ errorf "Invalid value for param 'show': %s" $showParam -}}
 {{ end -}}
 {{ $fullParam := "true" -}}
 {{ $full := true -}}
 {{ with .Get "full" }}{{ $fullParam = . }}{{ end -}}
 {{ if in $supportedFlags $fullParam -}}
    {{ if eq $fullParam "true" }}{{ $full = true }}{{ else }}{{ $full = false }}{{ end -}}
 {{ else -}}
    {{ errorf "Invalid value for param 'full': %s" $fullParam -}}
 {{ end -}}
 {{- /* If any parameters are missing, print an error and exit */ -}}
 {{- if or (not $name) (not $file) -}}
@@ -72,7 +80,7 @@
                data-bs-target=".multi-{{ $id }}" 
                aria-expanded="false" 
                aria-controls="body-{{ $id }} footer-{{ $id }}">
-                <small>{{ strings.TrimPrefix $basePath $file }}</small>
+                <small>{{ if $full }}{{ strings.TrimPrefix $basePath $file }}{{ else }}{{ path.Base $file }}{{ end }}</small>
            </a>
        </li>
    </ul>
--- a/layouts/shortcodes/file.html
+++ b/layouts/shortcodes/file.html
@@ -1,7 +1,7 @@
 {{- /*
    Source: https://github.com/twbs/bootstrap/blob/main/site/layouts/shortcodes/scss-docs.html
-    Usage: `file path="path/to/filename" lang="lang" show="true"`
+    Usage: `file path="path/to/filename" lang="lang" show="true" full="true"`
    Prints the full content of any given file supported by the Chroma syntax highlighter.
 */ -}}
@@ -28,6 +28,15 @@
    {{ errorf "Invalid value for param 'show': %s" $showParam -}}
 {{ end -}}
 {{ $fullParam := "true" -}}
 {{ $full := true -}}
 {{ with .Get "full" }}{{ $fullParam = . }}{{ end -}}
 {{ if in $supportedFlags $fullParam -}}
    {{ if eq $fullParam "true" }}{{ $full = true }}{{ else }}{{ $full = false }}{{ end -}}
 {{ else -}}
    {{ errorf "Invalid value for param 'full': %s" $fullParam -}}
 {{ end -}}
 {{- /* If any parameters are missing, print an error and exit */ -}}
 {{- if not $file -}}
    {{- errorf "%s: %q: Missing required parameters! Got: path=%q!" .Position .Name $file -}}
@@ -46,7 +55,7 @@
                data-bs-target=".multi-{{ $id }}" 
                aria-expanded="false" 
                aria-controls="body-{{ $id }} footer-{{ $id }}">
-                <small>{{ strings.TrimPrefix $basePath $file }}</small>
+                <small>{{ if $full }}{{ strings.TrimPrefix $basePath $file }}{{ else }}{{ path.Base $file }}{{ end }}</small>
            </a>
        </li>
    </ul>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.16.0",
+  "version": "0.16.3",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.16.0",
+      "version": "0.16.3",
      "license": "MIT",
      "devDependencies": {
        "@fortawesome/fontawesome-free": "^6.4.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.16.0",
+  "version": "0.16.3",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	9ada0eee80	Merge pull request #355 from gethinode/develop Fix behavior in default state	2023-07-22 14:57:41 +02:00
Mark Dumay	ae3e20b596	Merge branch 'main' into develop	2023-07-22 14:46:19 +02:00
mark	c49e6f14c1	Bump package version	2023-07-22 14:45:17 +02:00
mark	b4f6b1aa3d	Move bootstrap mod check to base template	2023-07-22 14:44:46 +02:00
mark	962549f2ae	Allow undefined main menu	2023-07-22 13:13:40 +02:00
Mark Dumay	28601323c4	Update README.md	2023-07-22 07:52:46 +02:00
Mark Dumay	a11ee72174	Merge pull request #354 from gethinode/develop Bump package version	2023-07-22 06:31:01 +02:00
Mark Dumay	8e91440261	Merge branch 'main' into develop	2023-07-22 06:21:36 +02:00
mark	19879c4ecc	Bump package version	2023-07-22 06:21:01 +02:00
Mark Dumay	810dfef311	Merge pull request #353 from gethinode/develop Fix overflow of syntax highlight	2023-07-22 06:19:56 +02:00
Mark Dumay	c42fcefa73	Merge branch 'main' into develop	2023-07-22 06:12:58 +02:00
mark	a3c417e378	Fix overflow of syntax highlight	2023-07-22 06:10:11 +02:00
Mark Dumay	2bee381906	Merge pull request #352 from gethinode/develop Enable filename-only in file and docs shortcode	2023-07-21 16:15:34 +02:00
Mark Dumay	244a3f7496	Merge branch 'main' into develop	2023-07-21 16:08:16 +02:00
mark	563b526cea	Bump package release	2023-07-21 16:07:09 +02:00
mark	fa7fad67b5	Add full arg to shortcode	2023-07-21 16:06:32 +02:00