Merge pull request #1494 from gethinode/develop

feat: extend navbar styling options

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

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"

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
 )

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=

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 }}"

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 }}

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 -}}