Merge pull request #355 from gethinode/develop

Fix behavior in default state
Merge branch 'main' into develop
2025-10-07 18:14:28 +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
6 changed files with 16 additions and 12 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/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" }}
-{{- with .menus }}{{ $menuName = .}}{{ end -}}
+{{- $defaultMenu := "main" }}
+{{- $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/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.16.2",
+  "version": "0.16.3",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.16.2",
+      "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.2",
+  "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