Merge pull request #1494 from gethinode/develop

feat: extend navbar styling options
Merge branch 'main' into develop
2025-10-13 13:03:13 +00:00 · 2025-07-04 12:56:42 +02:00 · 2025-07-04 12:51:29 +02:00 · 2025-07-04 12:50:41 +02:00 · 2025-07-04 07:43:32 +02:00 · 2025-07-04 07:38:09 +02:00
10 changed files with 37 additions and 17 deletions
--- a/component-library/helpers/component.html
+++ b/component-library/helpers/component.html
@@ -36,6 +36,7 @@
    {{- $style := index $component_props "wrapper" -}}
    {{- $width := index $component_props "width" -}}
    {{- $justify := index $component_props "justify" | default "start" -}}
+    {{- $paddingOuter := cond (ne $component_name "separator") (printf "px-xxl-0 px-%d py-0" $padding.x) "" -}}
    {{- $padding := cond (ne $component_name "separator") (printf "px-%d %spy-%d" $padding.x (cond $fluid "px-xxl-0 " "") $padding.y) "" -}}
    {{- $wrapper := $style }}
    {{ with $background }}
@@ -44,14 +45,16 @@
            {{ with $background.backdrop }}{{ $wrapper = "" }}{{ $backdrop = . }}{{ end }}
        {{ end }}
    {{ end }}
-    {{/* warnf "wrapper: '%s'" $wrapper */}}
    {{- $theme := index $component_props "theme" -}}
    {{- $overlayMode := (or (index $component_props "overlay-mode") page.Params.overlayMode) | default "dark" -}}
    {{ if not $backdrop }}{{ $overlayMode = page.Params.overlayMode }}{{ end }}
    {{ if eq $overlayMode "none" }}{{ $overlayMode = "" }}{{ end }}
    
    {{ (printf "<!--bookshop-live name(%s)-->" $component_name) | safeHTML }}
-    <section {{ with $id }}id="{{ . }}" {{ end }}class="{{ $component_name }} container-{{ cond $fluid "fluid" "xxl" }} {{ $class }} {{ with $wrapper }}{{ . }}{{ end -}}
+    {{ if not $fluid }}<div class="container-xxl {{ $paddingOuter }}">{{ end }}
+    <section {{ with $id }}id="{{ . }}" {{ end }}class="{{ $component_name }}
+        container-fluid {{ $class }}
+        {{ with $wrapper }}{{ . }}{{ end -}}
        {{- if and $backdrop $overlayMode }} background-container{{ end -}}
        {{- if $cover }} section-cover d-flex align-items-center{{ end }}" 
        {{ with $overlayMode -}}
@@ -62,12 +65,16 @@
        {{- end -}}
        >
        {{- if $backdrop -}}
-            {{ partial "assets/live-image.html" (dict "src" $backdrop "class" (printf "background-img-fluid %s" $bgclass) "title" (T "backgroundImage")) }}
+            {{ partial "assets/live-image.html" (dict
+                "src" $backdrop
+                "class" (printf "background-img-fluid %s" $bgclass)
+                "title" (T "backgroundImage"))
+            }}
        {{- end -}}

        {{ $col := cond (and $width (lt $width 12)) (printf "col-12 col-md-%d" $width) "" }}

-        <div class="container-xxl {{ $padding }} d-flex flex-column align-items-{{ $justify }}">
+        <div class="container-{{ cond $fluid "xxl" "fluid" }} {{ $padding }} d-flex flex-column align-items-{{ $justify }}">
            {{ with $col }}
                <div class="{{ . }}">{{ partial $resolved_component $component_props }}</div>
            {{ else }}
@@ -75,6 +82,7 @@
            {{ end}}
        </div>
    </section>
+    {{ if not $fluid }}</div>{{ end }}
    {{ "<!--bookshop-live end-->" | safeHTML }}
 {{- else -}}
    {{- $file_loc := slicestr $component_path 9 -}}
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -84,6 +84,7 @@
 [navigation]
    anchor = true
    logo = "/img/logo_icon.svg"
+    logo-height = 30
    color = "body"
    fixed = true
    overlay = false
@@ -96,6 +97,9 @@
    toc = true
    sidebar = true
    size = "md"
+    [navigation.padding]
+        x = 4
+        y = 4
 # toml-docs-end navigation

 # toml-docs-start messages
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@@ -37,6 +37,7 @@
 [navigation]
    anchor = true
    logo = "/img/logo_icon.svg"
