Merge pull request #576 from gethinode/develop

Fix buttons

assets/scss/app-dart.scss

@@ -18,7 +18,7 @@
 @import "components/alert.scss";
 @import "components/blockquote.scss";
 @import "components/breadcrumb.scss";
-@import "components/buttons.scss";
+@import "components/button.scss";
 @import "components/card.scss";
 @import "components/carousel.scss";
 @import "components/clipboard.scss";

assets/scss/app.scss

@@ -16,7 +16,7 @@
 @import "components/alert.scss";
 @import "components/blockquote.scss";
 @import "components/breadcrumb.scss";
-@import "components/buttons.scss";
+@import "components/button.scss";
 @import "components/card.scss";
 @import "components/carousel.scss";
 @import "components/clipboard.scss";

assets/scss/common/_styles.scss

@@ -15,6 +15,12 @@ a:active {
     min-height: 100vh;
 }
 
+.fullcover {
+    --navbar-height: #{$navbar-height};
+
+    min-height: calc(100vh - var(--navbar-height));
+}
+
 .fullscreen {
     --navbar-offset: #{$navbar-offset};
 

assets/scss/common/_variables-dart.scss

@@ -18,6 +18,7 @@ strong {
     font-weight:                600 if($enable-important-utilities, !important, null);
 }
 
+$navbar-height:                 h.$navbar-height;
 $navbar-offset:                 h.$navbar-offset;
 $primary:                       h.$primary;
 $secondary:                     h.$secondary;

assets/scss/components/_button.scss

@@ -28,3 +28,16 @@
     background-color: transparent;
     color: var(--bs-primary) if($enable-important-utilities, !important, null);
 }
