Merge branch 'main' into develop

Update Hugo module dependencies

assets/js/navbar.js

@@ -4,6 +4,8 @@ const togglers = document.querySelectorAll('.main-nav-toggler')
 const modeSelectors = document.querySelectorAll('.switch-mode-collapsed')
 const colorsBG = ['body', 'secondary', 'tertiary']
 
+let scrollPosition = 0
+
 function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
@@ -175,6 +177,20 @@ if (navbar !== null && togglers !== null) {
   document.addEventListener('resize', () => fixed && updateNavbar())
   document.addEventListener('scroll', () => fixed && updateNavbar())
 
+  // hook up collapse events
+  document.querySelectorAll('.navbar-collapse').forEach((collapse) => {
+    collapse.addEventListener('show.bs.collapse', function () {
+      scrollPosition = window.pageYOffset
+      document.body.style.top = `-${scrollPosition}px`
+      document.body.classList.add('navbar-open')
+    })
+    collapse.addEventListener('hide.bs.collapse', function () {
+      document.body.classList.remove('navbar-open')
+      document.body.style.top = ''
+      window.scrollTo({ top: scrollPosition, behavior: 'instant' })
+    })
+  })
+
   // observe state changes to the site's color mode
   const html = document.querySelector('html')
   const config = {

assets/scss/components/_navbar.scss

@@ -435,3 +435,9 @@
 ul.inline-menu {
   padding: 0;
 }
+
+body.navbar-open {
+    overflow: hidden;
+    position: fixed;
+    width: 100%;
+}

exampleSite/hugo_stats.json

@@ -248,6 +248,9 @@
       "fa-activity",
       "fa-address-card",
       "fa-angle-left",
+      "fa-angle-right",
+      "fa-angles-left",
+      "fa-angles-right",
       "fa-arrow-left",
       "fa-arrow-right",
       "fa-bootstrap",
@@ -390,7 +393,6 @@
       "mode-item",
       "mode-toggle",
       "ms-1",
-      "ms-3",
       "ms-auto",
       "ms-md-3",
       "mt-1",
@@ -679,16 +681,16 @@
       "docs",
       "documentation",
       "dropdown-nav-0",
-      "dropdown-panel-2b8de01298f17bfa4ef2f41a8b2c6435",
+      "dropdown-panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e",
-      "dropdown-panel-2e5b2c8f1152552a22527c49478174ee",
+      "dropdown-panel-256968d78244b40725f5d484ea340a5f",
-      "dropdown-panel-3a79089ba962a873cbebd26623a0ad40",
+      "dropdown-panel-29ba03d101604c5caa618293938833b1",
-      "dropdown-panel-3dd6f56b00612d3de3b125c1c360f592",
+      "dropdown-panel-30c508a91fbd512d0bee6f976efc028c",
-      "dropdown-panel-a0bd455780b20f1f2bfda0050bfd2392",
+      "dropdown-panel-47c670e7ebc8dd6e57f5d70dde479a8b",
-      "dropdown-panel-abfe30d02c0a523c8ec3648215b114b7",
+      "dropdown-panel-4c945acd0c9326daa6f433a64262c7a0",
-      "dropdown-panel-bbe2b50a448d584df2e182f25830b5af",
+      "dropdown-panel-552e42166b1b143d516aeccc1fbc7d32",
-      "dropdown-panel-cc10046cc5429efe0f01f5384daf9c94",
+      "dropdown-panel-bf5b105df93a1545b2fc424e3ab1c654",
-      "dropdown-panel-f2d8c9c259691049ab9c2907caab7578",
+      "dropdown-panel-e5aba6d799885a8fd4208fade274e3a7",
-      "dropdown-panel-fc14dc77778d6aa0862cf6dc8cbfbd1d",
+      "dropdown-panel-fd6d8a3429e95196931cd8c08072abf3",
       "eerste-artikel",
       "elements-type",
       "entity-relationship-diagram",
@@ -709,21 +711,24 @@
       "fab-whatsapp",
       "fab-x-twitter",
       "faq",
-      "faq-95cc6eedb4627fb738a7de6f99d7ad1b",
+      "faq-726ff0b8b5ec9328cfef51994d523ad1",
-      "faq-95cc6eedb4627fb738a7de6f99d7ad1b-heading-faq-95cc6eedb4627fb738a7de6f99d7ad1b",
+      "faq-726ff0b8b5ec9328cfef51994d523ad1-heading-faq-726ff0b8b5ec9328cfef51994d523ad1",
-      "faq-95cc6eedb4627fb738a7de6f99d7ad1b-item-0",
+      "faq-726ff0b8b5ec9328cfef51994d523ad1-item-0",
-      "faq-95cc6eedb4627fb738a7de6f99d7ad1b-item-1",
+      "faq-726ff0b8b5ec9328cfef51994d523ad1-item-1",
-      "faq-95cc6eedb4627fb738a7de6f99d7ad1b-item-2",
+      "faq-726ff0b8b5ec9328cfef51994d523ad1-item-2",
-      "faq-c581a6286bf17cf9854fa7889afec9e6",
+      "faq-c610e94909d8dd90e16cbcbc4cc3fe84",
-      "faq-c581a6286bf17cf9854fa7889afec9e6-heading-faq-c581a6286bf17cf9854fa7889afec9e6",
+      "faq-c610e94909d8dd90e16cbcbc4cc3fe84-heading-faq-c610e94909d8dd90e16cbcbc4cc3fe84",
-      "faq-c581a6286bf17cf9854fa7889afec9e6-item-0",
+      "faq-c610e94909d8dd90e16cbcbc4cc3fe84-item-0",
-      "faq-c581a6286bf17cf9854fa7889afec9e6-item-1",
+      "faq-c610e94909d8dd90e16cbcbc4cc3fe84-item-1",
-      "faq-c581a6286bf17cf9854fa7889afec9e6-item-2",
+      "faq-c610e94909d8dd90e16cbcbc4cc3fe84-item-2",
       "fas-1",
       "fas-2",
       "fas-3",
       "fas-address-card",
       "fas-angle-left",
+      "fas-angle-right",
+      "fas-angles-left",
+      "fas-angles-right",
       "fas-arrow-left",
       "fas-arrow-right",
       "fas-chevron-right",
@@ -814,16 +819,16 @@
       "nav-0-btn-1",
       "nav-0-btn-2",
       "nav-nav-0",
-      "nav-panel-2b8de01298f17bfa4ef2f41a8b2c6435",
+      "nav-panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e",
-      "nav-panel-2e5b2c8f1152552a22527c49478174ee",
+      "nav-panel-256968d78244b40725f5d484ea340a5f",
-      "nav-panel-3a79089ba962a873cbebd26623a0ad40",
+      "nav-panel-29ba03d101604c5caa618293938833b1",
-      "nav-panel-3dd6f56b00612d3de3b125c1c360f592",
+      "nav-panel-30c508a91fbd512d0bee6f976efc028c",
-      "nav-panel-a0bd455780b20f1f2bfda0050bfd2392",
+      "nav-panel-47c670e7ebc8dd6e57f5d70dde479a8b",
-      "nav-panel-abfe30d02c0a523c8ec3648215b114b7",
+      "nav-panel-4c945acd0c9326daa6f433a64262c7a0",
-      "nav-panel-bbe2b50a448d584df2e182f25830b5af",
+      "nav-panel-552e42166b1b143d516aeccc1fbc7d32",
-      "nav-panel-cc10046cc5429efe0f01f5384daf9c94",
+      "nav-panel-bf5b105df93a1545b2fc424e3ab1c654",
-      "nav-panel-f2d8c9c259691049ab9c2907caab7578",
+      "nav-panel-e5aba6d799885a8fd4208fade274e3a7",
-      "nav-panel-fc14dc77778d6aa0862cf6dc8cbfbd1d",
+      "nav-panel-fd6d8a3429e95196931cd8c08072abf3",
       "navbar",
       "navbar-0-collapse",
       "navbar-mode",
@@ -833,66 +838,66 @@
       "notification",
       "over-mij",
       "overview",
-      "panel-2b8de01298f17bfa4ef2f41a8b2c6435-0",
+      "panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-0",
-      "panel-2b8de01298f17bfa4ef2f41a8b2c6435-1",
+      "panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-1",
-      "panel-2b8de01298f17bfa4ef2f41a8b2c6435-2",
+      "panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-2",
-      "panel-2b8de01298f17bfa4ef2f41a8b2c6435-btn-0",
+      "panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-btn-0",
-      "panel-2b8de01298f17bfa4ef2f41a8b2c6435-btn-1",
+      "panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-btn-1",
-      "panel-2b8de01298f17bfa4ef2f41a8b2c6435-btn-2",
+      "panel-05f2e5ae7cf8c0ab8a49ba311bdc4d7e-btn-2",
-      "panel-2e5b2c8f1152552a22527c49478174ee-0",
+      "panel-256968d78244b40725f5d484ea340a5f-0",
-      "panel-2e5b2c8f1152552a22527c49478174ee-1",
+      "panel-256968d78244b40725f5d484ea340a5f-1",
-      "panel-2e5b2c8f1152552a22527c49478174ee-2",
+      "panel-256968d78244b40725f5d484ea340a5f-2",
-      "panel-2e5b2c8f1152552a22527c49478174ee-btn-0",
+      "panel-256968d78244b40725f5d484ea340a5f-btn-0",
-      "panel-2e5b2c8f1152552a22527c49478174ee-btn-1",
+      "panel-256968d78244b40725f5d484ea340a5f-btn-1",
-      "panel-2e5b2c8f1152552a22527c49478174ee-btn-2",
+      "panel-256968d78244b40725f5d484ea340a5f-btn-2",
-      "panel-3a79089ba962a873cbebd26623a0ad40-0",
+      "panel-29ba03d101604c5caa618293938833b1-0",
-      "panel-3a79089ba962a873cbebd26623a0ad40-1",
+      "panel-29ba03d101604c5caa618293938833b1-1",
-      "panel-3a79089ba962a873cbebd26623a0ad40-2",
+      "panel-29ba03d101604c5caa618293938833b1-2",
-      "panel-3a79089ba962a873cbebd26623a0ad40-btn-0",
+      "panel-29ba03d101604c5caa618293938833b1-btn-0",
-      "panel-3a79089ba962a873cbebd26623a0ad40-btn-1",
+      "panel-29ba03d101604c5caa618293938833b1-btn-1",
-      "panel-3a79089ba962a873cbebd26623a0ad40-btn-2",
+      "panel-29ba03d101604c5caa618293938833b1-btn-2",
-      "panel-3dd6f56b00612d3de3b125c1c360f592-0",
+      "panel-30c508a91fbd512d0bee6f976efc028c-0",
-      "panel-3dd6f56b00612d3de3b125c1c360f592-1",
+      "panel-30c508a91fbd512d0bee6f976efc028c-1",
-      "panel-3dd6f56b00612d3de3b125c1c360f592-2",
+      "panel-30c508a91fbd512d0bee6f976efc028c-2",
-      "panel-3dd6f56b00612d3de3b125c1c360f592-btn-0",
+      "panel-30c508a91fbd512d0bee6f976efc028c-btn-0",
-      "panel-3dd6f56b00612d3de3b125c1c360f592-btn-1",
+      "panel-30c508a91fbd512d0bee6f976efc028c-btn-1",
-      "panel-3dd6f56b00612d3de3b125c1c360f592-btn-2",
+      "panel-30c508a91fbd512d0bee6f976efc028c-btn-2",
-      "panel-a0bd455780b20f1f2bfda0050bfd2392-0",
+      "panel-47c670e7ebc8dd6e57f5d70dde479a8b-0",
-      "panel-a0bd455780b20f1f2bfda0050bfd2392-1",
+      "panel-47c670e7ebc8dd6e57f5d70dde479a8b-1",
-      "panel-a0bd455780b20f1f2bfda0050bfd2392-2",
+      "panel-47c670e7ebc8dd6e57f5d70dde479a8b-2",
-      "panel-a0bd455780b20f1f2bfda0050bfd2392-btn-0",
+      "panel-47c670e7ebc8dd6e57f5d70dde479a8b-btn-0",
-      "panel-a0bd455780b20f1f2bfda0050bfd2392-btn-1",
+      "panel-47c670e7ebc8dd6e57f5d70dde479a8b-btn-1",
-      "panel-a0bd455780b20f1f2bfda0050bfd2392-btn-2",
+      "panel-47c670e7ebc8dd6e57f5d70dde479a8b-btn-2",
-      "panel-abfe30d02c0a523c8ec3648215b114b7-0",
+      "panel-4c945acd0c9326daa6f433a64262c7a0-0",
-      "panel-abfe30d02c0a523c8ec3648215b114b7-1",
+      "panel-4c945acd0c9326daa6f433a64262c7a0-1",
-      "panel-abfe30d02c0a523c8ec3648215b114b7-2",
+      "panel-4c945acd0c9326daa6f433a64262c7a0-2",
-      "panel-abfe30d02c0a523c8ec3648215b114b7-btn-0",
+      "panel-4c945acd0c9326daa6f433a64262c7a0-btn-0",
-      "panel-abfe30d02c0a523c8ec3648215b114b7-btn-1",
+      "panel-4c945acd0c9326daa6f433a64262c7a0-btn-1",
-      "panel-abfe30d02c0a523c8ec3648215b114b7-btn-2",
+      "panel-4c945acd0c9326daa6f433a64262c7a0-btn-2",
-      "panel-bbe2b50a448d584df2e182f25830b5af-0",
+      "panel-552e42166b1b143d516aeccc1fbc7d32-0",
-      "panel-bbe2b50a448d584df2e182f25830b5af-1",
+      "panel-552e42166b1b143d516aeccc1fbc7d32-1",
-      "panel-bbe2b50a448d584df2e182f25830b5af-2",
+      "panel-552e42166b1b143d516aeccc1fbc7d32-2",
-      "panel-bbe2b50a448d584df2e182f25830b5af-btn-0",
+      "panel-552e42166b1b143d516aeccc1fbc7d32-btn-0",
-      "panel-bbe2b50a448d584df2e182f25830b5af-btn-1",
+      "panel-552e42166b1b143d516aeccc1fbc7d32-btn-1",
-      "panel-bbe2b50a448d584df2e182f25830b5af-btn-2",
+      "panel-552e42166b1b143d516aeccc1fbc7d32-btn-2",
-      "panel-cc10046cc5429efe0f01f5384daf9c94-0",
+      "panel-bf5b105df93a1545b2fc424e3ab1c654-0",
-      "panel-cc10046cc5429efe0f01f5384daf9c94-1",
+      "panel-bf5b105df93a1545b2fc424e3ab1c654-1",
-      "panel-cc10046cc5429efe0f01f5384daf9c94-2",
+      "panel-bf5b105df93a1545b2fc424e3ab1c654-2",
-      "panel-cc10046cc5429efe0f01f5384daf9c94-btn-0",
+      "panel-bf5b105df93a1545b2fc424e3ab1c654-btn-0",
-      "panel-cc10046cc5429efe0f01f5384daf9c94-btn-1",
+      "panel-bf5b105df93a1545b2fc424e3ab1c654-btn-1",
-      "panel-cc10046cc5429efe0f01f5384daf9c94-btn-2",
+      "panel-bf5b105df93a1545b2fc424e3ab1c654-btn-2",
-      "panel-f2d8c9c259691049ab9c2907caab7578-0",
+      "panel-e5aba6d799885a8fd4208fade274e3a7-0",
-      "panel-f2d8c9c259691049ab9c2907caab7578-1",
+      "panel-e5aba6d799885a8fd4208fade274e3a7-1",
-      "panel-f2d8c9c259691049ab9c2907caab7578-2",
+      "panel-e5aba6d799885a8fd4208fade274e3a7-2",
-      "panel-f2d8c9c259691049ab9c2907caab7578-btn-0",
+      "panel-e5aba6d799885a8fd4208fade274e3a7-btn-0",
-      "panel-f2d8c9c259691049ab9c2907caab7578-btn-1",
+      "panel-e5aba6d799885a8fd4208fade274e3a7-btn-1",
-      "panel-f2d8c9c259691049ab9c2907caab7578-btn-2",
+      "panel-e5aba6d799885a8fd4208fade274e3a7-btn-2",
-      "panel-fc14dc77778d6aa0862cf6dc8cbfbd1d-0",
+      "panel-fd6d8a3429e95196931cd8c08072abf3-0",
-      "panel-fc14dc77778d6aa0862cf6dc8cbfbd1d-1",
+      "panel-fd6d8a3429e95196931cd8c08072abf3-1",
-      "panel-fc14dc77778d6aa0862cf6dc8cbfbd1d-2",
+      "panel-fd6d8a3429e95196931cd8c08072abf3-2",
-      "panel-fc14dc77778d6aa0862cf6dc8cbfbd1d-btn-0",
+      "panel-fd6d8a3429e95196931cd8c08072abf3-btn-0",
-      "panel-fc14dc77778d6aa0862cf6dc8cbfbd1d-btn-1",
+      "panel-fd6d8a3429e95196931cd8c08072abf3-btn-1",
-      "panel-fc14dc77778d6aa0862cf6dc8cbfbd1d-btn-2",
+      "panel-fd6d8a3429e95196931cd8c08072abf3-btn-2",
       "panels",
       "persona",
       "pie-chart",

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/cloudcannon/bookshop/hugo/v3 v3.16.5 // indirect
 	github.com/gethinode/mod-bootstrap v1.3.4 // indirect
 	github.com/gethinode/mod-csp v1.0.8 // indirect
-	github.com/gethinode/mod-flexsearch/v3 v3.0.0 // indirect
+	github.com/gethinode/mod-flexsearch/v3 v3.0.1 // indirect
 	github.com/gethinode/mod-fontawesome/v2 v2.1.2 // indirect
 	github.com/gethinode/mod-google-analytics v1.3.3 // indirect
 	github.com/gethinode/mod-katex v1.1.4 // indirect

go.sum

@@ -8,6 +8,8 @@ github.com/gethinode/mod-csp v1.0.8 h1:36bWS7oW5KoPp0ywJXKmfMdM33c/7EPBLjzut0njT
 github.com/gethinode/mod-csp v1.0.8/go.mod h1:Nb22QMicoUHgZQUKP5TCgVrSI8K3KU7jLuLBShmotjg=
 github.com/gethinode/mod-flexsearch/v3 v3.0.0 h1:xFeo5ovZMIcUttvpOamPAMML5+5Au/hewZz/18C2H6Q=
 github.com/gethinode/mod-flexsearch/v3 v3.0.0/go.mod h1:iYvaBF6Y62pjnCepYAqLxoX1ZdEBoD+9caj4cBC+MxY=
+github.com/gethinode/mod-flexsearch/v3 v3.0.1 h1:dHaSImDDp1xtzpW0vc4zychCGOxOCQb764l/XRp0hZc=
+github.com/gethinode/mod-flexsearch/v3 v3.0.1/go.mod h1:iYvaBF6Y62pjnCepYAqLxoX1ZdEBoD+9caj4cBC+MxY=
 github.com/gethinode/mod-fontawesome/v2 v2.1.2 h1:v1aHhbLLwe/05zRHnx9qGqh6b3toDzcLzuv61rWAoGU=
 github.com/gethinode/mod-fontawesome/v2 v2.1.2/go.mod h1:zukv88wXqquEvTJJ9mWWk8Ia+9INnA41wYqusf2RcHA=
 github.com/gethinode/mod-google-analytics v1.3.3 h1:iX2FtXajykfHWJf7MXCQmpezqXgQUADNTeglU81QKpw=

layouts/_partials/assets/nav.html

@@ -56,8 +56,8 @@
 {{- if reflect.IsSlice $args.navTitles }}{{ $titles = $titles | append $args.navTitles }}{{ end -}}
 
 {{/* Main code */}}
-<div class="col col-{{ $breakpoint.current }}-{{ $args.width }} mx-auto">
+<div class="col col-12 col-{{ $breakpoint.current }}-{{ $args.width }} mx-auto">
-    {{ if $args.vertical }}<div class="d-flex align-items-start">{{ end }}
+    {{ if $args.vertical }}<div class="d-{{ if $args.responsive }}{{ $breakpoint.current }}{{ end }}-flex align-items-start">{{ end }}
     {{ if $args.responsive }}
         {{ partial "inline/nav-dropdown.html" (dict
             "id"     $id
@@ -100,7 +100,7 @@
         {{ end -}}
     </ul>
     </div>
-    <div class="tab-content {{ if in (slice "tabs" "callout") $type }}border p-3 bg-body {{ else if $args.vertical }}ms-3{{ else }}mt-3{{ end }}">
+    <div class="tab-content {{ if in (slice "tabs" "callout") $type }}border p-3 bg-body {{ else if $args.vertical }}ms-{{ $breakpoint.current }}-3{{ else }}mt-3{{ end }}">
         {{- $args.navItems | safeHTML -}}
     </div>
     {{- if $args.vertical }}</div>{{ end -}}

layouts/_partials/assets/navbar.html

@@ -135,7 +135,7 @@
                     <div class="d-flex align-items-center">
                         {{- if $sidebar -}}
                             <button class="navbar-toggler collapsed p-0 mx-auto fw-30" type="button" data-bs-toggle="offcanvas"
-                                data-bs-target="#offcanvass-sidebar" aria-controls="offcanvass-sidebar" aria-label="{{ T "toggleSidebar" }}">
+                                data-bs-target="#offcanvas-sidebar" aria-controls="offcanvas-sidebar" aria-label="{{ T "toggleSidebar" }}">
                                 {{- partial "assets/icon.html" (dict "icon" "fas ellipsis fa-fw" "spacing" false) -}}
                             </button>
                         {{- else if eq $align "center" -}}

layouts/_partials/head/seo.html

@@ -58,7 +58,7 @@
     {{ if .IsHome -}}
         <title>{{ .Site.Title }} {{ if .Site.Params.head.tagline }} {{ .Site.Params.main.separator }} {{ .Site.Params.head.tagline }}{{ end }}</title>
     {{ else -}}
-        <title>{{ .Site.Title }} {{ .Site.Params.main.separator }} {{ .Title }}</title>
+        <title>{{ .Title }} {{ .Site.Params.main.separator }} {{ .Site.Title }} </title>
     {{ end -}}
 
     <meta name="description" content="{{ $.Scratch.Get "description" }}">

layouts/single.html

@@ -5,7 +5,7 @@
     {{- $toc := partial "page/panel-toc" . -}}
 
     {{ with $sidebar }}
-        <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-labelledby="offcanvas-label">
+        <div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvas-sidebar" aria-labelledby="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="{{ T "close" }}"></button>