+    logo-height = 30
    color = "body"
    fixed = true
    overlay = false
@@ -50,6 +51,9 @@
    toc = true
    sidebar = true
    size = "md"
+    [navigation.padding]
+        x = 4
+        y = 4

 [messages]
    placement = "bottom-right"
--- a/go.mod
+++ b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/gethinode/mod-simple-datatables v1.1.7 // indirect
 	github.com/gethinode/mod-simple-datatables/v2 v2.0.1 // indirect
 	github.com/gethinode/mod-utils/v3 v3.3.1 // indirect
-	github.com/gethinode/mod-utils/v4 v4.9.2 // indirect
+	github.com/gethinode/mod-utils/v4 v4.10.0 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20250606060143-c28f52c09b7a // indirect
 	github.com/twbs/bootstrap v5.3.7+incompatible // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -458,6 +458,8 @@ github.com/gethinode/mod-utils/v4 v4.9.1 h1:9D2AJcrlS5r2moHEoo70GrNBmq1pJHd9oT4G
 github.com/gethinode/mod-utils/v4 v4.9.1/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/gethinode/mod-utils/v4 v4.9.2 h1:lzcihwAsm8R2k2v+tWu5nfWvXMA8uRKi0nGIzZCygZ8=
 github.com/gethinode/mod-utils/v4 v4.9.2/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.10.0 h1:CfVa57r52wXd0bUqSJlpux2cloHQNBBe13aeqLJ8FXE=
+github.com/gethinode/mod-utils/v4 v4.10.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3 h1:H/qVR5O4BXjRjD+5PZB+r4ug2BSJ2Of4RtwOntd+OKo=
 github.com/nextapps-de/flexsearch v0.0.0-20230711092928-1243fd883ec3/go.mod h1:5GdMfPAXzbA2gXBqTjC6l27kioSYzHlqDMh0+wyx7sU=
 github.com/nextapps-de/flexsearch v0.0.0-20240108021025-afd75f742f22 h1:re7L8FxbXQpnX8BgzkdUnDpsUmloGNyLmiy2ZCln8pg=
--- a/layouts/_partials/assets/helpers/image-definition.html
+++ b/layouts/_partials/assets/helpers/image-definition.html
@@ -77,10 +77,10 @@
        {{- with $wrapper }}<div class="{{ . }}">{{ end }}
    {{- end -}}
    {{- if $data -}}
-        {{- if site.Params.debugging.includeSVGOrigin -}}
+        {{- if and site.Params.debugging.includeSVGOrigin $.url -}}
            {{- printf "{{/* <svg src=\"%s\"> */}}" $.url | safeHTML -}}
        {{- end -}}
-        {{- $data = replace $data "<svg" (printf "<svg class=\"%s\"" $args.class) -}}
+        {{- with $args.class }}{{ $data = replace $data "<svg" (printf "<svg class=\"%s\"" .) }}{{ end -}}
        {{- $data | safeHTML -}}
    {{- else if not $fileAnchor -}}
        <img class="img-fluid {{ $args.class }}"
--- a/layouts/_partials/assets/helpers/image-dimension.html
+++ b/layouts/_partials/assets/helpers/image-dimension.html
@@ -67,7 +67,9 @@
 {{- if hasSuffix $src "svg" -}}
    {{- $res = partial "utilities/GetResource.html" (dict "url" $src "page" $args.page) -}}
    {{ if not $res }}
-        {{- $targetURL := partial "utilities/GetStaticURL" (dict "url" (strings.TrimPrefix "/static" $src)) -}}
+        {{- $targetURL := strings.TrimPrefix "/static" $src -}}
+        {{- $u := urls.Parse site.BaseURL }}
+        {{- $targetURL = strings.TrimPrefix $u.Path $src -}}
        {{- if not (fileExists (path.Join "/static" $targetURL)) -}}
            {{ warnf "Cannot find vector image resource: %q" $src -}}
        {{ else }}
--- a/layouts/_partials/assets/navbar.html
+++ b/layouts/_partials/assets/navbar.html
@@ -80,7 +80,7 @@
 {{ end }}

 {{/* Initialize global variables */}}
-{{- $padding := partial "utilities/GetPadding.html" -}}
+{{- $padding := partial "utilities/GetPadding.html" (dict "section" "navigation") -}}

 {{/* Initialize local arguments */}}
 {{- $absoluteURL := site.Params.main.canonifyAssetsURLs | default false -}}
@@ -124,7 +124,8 @@

 {{ $logo := "" }}
 {{ with $args.logo | default site.Params.navigation.logo }}