+
+a.btn {
+    margin-top: $spacer * .25;
+    margin-bottom: $spacer * .25;
+}
+
+.btn-close {
+    background-color: transparent if($enable-important-utilities, !important, null);
+    background-image: var(--#{$prefix}btn-close-bg) if($enable-important-utilities, !important, null);
+    background-position: center if($enable-important-utilities, !important, null);
+    background-repeat: no-repeat if($enable-important-utilities, !important, null);
+    background-size: $btn-close-width if($enable-important-utilities, !important, null);
+}

config/_default/params.toml

@@ -6,6 +6,7 @@
     modes = ["light", "dark"]
     canonifyAssetsURLs = false
     endorse = true
+    footerBelowFold = false
     [main.externalLinks]
         cue = false
         tab = false
@@ -59,6 +60,7 @@
     anchor = true
     logo = "/img/logo_icon.svg"
     color = "body"
+    fixed = true
     offset = "5.5rem"
     search = true
     searchModal = false

exampleSite/config/_default/params.toml

@@ -4,6 +4,7 @@
     enableDarkMode = true
     modes = ["light", "dark"]
     canonifyAssetsURLs = false
+    footerBelowFold = false
     [main.externalLinks]
         cue = true
         tab = true

exampleSite/content/fr/blog/bootstrap-elements.md

@@ -404,11 +404,11 @@ H{{</* sub 2 */>}}O est un liquide.
 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
 {{</* button toast="toast-example-1" */>}}
-    Affiche la notifiaction #1
+    Affiche la notification #1
 {{</* /button */>}}
 
 {{</* button toast="toast-example-2" */>}}
-    Affiche la notifiaction #1
+    Affiche la notification #1
 {{</* /button */>}}
 
 {{</* toast id="toast-example-1" header="Premier titre" */>}}

exampleSite/go.sum

@@ -33,6 +33,8 @@ github.com/gethinode/mod-katex v1.0.2 h1:pIG4n3qLl/IVe7BEiwn+GL8r5lOCtF6FDxlcrPK
 github.com/gethinode/mod-katex v1.0.2/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.3 h1:fvlUWqcUQqv2zRNM2kfmJ6GhXA816Tl1nfVrUkmBStI=
 github.com/gethinode/mod-katex v1.0.3/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
+github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3/mj8=
+github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-leaflet v0.3.4 h1:oY+YQ0JiJuhFQNrk9XgFdg0NMsTUQPXNfnILp4ia4r4=
 github.com/gethinode/mod-leaflet v0.3.4/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.5 h1:69Bv/6zRXhbcTzo7TMr58h3ry47srHRpM1k81LrLbYU=

exampleSite/hugo_stats.json

@@ -54,7 +54,6 @@
       "alert",
       "alert-danger",
       "alert-dismissible",
-      "align-content-center",
       "align-items-center",
       "align-items-end",
       "align-items-start",
@@ -166,6 +165,10 @@
       "fa-2xs",
       "fa-4x",
       "fa-activity",
+      "fa-angle-left",
+      "fa-angle-right",
+      "fa-angles-left",
+      "fa-angles-right",
       "fa-arrow-left",
       "fa-arrow-right",
       "fa-bootstrap",
@@ -199,13 +202,11 @@
       "fab",
       "fade",
       "fas",
-      "feature",
       "figure-caption",
       "fixed-top",
       "flex-column",
       "flex-fill",
       "flex-grow-1",
-      "flex-wrap",
       "font-monospace",
       "footer",
       "form-control",
@@ -302,6 +303,10 @@
       "p-2",
       "p-3",
       "p-4",
+      "page-item",
+      "page-link",
+      "pagination",
+      "pagination-terse",
       "pb-2",
       "pb-3",
       "pb-4",
@@ -316,7 +321,7 @@
       "ps-1",
       "ps-3",
       "ps-xl-3",
-      "pt-4",
+      "pt-3",
       "pt-5",
       "pt-md-3",
       "px-4",
@@ -324,6 +329,7 @@
       "py-1",
       "py-2",
       "py-3",
+      "py-5",
       "py-md-1",
       "ratio",
       "ratio-16x9",

go.mod

@@ -3,10 +3,10 @@ module github.com/gethinode/hinode
 go 1.19
 
 require (
-	github.com/gethinode/mod-bootstrap v1.2.1 // indirect
+	github.com/gethinode/mod-bootstrap v1.2.2 // indirect
 	github.com/gethinode/mod-flexsearch v1.5.1 // indirect
 	github.com/gethinode/mod-fontawesome v1.5.0 // indirect
-	github.com/gethinode/mod-katex v1.0.3 // indirect
+	github.com/gethinode/mod-katex v1.0.4 // indirect
 	github.com/gethinode/mod-leaflet v0.3.5 // indirect
 	github.com/gethinode/mod-lottie v1.3.0 // indirect
 )

go.sum

@@ -8,6 +8,8 @@ github.com/gethinode/mod-bootstrap v1.2.0 h1:JkTcImU3qpi25WgKvUxUYiMoiXtrxrG+Wf/
 github.com/gethinode/mod-bootstrap v1.2.0/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8=
 github.com/gethinode/mod-bootstrap v1.2.1 h1:z54dgsbhShhlri+X77Z+yLrg0wz/f8C8ojA/wnlhsJc=
 github.com/gethinode/mod-bootstrap v1.2.1/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8=
+github.com/gethinode/mod-bootstrap v1.2.2 h1:Q8E04OKWr9owk7nhQ/NBukUgSFhsECxZsOLEaf5oeiQ=
+github.com/gethinode/mod-bootstrap v1.2.2/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8=
 github.com/gethinode/mod-flexsearch v1.0.1 h1:FJkRsUzSnQTXl3MWCigT4E6vfff870UWTnkGqaDGIhA=
 github.com/gethinode/mod-flexsearch v1.0.1/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.1.0 h1:7BCMyQDlYlskNXuazt8Jg/jg9WREexu2xVkYqThkAX4=
@@ -64,6 +66,8 @@ github.com/gethinode/mod-katex v1.0.2 h1:pIG4n3qLl/IVe7BEiwn+GL8r5lOCtF6FDxlcrPK
 github.com/gethinode/mod-katex v1.0.2/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.3 h1:fvlUWqcUQqv2zRNM2kfmJ6GhXA816Tl1nfVrUkmBStI=
 github.com/gethinode/mod-katex v1.0.3/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
+github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3/mj8=
+github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-leaflet v0.2.3 h1:QQI4h+IH0jZ7fx4q0um2YIEiYBoW3OAfW8qHzbRCDPk=
 github.com/gethinode/mod-leaflet v0.2.3/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.1 h1:H5MaOa+BB1KuVw7abTqfIn/SNzzRsAyx/WQoSe+2Ykc=

hugo_stats.json

@@ -27,7 +27,6 @@
     ],
     "classes": [
       "active",
-      "align-content-center",
       "align-items-center",
       "align-self-center",
       "bg-body",
@@ -78,11 +77,10 @@
       "fa-sun",
       "fab",
       "fas",
-      "feature",
+      "fixed-top",
       "flex-column",
       "flex-fill",
       "flex-grow-1",
-      "flex-wrap",
       "footer",
       "form-control",
       "fs-3",
@@ -118,6 +116,7 @@
       "navbar-brand",
       "navbar-collapse",
       "navbar-expand-md",
+      "navbar-fixed-top",
       "navbar-nav",
       "navbar-toggler",
       "no-js",
@@ -166,8 +165,7 @@
       "toast-container",
       "toast-header",
       "toggler-icon",
-      "top-bar",
-      "w-100"
+      "top-bar"
     ],
     "ids": [
       "-theme",

i18n/de.yaml

@@ -65,6 +65,8 @@
   translation: "Startseite"
 - id: languageSwitcherLabel
   translation: "Sprache"
+- id: close
+  translation: "Schließen"
 
 # Table of contents
 - id: toc

i18n/en.yaml

@@ -71,6 +71,8 @@
   translation: "Home"
 - id: languageSwitcherLabel
   translation: "Language"
+- id: close
+  translation: "Close"
 
 # Table of contents
 - id: toc

i18n/fr.yaml

@@ -67,6 +67,8 @@
   translation: "Accueil"
 - id: languageSwitcherLabel
   translation: "Langage"
+- id: close
+  translation: "Fermer"
 
 # Table of contents
 - id: toc

i18n/nl.yaml

@@ -69,6 +69,8 @@
   translation: "Home"
 - id: languageSwitcherLabel
   translation: "Taal"
+- id: close
+  translation: "Sluiten"
 
 # Table of contents
 - id: toc

layouts/404.html

@@ -1,6 +1,7 @@
 {{ define "main"}}
-    <div class="container-xxl flex-fill d-flex align-content-center flex-wrap feature">
-        <div class="w-100 text-center">
+    <div class="d-flex flex-fill">
+        <div class="container-xxl my-auto">
+            <div class="text-center">
                 <span class="text-secondary fw-bold">
                     {{ partial "assets/icon.html" (dict "icon" "fa face-frown fa-10x") }}
                     <p class="display-1 mt-3 fw-bold">404</p>
@@ -10,4 +11,5 @@
                 <p>{{ T "pageNotFound" $home | safeHTML }}</p>
             </div>
         </div>
+    </div>
 {{ end }}

layouts/_default/baseof.html

@@ -39,7 +39,11 @@
     {{- errorf "Bootstrap is a required module, please add it to 'modules.core' in your site parameters" -}}
 {{- end -}}
 
-{{- $section := .Section }}
+{{- /* Define section headings */ -}}
+{{ $sections := partial "utilities/GetSections.html" . }}
+{{- $.Scratch.Set "sections" $sections -}}
+
+{{- $fullCover := or (or (and .IsHome .Site.Params.home.fullCover) .Page.Params.fullCover) .Site.Params.main.footerBelowFold }}
 
 <!doctype html>
 <html lang="{{ .Site.Language.Lang }}" class="no-js">
@@ -49,7 +53,8 @@
 
     <body>
         {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" .) -}}
-        <div class="d-flex flex-column min-vh-100{{ if .IsHome }}{{ with .Site.Params.home.style }} {{ . }}{{ end }}{{ end }}">
+        <div class="d-flex flex-column min-vh-100">
+            <div class="d-flex flex-column {{ if $fullCover }} fullscreen{{ end }}{{ if .IsHome }} {{ .Site.Params.home.style }}{{ end }}">
                 {{- partial "assets/navbar.html" (dict
                     "page" .
                     "fixed" (string site.Params.navigation.fixed)
@@ -57,15 +62,26 @@
                     "style" (default "light" site.Params.navigation.style)
                     "size" (default "md" site.Params.navigation.size))
                 -}}
-
-            <div class="flex-fill main-content{{ if .Site.Params.main.footerBelowFold }} fullscreen{{ end }} pb-4">
+                <div class="main-content">
+                    {{ block "featured" . }}{{ end -}}
+                </div>
+                {{ if .Site.Params.main.footerBelowFold }}
                     {{ block "main" . }}{{ end -}}
+                {{ end }}
             </div>
 
+            {{ if not .Site.Params.main.footerBelowFold }}
+                {{ block "main" . }}{{ end -}}
                 {{- partial "footer/social.html" . -}}
                 {{- partial "footer/footer.html" . -}}
+            {{ end }}
         </div>
 
+        {{ if .Site.Params.main.footerBelowFold }}
+            {{- partial "footer/social.html" . -}}
+            {{- partial "footer/footer.html" . -}}
+        {{ end }}
+
         {{- partial "footer/toast-container.html" . -}}
         {{- partialCached "footer/scripts.html" (dict "header" false "page" . "core" true) }}
         {{- partial "partials/optional-scripts.html" . -}}

layouts/_default/list.html

@@ -1,16 +1,18 @@
-{{- define "main" -}}
+{{- define "featured" }}
+    {{- $sections := $.Scratch.Get "sections" -}}
+    {{- $headings := slice }}
+    {{ if .Params.sectionMenu }}
+        {{ range $sections }}
+            {{ $headings = $headings | append .title }}
+        {{ end }}
+    {{ end }}
+
     {{- $page := . -}}
     {{- $orientation := site.Params.list.feature.orientation | default "horizontal" -}}
     {{- $width := site.Params.list.feature.width | default 6 -}}
     {{- $justify := site.Params.list.feature.justify | default "center" -}}
     {{- $align := site.Params.list.feature.align | default "center" -}}
-    {{- $sections := slice -}}
-    {{- $sections = $sections | append $page.Type -}}
-    {{ with $page.Params.sections }}
-        {{ $sections = $sections | append . }}
-    {{ end }}
     {{- $actions := $page.Params.actions -}}
-    {{- $headings := slice -}}
     {{- $layout := $page.Params.layout -}}
 
     {{ if $page.IsHome }}
@@ -19,75 +21,7 @@
         {{- $justify = or site.Params.home.feature.justify $justify -}}
         {{- $align = or site.Params.home.feature.align $align -}}
         {{- $actions = (or $actions site.Params.featured.actions) -}}
-        {{- if not $page.Params.sections -}}
-            {{- with site.Params.home.sections }}
-                {{ $sections = $sections | append . }}
-            {{ else }}
-                {{ range $section := site.Sections }}
-                    {{ $sections = $sections | append $section.Type }}
     {{ end }}
-            {{ end }}
-        {{- end -}}
-    {{ else }}
-        {{ $headings = $headings | append $page.Title }}
-        {{- range .Fragments.Headings }}
-            {{- range .Headings }}
-                {{- $headings = $headings | append .Title -}}
-            {{- end -}}
-        {{- end -}}
-    {{ end }}
-
-    {{/* Generate section content first to determine headings */}}
-    {{ $body := "" }}
-    {{- range $index, $section := $sections -}}
-        {{- $sectionPage := site.GetPage "section" $section -}}
-        {{- $sectionURL := $sectionPage.RelPermalink -}}
-        {{ with $sectionPage.Params.redirect}}
-            {{ $target := partial "utilities/GetPage.html" (dict "url" . "page" $page) }}
-            {{- if not $target -}}
-                {{ if eq (printf "%T" $page.File) "*hugolib.fileInfo"}}
-                    {{- errorf "Cannot find redirect target on page '%s': %s" $page.File . -}}
-                {{ else }}
-                    {{- errorf "Cannot find redirect target: %s" . -}}
-                {{ end }}
-            {{ else }}
-                {{- $sectionURL = $target.RelPermalink -}}
-            {{ end }}
-        {{ end }}
-        {{- $title := or $sectionPage.Title $sectionPage.Type -}}
-
-        {{- with (index site.Params.sections $section) -}}
-            {{- with index . "title" }}{{ $title = or . $title }}{{ end -}}
-        {{- end -}}
-    
-        {{- $thumbnail := (or (and (reflect.IsMap $sectionPage.Params.Thumbnail) $sectionPage.Params.Thumbnail.url) $sectionPage.Params.Thumbnail) -}}
-        {{- $icon := $sectionPage.Params.Icon -}}
-        {{- $content := $sectionPage.Content -}}
-        {{- $sectionTitle := strings.FirstUpper $sectionPage.Type -}}
-        {{- $moreTitle := "" -}}
-        {{- with (index site.Params.sections $section) -}}
-            {{- with index . "reference" }}{{ $moreTitle = . }}{{ end -}}
-        {{- end -}}
-        {{- $moreTitle = or $moreTitle (printf (T "more" (pluralize $sectionTitle))) -}}
-
-        {{- $sectionContent := trim (partial "assets/section-list.html" (dict 
-            "page" $page 
-            "section" $section 
-            "home" $page.IsHome
-            "simple" (eq (len $sections) 1)
-            "nested" (and $page.IsHome (eq $section $page.Section))
-            "thumbnail" $thumbnail
-            "icon" $icon
-            "content" $content
-            "moreTitle" $moreTitle
-            "sectionURL" $sectionURL)) " \r\n"
-        -}}
-
-        {{ if $sectionContent }}
-            {{- if not $page.IsHome }}{{ $headings = $headings | append $title }}{{ end -}}
-            {{- $body = printf "%s%s" $body $sectionContent }}
-        {{ end }}
-    {{- end -}}
 
     {{/* Display featured section */}}
     {{- if or (eq $layout "featured") $page.IsHome -}}
@@ -101,9 +35,14 @@
             "align" $align) 
         -}}
     {{- end -}}