-    {{ $logo = partial "assets/image.html" (dict "src" . "loading" "eager" "title" $title "image-height" 30) }}
+    {{ $height := index site.Params.navigation "logo-height" | default 30 }}
+    {{ $logo = partial "assets/image.html" (dict "src" . "loading" "eager" "title" $title "image-height" $height) }}
 {{ end }}

 {{- $pre := $args.pre -}}
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
        "rimraf": "^6.0.1",
        "semantic-release": "^24.2.6",
        "shx": "^0.4.0",
-        "stylelint": "^16.21.0",
+        "stylelint": "^16.21.1",
        "stylelint-config-standard-scss": "^15.0.1"
      },
      "optionalDependencies": {
@@ -15694,9 +15694,9 @@
      }
    },
    "node_modules/stylelint": {
-      "version": "16.21.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.21.0.tgz",
-      "integrity": "sha512-ki3PpJGG7xhm3WtINoWGnlvqAmbqSexoRMbEMJzlwewSIOqPRKPlq452c22xAdEJISVi80r+I7KL9GPUiwFgbg==",
+      "version": "16.21.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.21.1.tgz",
+      "integrity": "sha512-WCXdXnYK2tpCbebgMF0Bme3YZH/Rh/UXerj75twYo4uLULlcrLwFVdZTvTEF8idFnAcW21YUDJFyKOfaf6xJRw==",
      "dev": true,
      "funding": [
        {
@@ -15708,7 +15708,6 @@
          "url": "https://github.com/sponsors/stylelint"
        }
      ],
-      "license": "MIT",
      "dependencies": {
        "@csstools/css-parser-algorithms": "^3.0.5",
        "@csstools/css-tokenizer": "^3.0.4",
@@ -15737,7 +15736,7 @@
        "micromatch": "^4.0.8",
        "normalize-path": "^3.0.0",
        "picocolors": "^1.1.1",
-        "postcss": "^8.5.5",
+        "postcss": "^8.5.6",
        "postcss-resolve-nested-selector": "^0.1.6",
        "postcss-safe-parser": "^7.0.1",
        "postcss-selector-parser": "^7.1.0",
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
    "rimraf": "^6.0.1",
    "semantic-release": "^24.2.6",
    "shx": "^0.4.0",
-    "stylelint": "^16.21.0",
+    "stylelint": "^16.21.1",
    "stylelint-config-standard-scss": "^15.0.1"
  },
  "optionalDependencies": {
Author	SHA1	Message	Date
Mark Dumay	863b81efbb	Merge pull request #1494 from gethinode/develop feat: extend navbar styling options	2025-07-04 12:56:42 +02:00
Mark Dumay	9b0683d176	Merge branch 'main' into develop	2025-07-04 12:51:29 +02:00
Mark Dumay	dd1b2eb97f	feat: extend navbar styling options	2025-07-04 12:50:41 +02:00
Mark Dumay	3f6dc3b2d7	Merge pull request #1493 from gethinode/develop Develop	2025-07-04 07:43:32 +02:00
Mark Dumay	873277b691	Merge branch 'main' into develop	2025-07-04 07:38:09 +02:00
Mark Dumay	7a456a12d2	fix: improve handling of static svg files Removes the subfolder from the static file path, if any. Only applicable to sites deployed to a subfolder (when setting `baseURL`).	2025-07-04 07:36:22 +02:00
Mark Dumay	b437b414b0	fix: suppress empty class and origin of svg files	2025-07-04 07:14:38 +02:00
Mark Dumay	80ac704d81	Merge pull request #1491 from gethinode/develop fix: improve non-fluid section rendering	2025-07-03 19:18:02 +02:00
Mark Dumay	996e9ec294	Merge branch 'main' into develop	2025-07-03 19:09:14 +02:00
Mark Dumay	0ab274d6f5	fix: improve non-fluid section rendering	2025-07-03 19:08:26 +02:00
github-actions[bot]	3742e8ef04	Merge pull request #1490 from gethinode/dependabot/npm_and_yarn/stylelint-16.21.1 Bump stylelint from 16.21.0 to 16.21.1	2025-07-03 13:29:37 +00:00
dependabot[bot]	3eadaa02b8	Bump stylelint from 16.21.0 to 16.21.1 Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.21.0 to 16.21.1. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.21.0...16.21.1) --- updated-dependencies: - dependency-name: stylelint dependency-version: 16.21.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-03 13:24:13 +00:00