+{{ end }}
 
-    {{/* Display main content */}}
-    <div class="container-xxl px-4 px-xxl-0">
+{{- define "main" -}}
+    {{- $page := . -}}
+    {{- $sections := $.Scratch.Get "sections" -}}
+    {{- $layout := $page.Params.layout -}}
+
+    <div class="container-xxl flex-fill px-4 px-xxl-0">
         {{- if ne $layout "featured" -}}
             {{ if and (not $page.IsHome) site.Params.navigation.breadcrumb }}
                 <div>{{ partial "assets/breadcrumb.html" $page }}</div>
@@ -120,7 +59,7 @@
                 {{- end -}}
                 {{- $content := partial "utilities/ProcessContent" (dict "page" $page "raw" $page.RawContent) -}}
                 {{ $content | safeHTML }}
-                {{ if and (and (and $sections (eq (len $sections) 1)) (not $body)) (not $content) }}
+                {{ if and (and $sections (eq (len $sections) 1)) (not $content) }}
                     <p class="pt-4">{{- T "emptyList" }}.</p>
                 {{ end }}
             </div>
@@ -143,5 +82,7 @@
     </div>
 
     {{/* Display generated sections */}}
-    {{ $body | safeHTML }}
+    {{ range $sections }}
+        {{ .content | safeHTML }}
+    {{ end }}
 {{- end -}}

layouts/_default/single.html

@@ -37,7 +37,7 @@
         <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-inledby="offcanvas-label">
             <div class="offcanvas-header">
                 <h5 class="offcanvas-title" id="offcanvas-label">{{ strings.FirstUpper $.Section }}</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+                <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="{{ T "close" }}"></button>
             </div>
             <div class="offcanvas-body">
                 {{ . | safeHTML }}
@@ -45,7 +45,7 @@
         </div>
     {{ end }}
 
-    <div class="container-xxl p-4 px-xxl-0">
+    <div class="container-xxl flex-fill p-4 px-xxl-0">
         {{ if and $menu $hasSidebar -}}
             <div class="row row-cols-md-2 row-cols-lg-3">
                 <div class="col col-md-3 col-lg-2 d-none pt-5 d-md-block sidebar-overflow sticky-top">

layouts/partials/assets/button.html

@@ -161,7 +161,7 @@
     >
     <div class="d-flex justify-content-{{ $justify }}">
         <div class="my-auto">{{ $title | safeHTML }}</div>
-        {{- with $icon }}<div class="align-self-center{{ if $title }}{{ if eq $order "first" }} order-first pe-1{{ else }} ps-1{{ end }}{{ end }}">{{ partial "assets/icon.html" (dict "icon" $icon) }}</div>{{ end }}
+        {{- with $icon }}<div class="align-self-center{{ if $title }}{{ if eq $order "first" }} order-first pe-1{{ else }} ps-1{{ end }}{{ end }}">{{ partial "assets/icon.html" (dict "icon" $icon "spacing" false) }}</div>{{ end }}
     </div>
 
     {{- with $badge }}

layouts/partials/assets/navbar.html

@@ -242,8 +242,9 @@
             <!-- Insert the brand logo or name -->
             <a class="navbar-brand mx-auto" href="{{ site.Home.RelPermalink }}">
                 {{- if (and $logoLight $logoDark) -}}
-                    <img src="{{if $absoluteURL }}{{ absURL $logoLight }}{{ else }}{{ $logoLight }}{{ end }}" class="d-none-dark" alt="{{ $title }} logo" height="30">
-                    <img src="{{if $absoluteURL }}{{ absURL $logoDark }}{{ else }}{{ $logoDark }}{{ end }}" class="d-none-light" alt="{{ $title }} logo" height="30">
+                    {{ $width := partial "utilities/GetWidth.html" (dict "path" $logoLight "height" 30) }}
+                    <img src="{{if $absoluteURL }}{{ absURL $logoLight }}{{ else }}{{ $logoLight }}{{ end }}" class="d-none-dark" alt="{{ $title }} logo" height="30"{{ with $width }} width="{{ . }}"{{ end }}>
+                    <img src="{{if $absoluteURL }}{{ absURL $logoDark }}{{ else }}{{ $logoDark }}{{ end }}" class="d-none-light" alt="{{ $title }} logo" height="30"{{ with $width }} width="{{ . }}"{{ end }}>
                 {{- else if $logo -}}
                     {{ $width := partial "utilities/GetWidth.html" (dict "path" $logo "height" 30) }}
                     <img src="{{if $absoluteURL }}{{ absURL $logo }}{{ else }}{{ $logo }}{{ end }}" alt="{{ $title }} logo" height="30"{{ with $width }} width="{{ . }}"{{ end }}>
@@ -356,7 +357,7 @@
                             <input id="search-input-modal" class="search-input form-control is-search" tabindex="1" type="search" placeholder="{{ T "ui_search" }}..." aria-label="{{ T "ui_search" }}" autocomplete="off">
                         </form>
                     </div>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ T "close" }}"></button>
                 </div>
                 <div class="modal-body p-2">
                     <div class="search-suggestions bg-body" data-no-results="{{ T "ui_no_results" }}"></div>

layouts/partials/assets/page-alert.html

@@ -10,6 +10,6 @@
 {{- if $pageAlertMsg -}}
     <div id="page-alert" class="alert alert-primary alert-no-decoration fade show d-flex align-items-center small m-0 py-1" data-page-alert-version="{{ $version }}">
         <a href="{{ with $pageAlertURL }}{{ . }}{{ else }}#!{{ end }}" class="text-decoration-none flex-grow-1 text-center">{{ $pageAlertMsg }}</a>
-        <button id="page-alert-btn-close" type="button" class="btn-close" data-bs-dismiss="alert"></button>
+        <button id="page-alert-btn-close" type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ T "close" }}"></button>
     </div>
 {{- end -}}

layouts/partials/assets/section-header.html

@@ -20,6 +20,6 @@
     {{- end -}}
 {{- end -}}
 
-{{ with $title }}<p id="{{ anchorize . }}" class="display-4 pt-4{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
+{{ with $title }}<p id="{{ anchorize . }}" class="display-4 py-5{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
 {{ with $description }} <p class="lead mb-5">{{ . }}</p>{{ end }}
 {{ $content }}

layouts/partials/assets/toast.html

@@ -25,7 +25,7 @@
 <div id="{{ $id }}" class="toast{{ with $class }} {{ . }}{{ end }}" role="alert" aria-live="assertive" aria-atomic="true">
     <div class="toast-header">
         {{ with $header }}<strong class="me-auto">{{ . }}</strong>{{ end }}
-        <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
+        <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="{{ T "close" }}"></button>
     </div>
     <div class="toast-body">{{ $message }}</div>
 </div>

layouts/partials/head/stylesheet.html

@@ -39,6 +39,7 @@
     "danger"                  (default "#dc3545" site.Params.style.danger)
     "light"                   (default "#f8f9fa" site.Params.style.light)
     "dark"                    (default "#212529" site.Params.style.dark)
+    "navbar-height"           (site.Params.navigation.offset | default "4em")
     "navbar-offset"           $navbarOffset
     "enable-dark-mode"        (printf "%t" ((default true site.Params.main.enableDarkMode)))
     "import-fonts"            (printf "%t" (not (hasPrefix (lower site.Params.style.themeFontPath) "http")))

layouts/partials/list/featured.html

@@ -31,7 +31,8 @@
         <span class="fs-5 text-muted">{{ $page.Description }}</span>
 
         {{ if $actions }}
-            <div class="hstack{{ if gt (len $actions) 1 }} gap-3{{ end }} justify-content-{{ $align}} pt-5 pt-md-3">
+            {{- $actions = sort $actions "weight" "asc" -}}
+            <div class="hstack{{ if gt (len $actions) 1 }} gap-1{{ end }} justify-content-{{ $align}} pt-5 pt-md-3">
                 {{ range $actions }}
                     {{ partial "assets/button.html" (dict "href" .url "icon" .icon "title" .title "outline" .outline "order" "last" "justify" "start") }}
                 {{ end }}
@@ -61,7 +62,7 @@
 {{- end -}}
 
 <div class="container-fluid p-0 {{ with site.Params.home.feature.color }} bg-{{ . }} bg-opacity-{{ site.Params.style.themeOpacity | default "25" | safeHTML }}{{ end }}">
-    <div class="container-xxl {{ if $breadcrumb }} pb-4 px-4 {{ else }} p-4 {{ end }} px-xxl-0 {{ if site.Params.home.fullCover }} fullscreen{{ end }} d-flex flex-column">
+    <div class="container-xxl {{ if $breadcrumb }} pb-4 px-4 {{ else }} p-4 {{ end }} px-xxl-0 {{ if site.Params.home.fullCover }} fullcover{{ end }} d-flex flex-column">
         {{ if $breadcrumb }}
             <div>{{ partial "assets/breadcrumb.html" $page }}</div>
         {{ end -}}
@@ -74,7 +75,7 @@
                 </div>
             </div>
         {{ else }}
-            <div class="flex-fill row row-cols-1 row-cols-md-2 justify-content-{{ $justify }}">
+            <div class="row row-cols-1 row-cols-md-2 justify-content-{{ $justify }} flex-fill">
                 <div class="col col-12 col-md-{{ $width }} order-1 order-md-0 my-md-auto">
                     {{ partial "partials/list/featured-body.html" (dict "page" $page "headings" $headings "orientation" $orientation "actions" $actions "align" $align) }}
                 </div>

layouts/partials/utilities/GetSections.html

@@ -0,0 +1,76 @@
+{{- $page := . -}}
+
+{{/* Add title for current page */}}
+{{- $items := slice -}}
+{{ $items = $items | append (dict "title" .Title "content" "" )}}
+
+{{/* Identify page sections */}}
+{{- $sections := slice -}}
+{{- $sections = $sections | append $page.Type -}}
+{{ with $page.Params.sections }}
+    {{ $sections = $sections | append . }}
+{{ end }}
+
+{{ if $page.IsHome }}
+    {{- if not $page.Params.sections -}}
+        {{- with site.Params.home.sections }}
+            {{ $sections = $sections | append . }}
+        {{ else }}
+            {{ range $section := site.Sections }}
+                {{ $sections = $sections | append $section.Type }}
+            {{ end }}
+        {{ end }}
+    {{- end -}}
+{{ end }}
+
+{{/* Generate title and content for each section */}}
+{{- range $index, $section := $sections -}}
+    {{- $sectionPage := site.GetPage "section" $section -}}
+    {{- $sectionURL := $sectionPage.RelPermalink -}}
+    {{ with $sectionPage.Params.redirect}}
+        {{ $target := partial "utilities/GetPage.html" (dict "url" . "page" $page) }}
+        {{- if not $target -}}
+            {{ if eq (printf "%T" $page.File) "*hugolib.fileInfo"}}
+                {{- errorf "Cannot find redirect target on page '%s': %s" $page.File . -}}
+            {{ else }}
+                {{- errorf "Cannot find redirect target: %s" . -}}
+            {{ end }}
+        {{ else }}
+            {{- $sectionURL = $target.RelPermalink -}}
+        {{ end }}
+    {{ end }}
+    {{- $title := or $sectionPage.Title $sectionPage.Type -}}
+
+    {{- with (index site.Params.sections $section) -}}
+        {{- with index . "title" }}{{ $title = or . $title }}{{ end -}}
+    {{- end -}}
+
+    {{- $thumbnail := (or (and (reflect.IsMap $sectionPage.Params.Thumbnail) $sectionPage.Params.Thumbnail.url) $sectionPage.Params.Thumbnail) -}}
+    {{- $icon := $sectionPage.Params.Icon -}}
+    {{- $content := $sectionPage.Content -}}
+    {{- $sectionTitle := strings.FirstUpper $sectionPage.Type -}}
+    {{- $moreTitle := "" -}}
+    {{- with (index site.Params.sections $section) -}}
+        {{- with index . "reference" }}{{ $moreTitle = . }}{{ end -}}
+    {{- end -}}
+    {{- $moreTitle = or $moreTitle (printf (T "more" (pluralize $sectionTitle))) -}}
+
+    {{- $sectionContent := trim (partial "assets/section-list.html" (dict 
+        "page" $page 
+        "section" $section 
+        "home" $page.IsHome
+        "simple" (eq (len $sections) 1)
+        "nested" (and $page.IsHome (eq $section $page.Section))
+        "thumbnail" $thumbnail
+        "icon" $icon
+        "content" $content
+        "moreTitle" $moreTitle
+        "sectionURL" $sectionURL)) " \r\n"
+    -}}
+
+    {{ if $sectionContent }}
+        {{ $items = $items | append (dict "title" $title "content" $sectionContent)}}
+    {{ end }}
+{{- end -}}
+
+{{ return $items }}

layouts/partials/utilities/GetWidth.html

@@ -5,7 +5,7 @@
 {{ if eq (path.Ext $path) ".svg" }}
     {{ $path := path.Join "static" .path }}
     {{ if fileExists $path }}
-        {{ with findRE `viewBox="\d+[\s,]\d+[\s,]\d+[\s,]\d+"` (readFile $path) 1 }}
+        {{ with findRE `viewBox="\d*\.?\d+[\s,]\d*\.?\d+[\s,]\d*\.?\d+[\s,]\d*\.?\d+"` (readFile $path) 1 }}
             {{ $content := split (index (split (index . 0) `"`) 1) " " }}
             {{ $viewbox_width := float (index $content 2) }}
             {{ $viewbox_height := float (index $content 3) }}

layouts/shortcodes/alert.html

@@ -56,7 +56,7 @@
         {{ with $icon }}<div class="pt-1 pe-2">{{ . }}</div>{{ end }}
         <div class="flex-grow-1 my-auto">
             {{ trim .Inner " \r\n" | .Page.RenderString | safeHTML -}}
-            {{ if $dismissible }}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>{{ end }}
+            {{ if $dismissible }}<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="{{ T "close" }}"></button>{{ end }}
         </div>
     </div>
 {{- end -}}

layouts/shortcodes/button.html

@@ -27,6 +27,7 @@
     "tab"           Optional flag to indicate if an external link should open in a new tab, defaults to setting
                     "main.externalLinks.tab" in the site's parameters.
     "spacing"       Optional flag to add spacing to the inline button, defaults to "true".
+    "wrapper"       Optional element to wrap the button.
 -->
 
 {{ $error := false }}
@@ -140,6 +141,10 @@
         "spacing" $spacing)
     -}}
 
+    {{ with .Get "wrapper" }}
+        {{ $output = printf `<div class="%s">%s</div>` . $output }}
+    {{ end }}
+
     {{- if .Parent -}}
         {{ $current := .Parent.Scratch.Get "inner" }}
         {{ if $current }}

layouts/tags/list.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-    <div class="container-xxl px-4 px-xxl-0">
+    <div class="container-xxl flex-fill px-4 px-xxl-0">
         <div class="row row-cols-1 row-cols-sm-3">
             <div class="col col-md-2 d-none d-md-block"></div>
             <div class="col col-sm-12 col-md-8">

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.21.0-beta",
+  "version": "0.21.0-beta5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.21.0-beta",
+      "version": "0.21.0-beta5",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.21.0-beta",
+  "version": "0.21.0-beta5",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",