Merge pull request #1545 from gethinode/radius

fix: improve init of color mode icons

.github/codeql/codeql-config.yml

@@ -0,0 +1,8 @@
+paths:
+  - 'assets/js'
+paths-ignore:
+  - '**/vendor'
+  - '**/critical/languageSelector.js'
+  - '**/critical/color.js'
+  - '**/navbar.js'
+  - '**/sharing.js'

.github/workflows/codeql.yml

@@ -0,0 +1,102 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '44 1 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: javascript-typescript
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v5
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        config-file: ./.github/codeql/codeql-config.yml
+
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/lint-build.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Set up Node.js
       uses: actions/setup-node@v4
@@ -53,7 +53,7 @@ jobs:
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Install Go
       uses: actions/setup-go@v5

.github/workflows/mod-update.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Setup Node.js
       uses: actions/setup-node@v4

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
     
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

assets/js/critical/color.js

@@ -43,9 +43,7 @@
       document.documentElement.setAttribute('data-bs-theme', theme)
     }
 
-    document.querySelectorAll('.navbar-mode-selector').forEach(chk => {
+    updateSelectors()
-      chk.checked = (document.documentElement.getAttribute('data-bs-theme') === 'light')
-    })
   }
 
   // alternates the currently active theme
@@ -54,6 +52,12 @@
     setTheme(target)
   }
 
+  function updateSelectors() {
+    document.querySelectorAll('.navbar-mode-selector').forEach(chk => {
+      chk.checked = (document.documentElement.getAttribute('data-bs-theme') === 'light')
+    })
+  }
+
   window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
     if (storedTheme !== 'light' || storedTheme !== 'dark') {
       setTheme(getPreferredTheme())
@@ -69,7 +73,12 @@
     })
   })
 
-  // initialize theme directly when script is invoked
+  window.addEventListener('load', () => {
+    // update the selectors when all elements are ready
+    updateSelectors()
+  })
+
+  // initialize theme as soon as possible to reduce screen flickering
   setTheme(getTheme())
 })()
 

assets/js/modal.js

@@ -0,0 +1,6 @@
+document.addEventListener('hide.bs.modal', function (event) {
+  // Remove the focus from the active element
+  if (document.activeElement) {
+    document.activeElement.blur()
+  }
+})

assets/js/toc.js

@@ -0,0 +1,13 @@
+const btnTOCShowMore = document.getElementById('btnTOCShowMore')
+if (btnTOCShowMore !== null) {
+  btnTOCShowMore.addEventListener('click', (e) => {
+    btnTOCShowMore.style.display = 'none'
+  })
+}
+
+const btnTOCShowLess = document.getElementById('btnTOCShowLess')
+if ((btnTOCShowLess !== null) && (btnTOCShowMore !== null)) {
+  btnTOCShowLess.addEventListener('click', (e) => {
+    btnTOCShowMore.style.display = 'initial'
+  })
+}

assets/scss/app-dart.scss

@@ -24,8 +24,10 @@
 @import "components/carousel.scss";
 @import "components/clipboard.scss";
 @import "components/command.scss";
+@import "components/docs.scss";
 @import "components/feature.scss";
 @import "components/footer.scss";
+@import "components/kbd.scss";
 @import "components/nav.scss";
 @import "components/navbar.scss";
 @import "components/img.scss";
@@ -35,6 +37,7 @@
 @import "components/sidebar.scss";
 @import "components/syntax-dart.scss"; // note: modified for dart-sass
 @import "components/table.scss";
+@import "components/toast.scss";
 @import "components/timeline.scss";
 @import "components/toc.scss";
 @import "components/video.scss";

assets/scss/app.scss

@@ -22,8 +22,10 @@
 @import "components/carousel.scss";
 @import "components/clipboard.scss";
 @import "components/command.scss";
+@import "components/docs.scss";
 @import "components/feature.scss";
 @import "components/footer.scss";
+@import "components/kbd.scss";
 @import "components/nav.scss";
 @import "components/navbar.scss";
 @import "components/img.scss";
@@ -33,6 +35,7 @@
 @import "components/sidebar.scss";
 @import "components/syntax.scss";
 @import "components/table.scss";
+@import "components/toast.scss";
 @import "components/timeline.scss";
 @import "components/toc.scss";
 @import "components/video.scss";

assets/scss/common/_styles.scss

@@ -14,6 +14,10 @@ a:active {
     text-decoration: none;
 }
 
+div.rounded, img.rounded {
+    --bs-border-radius: #{$theme-border-radius};
+}
+
 //
 // Ensure main page is rendered to full viewport height
 //

assets/scss/common/_variables-dart.scss

@@ -16,12 +16,12 @@ $font-weight-normal:            300 !default;
 $font-weight-bold:              600 !default;
 $font-weight-bolder:            bolder !default;
 
-$theme-border-radius:           1rem;
-
 strong {
     font-weight:                600 if($enable-important-utilities, !important, null);
 }
 
+$theme-border-radius:           0.375rem;
+
 $navbar-height:                 h.$navbar-height;
 $navbar-offset:                 h.$navbar-offset;
 $navbar-offset-xs:              h.$navbar-offset-xs;

assets/scss/common/_variables.scss

@@ -17,13 +17,13 @@ $font-weight-normal:            300 !default;
 $font-weight-bold:              600 !default;
 $font-weight-bolder:            bolder !default;
 
-$theme-border-radius:           1rem;
-
 strong {
     font-weight:                600 if($enable-important-utilities, !important, null);
 }
 // scss-docs-end font
 
+$theme-border-radius:           0.375rem;
+
 $white:                       #fff !default;
 $black:                       #000 !default;
 $body-bg:                     #fff !default;

assets/scss/components/_button.scss

@@ -52,3 +52,7 @@ a.btn {
 .btn-xs {
   @include button-size($btn-padding-y-xs, $btn-padding-x-xs, $btn-font-size-xs, $btn-border-radius-xs);
 }
+
+.btn {
+    --bs-border-radius: #{$theme-border-radius};
+}

assets/scss/components/_card.scss

@@ -6,6 +6,9 @@
 }
 
 .card {
+    --bs-card-border-radius: #{$theme-border-radius};
+    --bs-card-inner-border-radius: #{$theme-border-radius};
+    --bs-border-radius: #{$theme-border-radius};
     --bs-card-bg: transparent;
 }
 
@@ -28,6 +31,13 @@
     cursor: pointer;
 }
 
+.card-img-top {
+    --bs-border-radius: #{$theme-border-radius};
+
+    border-top-left-radius: var(--bs-border-radius) !important;
+    border-top-right-radius: var(--bs-border-radius) !important;
+}
+
 .card-img-wrap img {
     transition: transform 0.25s ease;
     width: 100%;

assets/scss/components/_carousel.scss

@@ -1,3 +1,7 @@
+.carousel-inner {
+    border-radius: #{$theme-border-radius};
+}
+
 .gradient {
     width: 100%;
     height: 100%;

assets/scss/components/_docs.scss

@@ -0,0 +1,22 @@
+.docs-controls .nav-link,
+.file-controls .nav-link {
+    border-top-left-radius: #{$theme-border-radius};
+    border-top-right-radius: #{$theme-border-radius};
+    margin-left: #{$theme-border-radius};
+
+    &:hover,
+    &:focus {
+        border-bottom: 0;
+    }
+}
+
+.docs-panel,
+.file-panel {
+    border: 1px solid var(--#{$prefix}border-color);
+    overflow: hidden;
+}
+
+.docs-panel, .docs-panel .collapse,
+.file-panel, .file-panel .collapse {
+    border-radius: #{$theme-border-radius};
+}

assets/scss/components/_img.scss

@@ -27,3 +27,7 @@
     width: 100vw;
     object-fit: cover;
 }
+
+.figure-caption {
+    margin-left: #{$theme-border-radius};
+}

assets/scss/components/_kbd.scss

@@ -0,0 +1,3 @@
+kbd {
+    border-radius: #{$theme-border-radius};
+}

assets/scss/components/_nav.scss

@@ -84,6 +84,14 @@
     border-color: var(--#{$prefix}border-color);
 }
 
+.nav-callout, .pagination {
+    --bs-border-radius: #{$theme-border-radius};
+}
+
+.nav-callout .tab-content {
+    border-radius: #{$theme-border-radius};
+}
+
 @if $enable-dark-mode {
     @include color-mode(dark) {
         .nav-callout, .tab-content {

assets/scss/components/_navbar.scss

@@ -319,3 +319,7 @@
     position: absolute;
     z-index: $zindex-fixed;
 }
+
+.form-control.is-search {
+    border: 1px solid var(--bs-border-color) !important;
+}

assets/scss/components/_sidebar.scss

@@ -11,6 +11,12 @@
 }
 
 .sidebar-item {
+    --bs-border-radius: #{$theme-border-radius};
+    --bs-border-radius-sm: #{$theme-border-radius};
+    --bs-border-radius-lg: #{$theme-border-radius};
+    --bs-border-radius-xl: #{$theme-border-radius};
+    --bs-border-radius-xxl: #{$theme-border-radius};
+
     color: rgba(0, 0, 0, 0.65);
     margin-left: 0 !important;
     display: inline-block;
@@ -28,6 +34,8 @@
 }
 
 .sidebar-item-group {
+    border-radius: #{$theme-border-radius};
+
     &:hover,
     &:focus {
         color: $primary;

assets/scss/components/_syntax-dart.scss

@@ -16,6 +16,10 @@
     flex: 1;
 }
 
+.codeblock.syntax-highlight, .command.syntax-highlight {
+    border-radius: #{$theme-border-radius};
+}
+
 .syntax-highlight {
     background-color: var(--bs-light) if($enable-important-utilities, !important, null);
     overflow-x: auto;

assets/scss/components/_syntax.scss

@@ -16,6 +16,10 @@
     flex: 1;
 }
 
+.codeblock.syntax-highlight, .command.syntax-highlight {
+    border-radius: #{$theme-border-radius};
+}
+
 .syntax-highlight {
     background-color: var(--bs-light) if($enable-important-utilities, !important, null);
     overflow-x: auto;

assets/scss/components/_timeline.scss

@@ -26,6 +26,10 @@ $semi-circle-border: 0.2rem;
 
 // scss-docs-end timeline
 
+.timeline-container {
+    border-radius: #{$theme-border-radius}; 
+}
+
 .timeline, .timeline-sm {
     position: relative;
 }

assets/scss/components/_toast.scss

@@ -0,0 +1,4 @@
+.toast {
+    border-radius: #{$theme-border-radius};
+    overflow: hidden;
+}

assets/scss/components/_toc.scss

@@ -74,6 +74,14 @@
     }
 }
 
+.btn-link.toc-item {
+    font-size: inherit;
+}
+
+#btnTOCShowMore {
+    padding-top: 0.875rem;
+}
+
 a.toc-item {
     display: block;
 }

assets/scss/components/_video.scss

@@ -3,6 +3,7 @@
     padding-bottom: 56.25%;
     height: 0;
     overflow: hidden;
+    border-radius: #{$theme-border-radius};
 }
 
 .video-embedded > iframe {
@@ -11,7 +12,7 @@
     left: 0;
     width: 100%;
     height: 100%;
-    border:0;
+    border: 0;
 }
 
 // Adapted from https://github.com/gohugoio/hugo/tpl/tplimpl/embedded/templates/shortcodes/vimeo_simple.html

assets/scss/theme/fonts.scss

@@ -10,7 +10,7 @@
 
 /* inter-200 - latin */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-display: block; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Inter';
     font-style: normal;
     font-weight: 200;
@@ -23,7 +23,7 @@
   }
   /* inter-300 - latin */
   @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-display: block; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Inter';
     font-style: normal;
     font-weight: 300;
@@ -36,7 +36,7 @@
   }
   /* inter-regular - latin */
   @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-display: block; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Inter';
     font-style: normal;
     font-weight: 400;
@@ -49,7 +49,7 @@
   }
   /* inter-600 - latin */
   @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-display: block; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Inter';
     font-style: normal;
     font-weight: 600;

component-library/components/articles/articles.hugo.html

@@ -88,7 +88,7 @@
 		)}}
 
 		{{ if $args.scroll }}
-			{{ $partial := "assets/stack.html" }}
+			{{ $partial = "assets/stack.html" }}
 			{{ $params = merge $params (dict 
 				"header-style" "none"
 				"body-style"   "title"

component-library/components/cta/cta.scss

@@ -2,6 +2,10 @@
     background-color: var(--#{$prefix}primary-bg-subtle);
 }
 
+.cta, .background-img-fluid  {
+    border-radius: #{$theme-border-radius} if($enable-important-utilities, !important, null);
+}
+
 .cta .contact-img {
     background-color: var(--#{$prefix}body-bg);
     border-radius: var(--bs-border-radius);

component-library/components/panels/panels.scss

@@ -1,3 +1,13 @@
 .panels .dropdown-toggle {
     text-decoration: none !important;
 }
+
+.panels .nav-tabs {
+    border-top-left-radius: #{$theme-border-radius};
+    border-top-right-radius: #{$theme-border-radius};
+    margin-left: #{$theme-border-radius};
+}
+
+.panels .tab-content {
+    border-radius: #{$theme-border-radius};
+}

component-library/components/video-message/video-message.bookshop.yml

@@ -31,6 +31,7 @@ blueprint:
     media-id:
     autoplay:
     query-args:
+    color:
   cols:
   messages:
     - title:

component-library/components/video-message/video-message.hugo.html

@@ -28,6 +28,7 @@
 	{{ $queryArgs := .queryArgs }}
 	{{ $border := .border }}
 	{{ $padding := .padding }}
+	{{ $color := .color }}
 
 	{{ if site.Params.env_bookshop_live }}
 		{{/* Define dummy content as we cannot retrieve video data in live mode */}}
@@ -36,7 +37,7 @@
 			"ratio" "21x9"
 			"wrapper" (printf "text-center mb-%d" $padding.y)) -}}
 	{{ else }}
-        <div class="video-container{{ if $border }} video-container-border{{ end}}">
+        <div class="video-container{{ if $border }} video-container-border{{ end}} {{ with $color }}bg-{{ . }}{{ end }}">
 			{{ partial "assets/video.html" (dict
 				"page"       page
 				"provider"   $provider
@@ -117,6 +118,7 @@
 				"query-args" .queryArgs
 				"border"     $.border
 				"padding"    $padding
+				"color"      .color
 			) -}}
 		{{ end }}
 		</div>
@@ -142,6 +144,7 @@
 							"query-args" .queryArgs
 							"border"     $.border
 							"padding"    $padding
+							"color"      .color
 						) -}}
 					{{ end }}
 				</div>

component-library/components/video-message/video-message.scss

@@ -2,6 +2,7 @@
     --bs-video-border-color: var(--bs-primary);
     --bs-video-border-width: 1rem;
     
+    border-radius: $theme-border-radius;
     position: relative;
 }
 

config/_default/hugo.toml

@@ -188,7 +188,7 @@ home = ["HTML", "RSS", "REDIR", "netlify", "server"]
   [[module.imports]]
     path = "github.com/gethinode/mod-lottie"
   [[module.imports]]
-    path = "github.com/gethinode/mod-mermaid/v2"
+    path = "github.com/gethinode/mod-mermaid/v3"
   [[module.imports]]
     path = "github.com/gethinode/mod-simple-datatables/v2"
   [[module.imports]]

config/_default/params.toml

@@ -97,6 +97,9 @@
     toc = true
     sidebar = true
     size = "md"
+    startLevel = 2
+    endLevel = 3
+    maxNumHeadings = 9
     [navigation.padding]
         x = 4
         y = 4

config/postcss.config.js

@@ -30,6 +30,7 @@ const purgecss = purgeCSSPlugin({
       './_vendor/github.com/gethinode/mod-flexsearch/v2/assets/scss/modules/flexsearch/flexsearch.scss',
       './_vendor/github.com/gethinode/mod-katex/dist/katex.scss',
       './_vendor/github.com/gethinode/mod-leaflet/dist/leaflet.scss',
+      './_vendor/github.com/gethinode/mod-mermaid/v3/assets/scss/mermaid.scss',
       './_vendor/github.com/gethinode/mod-simple-datatables/v2/dist/simple-datatables.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_carousel.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_dropdown.scss',

data/structures/script.yml

@@ -1,6 +1,6 @@
 comment: >-
   Includes a reference to a local or external JavaScript file. Hinode uses the
-  template defined in `layouts/partials/templates/script.html` to generate the
+  template defined in `layouts/_partials/templates/script.html` to generate the
   link to a (bundled) JavaScript file. It includes context such as the state,
   category, and integrity. For example, you can adapt this template to implement
   cookie consent management.
@@ -44,3 +44,10 @@ arguments:
     optional: true
     comment: >-
       Cryptographic hash of the script to enable Subresource Integrity (SRI).
+  script-type:
+    type: string
+    optional: true
+    release: v1.7.0
+    comment: >-
+      Type of the attribute of the script. Set the value to `module` to import
+      the script as a JavaScript module.

exampleSite/config/_default/params.toml

@@ -51,6 +51,9 @@
     toc = true
     sidebar = true
     size = "md"
+    startLevel = 2
+    endLevel = 3
+    maxNumHeadings = 9
     [navigation.padding]
         x = 4
         y = 4
@@ -129,7 +132,7 @@
     # themeFontPath = "https://fonts.googleapis.com/css2?family=Inter:wght@200;300;600&display=swap" # external path
     themeFontPath = "/fonts" # local path
     themeFontPreload = "/fonts/inter-v12-latin-regular.woff2"
-    purge = false
+    purge = true
 # toml-docs-end theme-colors
 
 [schema]
@@ -169,3 +172,6 @@
 
 [modules.cookieyes]
     url = "https://cdn-cookieyes.com/client_data/a54b5553f349dd13bd225f8e/script.js"
+
+[modules.mermaid]
+    elk = true

exampleSite/config/postcss.config.js

@@ -30,6 +30,7 @@ const purgecss = purgeCSSPlugin({
       './_vendor/github.com/gethinode/mod-flexsearch/v2/assets/scss/modules/flexsearch/flexsearch.scss',
       './_vendor/github.com/gethinode/mod-katex/dist/katex.scss',
       './_vendor/github.com/gethinode/mod-leaflet/dist/leaflet.scss',
+      './_vendor/github.com/gethinode/mod-mermaid/v3/assets/scss/mermaid.scss',
       './_vendor/github.com/gethinode/mod-simple-datatables/v2/dist/simple-datatables.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_carousel.scss',
       './_vendor/github.com/twbs/bootstrap/scss/_dropdown.scss',

exampleSite/content/en/blocks/video-message.md

@@ -29,6 +29,7 @@ The `video` content block renders a horizontal line to separate sections. The se
     provider: vimeo
     media-id: "55073825"
     autoplay: true
+    color: black
   messages:
     - title: First Message
       icon: fas 1

exampleSite/content/en/blog/components.md

@@ -94,6 +94,22 @@ As an example, the following shortcode displays an interactive map of the city o
 
 ## Mermaid Diagrams
 
+### Shortcode (with controls and frontmatter)
+
+<!-- markdownlint-disable MD003 MD022 -->
+{{< mermaid controls=true >}}
+---
+config:
+  layout: elk.stress
+  look: handDrawn
+  theme: forest
+---
+flowchart TD
+  A --> B
+  A --> C
+{{< /mermaid >}}
+<!-- markdownlint-enable MD003 MD022 -->
+
 ### Flowchart
 
 ```mermaid

exampleSite/hugo_stats.json

@@ -98,22 +98,20 @@
       "ball",
       "bg-bg-body-tertiary",
       "bg-bg-primary-subtle",
+      "bg-black",
       "bg-body",
       "bg-body-tertiary",
       "bg-danger",
       "bg-opacity-10",
       "bg-primary",
       "bg-primary-subtle",
-      "bg-secondary-subtle",
       "bi",
       "bi-activity",
       "border",
       "border-0",
       "border-1",
       "border-bottom",
-      "border-end",
       "border-none",
-      "border-start",
       "border-top",
       "bottom-0",
       "bottom-bar",
@@ -192,10 +190,15 @@
       "col-sm-6",
       "collapse",
       "collapsed",
+      "command",
       "contact-img",
       "container",
       "container-fluid",
       "container-xxl",
+      "control-btn",
+      "control-btn-expand",
+      "control-btn-zoom-in",
+      "control-btn-zoom-out",
       "cta",
       "custom",
       "d-block",
@@ -213,10 +216,16 @@
       "d-sm-block",
       "d-sm-none",
       "data-table",
+      "diagram-container",
+      "diagram-controls",
+      "diagram-wrapper",
       "disabled",
       "display-1",
       "display-4",
       "display-6",
+      "docs",
+      "docs-controls",
+      "docs-panel",
       "dropdown",
       "dropdown-divider-bg",
       "dropdown-item",
@@ -243,7 +252,6 @@
       "fa-arrow-left",
       "fa-arrow-right",
       "fa-bootstrap",
-      "fa-check",
       "fa-chevron-right",
       "fa-circle",
       "fa-circle-check",
@@ -253,6 +261,7 @@
       "fa-divide",
       "fa-docker",
       "fa-ellipsis",
+      "fa-expand",
       "fa-face-frown",
       "fa-facebook",
       "fa-fluid",
@@ -267,10 +276,11 @@
       "fa-info",
       "fa-inverse",
       "fa-lg",
-      "fa-li",
       "fa-link",
       "fa-linkedin",
       "fa-magnifying-glass",
+      "fa-magnifying-glass-minus",
+      "fa-magnifying-glass-plus",
       "fa-medium",
       "fa-moon",
       "fa-rocket",
@@ -283,17 +293,20 @@
       "fa-stack-2x",
       "fa-sun",
       "fa-timeline",
-      "fa-ul",
       "fa-up-right-from-square",
       "fa-whatsapp",
       "fa-wrapper",
       "fa-x-twitter",
+      "fa-xl",
       "fa-xs",
       "fab",
       "fade",
       "faq",
       "fas",
       "figure-caption",
+      "file",
+      "file-controls",
+      "file-panel",
       "fixed-top",
       "flex-column",
       "flex-fill",
@@ -344,7 +357,6 @@
       "justify-content-between",
       "justify-content-center",
       "justify-content-end",
-      "justify-content-md-end",
       "justify-content-md-start",
       "justify-content-start",
       "katex",
@@ -467,7 +479,6 @@
       "px-md-4",
       "px-xxl-0",
       "py-%!d(string=0)",
-      "py-0",
       "py-1",
       "py-2",
       "py-3",
@@ -533,7 +544,6 @@
       "text-decoration-none",
       "text-end",
       "text-info",
-      "text-md-start",
       "text-muted",
       "text-nowrap",
       "text-primary",
@@ -550,6 +560,7 @@
       "timeline-bg-primary-subtle",
       "timeline-connector-end",
       "timeline-connector-start",
+      "timeline-container",
       "timeline-description-text-end",
       "timeline-description-text-start",
       "timeline-dot",
@@ -590,7 +601,6 @@
     ],
     "ids": [
       "abbr",
-      "accelerate-your-data-products",
       "accordion",
       "accordion-0",
       "accordion-0-heading-0",
@@ -600,10 +610,8 @@
       "accordion-0-item-1",
       "accordion-0-item-2",
       "accordéon",
-      "ai",
       "alert",
       "alerte",
-      "analytics",
       "animatie",
       "animation",
       "args",
@@ -618,6 +626,8 @@
       "body-file-collapse-1",
       "bouton",
       "breadcrumb",
+      "btnTOCShowLess",
+      "btnTOCShowMore",
       "button",
       "button-group",
       "c4-diagram",
@@ -640,17 +650,15 @@
       "content-blocks",
       "cookies-etc",
       "custom-activity",
-      "data-quality",
       "data-tables",
       "docs",
       "documentation",
       "dropdown-nav-0",
-      "dropdown-panel-071ec18d100b1b143a52290acbccb5d2",
+      "dropdown-panel-559429f8ed9abd968d8178a39c12161e",
-      "dropdown-panel-3",
+      "dropdown-panel-83b60f1acfc59ebca2632e49adc142ea",
-      "dropdown-panel-353faae960d8e5f264e975d330a6b22f",
+      "dropdown-panel-905f7532046e86d10df934d0bb7e6973",
-      "dropdown-panel-6f7573c76bb16d93358060c54c56bb25",
+      "dropdown-panel-96d18c1dcc343600bc916fe2c37fa4aa",
-      "dropdown-panel-78e144cc4646b9bdebe8f1d59a62159d",
+      "dropdown-panel-f6ad6d3ba9fb32a749be0499120c5f22",
-      "dropdown-panel-fbf9d10f31358572a82e263a6abb2d8c",
       "elements-type",
       "entity-relationship-diagram",
       "example",
@@ -668,11 +676,11 @@
       "fab-medium",
       "fab-whatsapp",
       "fab-x-twitter",
-      "faq-5113bdcf965ec7494b27d4fb87b2d30c",
+      "faq-106714aa77d6de0ac39f269ae5995985",
-      "faq-5113bdcf965ec7494b27d4fb87b2d30c-heading-faq-5113bdcf965ec7494b27d4fb87b2d30c",
+      "faq-106714aa77d6de0ac39f269ae5995985-heading-faq-106714aa77d6de0ac39f269ae5995985",
-      "faq-5113bdcf965ec7494b27d4fb87b2d30c-item-0",
+      "faq-106714aa77d6de0ac39f269ae5995985-item-0",
-      "faq-5113bdcf965ec7494b27d4fb87b2d30c-item-1",
+      "faq-106714aa77d6de0ac39f269ae5995985-item-1",
-      "faq-5113bdcf965ec7494b27d4fb87b2d30c-item-2",
+      "faq-106714aa77d6de0ac39f269ae5995985-item-2",
       "fas-1",
       "fas-2",
       "fas-3",
@@ -683,7 +691,6 @@
       "fas-angles-right",
       "fas-arrow-left",
       "fas-arrow-right",
-      "fas-check",
       "fas-chevron-right",
       "fas-circle",
       "fas-circle-check",
@@ -692,6 +699,7 @@
       "fas-code",
       "fas-divide",
       "fas-ellipsis",
+      "fas-expand",
       "fas-globe",
       "fas-grip",
       "fas-h",
@@ -700,6 +708,8 @@
       "fas-info",
       "fas-link",
       "fas-magnifying-glass",
+      "fas-magnifying-glass-minus",
+      "fas-magnifying-glass-plus",
       "fas-moon",
       "fas-rocket",
       "fas-share-nodes",
@@ -743,7 +753,6 @@
       "items-type",
       "kaart",
       "kbd",
-      "kickstart-your-data-stack-without-coding",
       "language-selector",
       "leaflet-map-0",
       "lien",
@@ -758,7 +767,6 @@
       "messages-type",
       "mindmap",
       "more-type",
-      "move-your-data-into-action",
       "nav",
       "nav-0-0",
       "nav-0-1",
@@ -767,12 +775,11 @@
       "nav-0-btn-1",
       "nav-0-btn-2",
       "nav-nav-0",
-      "nav-panel-071ec18d100b1b143a52290acbccb5d2",
+      "nav-panel-559429f8ed9abd968d8178a39c12161e",
-      "nav-panel-3",
+      "nav-panel-83b60f1acfc59ebca2632e49adc142ea",
-      "nav-panel-353faae960d8e5f264e975d330a6b22f",
+      "nav-panel-905f7532046e86d10df934d0bb7e6973",
-      "nav-panel-6f7573c76bb16d93358060c54c56bb25",
+      "nav-panel-96d18c1dcc343600bc916fe2c37fa4aa",
-      "nav-panel-78e144cc4646b9bdebe8f1d59a62159d",
+      "nav-panel-f6ad6d3ba9fb32a749be0499120c5f22",
-      "nav-panel-fbf9d10f31358572a82e263a6abb2d8c",
       "navbar",
       "navbar-0-collapse",
       "navbar-mode",
@@ -781,42 +788,36 @@
       "navigation",
       "notification",
       "overview",
-      "panel-071ec18d100b1b143a52290acbccb5d2-0",
+      "panel-559429f8ed9abd968d8178a39c12161e-0",
-      "panel-071ec18d100b1b143a52290acbccb5d2-1",
+      "panel-559429f8ed9abd968d8178a39c12161e-1",
-      "panel-071ec18d100b1b143a52290acbccb5d2-2",
+      "panel-559429f8ed9abd968d8178a39c12161e-2",
-      "panel-071ec18d100b1b143a52290acbccb5d2-btn-0",
+      "panel-559429f8ed9abd968d8178a39c12161e-btn-0",
-      "panel-071ec18d100b1b143a52290acbccb5d2-btn-1",
+      "panel-559429f8ed9abd968d8178a39c12161e-btn-1",
-      "panel-071ec18d100b1b143a52290acbccb5d2-btn-2",
+      "panel-559429f8ed9abd968d8178a39c12161e-btn-2",
-      "panel-3-0",
+      "panel-83b60f1acfc59ebca2632e49adc142ea-0",
-      "panel-3-1",
+      "panel-83b60f1acfc59ebca2632e49adc142ea-1",
-      "panel-3-2",
+      "panel-83b60f1acfc59ebca2632e49adc142ea-2",
-      "panel-3-btn-0",
+      "panel-83b60f1acfc59ebca2632e49adc142ea-btn-0",
-      "panel-3-btn-1",
+      "panel-83b60f1acfc59ebca2632e49adc142ea-btn-1",
-      "panel-3-btn-2",
+      "panel-83b60f1acfc59ebca2632e49adc142ea-btn-2",
-      "panel-353faae960d8e5f264e975d330a6b22f-0",
+      "panel-905f7532046e86d10df934d0bb7e6973-0",
-      "panel-353faae960d8e5f264e975d330a6b22f-1",
+      "panel-905f7532046e86d10df934d0bb7e6973-1",
-      "panel-353faae960d8e5f264e975d330a6b22f-2",
+      "panel-905f7532046e86d10df934d0bb7e6973-2",
-      "panel-353faae960d8e5f264e975d330a6b22f-btn-0",
+      "panel-905f7532046e86d10df934d0bb7e6973-btn-0",
-      "panel-353faae960d8e5f264e975d330a6b22f-btn-1",
+      "panel-905f7532046e86d10df934d0bb7e6973-btn-1",
-      "panel-353faae960d8e5f264e975d330a6b22f-btn-2",
+      "panel-905f7532046e86d10df934d0bb7e6973-btn-2",
-      "panel-6f7573c76bb16d93358060c54c56bb25-0",
+      "panel-96d18c1dcc343600bc916fe2c37fa4aa-0",
-      "panel-6f7573c76bb16d93358060c54c56bb25-1",
+      "panel-96d18c1dcc343600bc916fe2c37fa4aa-1",
-      "panel-6f7573c76bb16d93358060c54c56bb25-2",
+      "panel-96d18c1dcc343600bc916fe2c37fa4aa-2",
-      "panel-6f7573c76bb16d93358060c54c56bb25-btn-0",
+      "panel-96d18c1dcc343600bc916fe2c37fa4aa-btn-0",
-      "panel-6f7573c76bb16d93358060c54c56bb25-btn-1",
+      "panel-96d18c1dcc343600bc916fe2c37fa4aa-btn-1",
-      "panel-6f7573c76bb16d93358060c54c56bb25-btn-2",
+      "panel-96d18c1dcc343600bc916fe2c37fa4aa-btn-2",
-      "panel-78e144cc4646b9bdebe8f1d59a62159d-0",
+      "panel-f6ad6d3ba9fb32a749be0499120c5f22-0",
-      "panel-78e144cc4646b9bdebe8f1d59a62159d-1",
+      "panel-f6ad6d3ba9fb32a749be0499120c5f22-1",
-      "panel-78e144cc4646b9bdebe8f1d59a62159d-2",
+      "panel-f6ad6d3ba9fb32a749be0499120c5f22-2",
-      "panel-78e144cc4646b9bdebe8f1d59a62159d-btn-0",
+      "panel-f6ad6d3ba9fb32a749be0499120c5f22-btn-0",
-      "panel-78e144cc4646b9bdebe8f1d59a62159d-btn-1",
+      "panel-f6ad6d3ba9fb32a749be0499120c5f22-btn-1",
-      "panel-78e144cc4646b9bdebe8f1d59a62159d-btn-2",
+      "panel-f6ad6d3ba9fb32a749be0499120c5f22-btn-2",
-      "panel-fbf9d10f31358572a82e263a6abb2d8c-0",
-      "panel-fbf9d10f31358572a82e263a6abb2d8c-1",
-      "panel-fbf9d10f31358572a82e263a6abb2d8c-2",
-      "panel-fbf9d10f31358572a82e263a6abb2d8c-btn-0",
-      "panel-fbf9d10f31358572a82e263a6abb2d8c-btn-1",
-      "panel-fbf9d10f31358572a82e263a6abb2d8c-btn-2",
       "persona",
       "pie-chart",
       "pills",
@@ -832,18 +833,16 @@
       "second-panel",
       "security",
       "sequence-diagram",
+      "shortcode-with-controls-and-frontmatter",
       "spinner",
       "stacked-cards-with-an-icon",
       "stacked-cards-with-an-image",
-      "stacked-video-message",
-      "start-using-your-data-immediately",
       "state-diagram",
       "sub",
       "sup",
       "sécurité",
       "table",
       "tabs",
-      "tap-into-the-latest-thinking-from-infusal-and-stay-in-the-lead",
       "third-panel",
       "third-party-links--use-of-your-information",
       "timeline",
@@ -855,8 +854,8 @@
       "toast-example-2",
       "toast-message-email-4",
       "toc-collapse",
+      "toc-collapse-items",
       "tooltip",
-      "turn-boring-into-brilliant",
       "types-de-cookies-que-nous-utilisons",
       "types-of-cookies-we-use",
       "underline",
@@ -867,7 +866,6 @@
       "vos-droits",
       "welcome-to-hinode",
       "what-are-cookies",
-      "works-seamlessly-with-your-current-tech-stack",
       "xy-chart",
       "your-rights"
     ]

exampleSite/layouts/_partials/templates/script.html

@@ -0,0 +1,31 @@
+{{/* 
+    Copyright © 2022 - 2025 The Hinode Team / Mark Dumay. All rights reserved.
+    Use of this source code is governed by The MIT License (MIT) that can be found in the LICENSE file.
+    Visit gethinode.com/license for more details.
+*/}}
+
+<!-- TODO: this partial is not properly mounted for the exampleSite, possibly a bug with Hugo -->
+
+{{/* Initialize arguments */}}
+{{- $args := partial "utilities/InitArgs.html" (dict "structure" "script" "args" .) -}}
+{{- if or $args.err $args.warnmsg -}}
+    {{- partial (cond $args.err "utilities/LogErr.html" "utilities/LogWarn.html") (dict 
+        "partial" "templates/script.html" 
+        "warnid"  "warn-invalid-arguments"
+        "msg"     "Invalid arguments"
+        "details" ($args.errmsg | append $args.warnmsg)
+        "file"    page.File
+    ) -}}
+{{- end -}}
+
+{{/* Initialize local arguments */}}
+{{- $category := cond (ne $args.category "other") $args.category "" -}}
+
+{{/* Main code */}}
+{{- if not $args.err -}}
+    <script src="{{ $args.link }}"
+        {{- with $args.scriptType }}{{ printf ` type="%s"` . | safeHTMLAttr }}{{ end -}}
+        {{- with $category }} data-category="{{ . }}"{{ end -}}
+        {{- with $args.integrity }} integrity="{{ . }}" crossorigin="anonymous"{{ end }}
+        {{- with $args.state }} {{ . | safeHTMLAttr }}{{ end -}}></script>
+{{- end -}}

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/airbnb/lottie-web v5.12.2+incompatible // indirect
-	github.com/cloudcannon/bookshop/hugo/v3 v3.16.3 // indirect
+	github.com/cloudcannon/bookshop/hugo/v3 v3.16.4 // indirect
 	github.com/gethinode/mod-bootstrap v1.3.4 // indirect
 	github.com/gethinode/mod-csp v1.0.8 // indirect
 	github.com/gethinode/mod-flexsearch/v2 v2.1.3 // indirect
@@ -13,12 +13,9 @@ require (
 	github.com/gethinode/mod-katex v1.1.4 // indirect
 	github.com/gethinode/mod-leaflet v1.3.1 // indirect
 	github.com/gethinode/mod-lottie v1.6.1 // indirect
-	github.com/gethinode/mod-mermaid v1.1.23 // indirect
+	github.com/gethinode/mod-mermaid/v3 v3.0.1 // indirect
-	github.com/gethinode/mod-mermaid/v2 v2.0.3 // indirect
-	github.com/gethinode/mod-simple-datatables v1.1.7 // indirect
 	github.com/gethinode/mod-simple-datatables/v2 v2.0.2 // indirect
-	github.com/gethinode/mod-utils/v3 v3.3.1 // indirect
+	github.com/gethinode/mod-utils/v4 v4.13.0 // indirect
-	github.com/gethinode/mod-utils/v4 v4.11.1 // indirect
 	github.com/nextapps-de/flexsearch v0.0.0-20250606060143-c28f52c09b7a // indirect
 	github.com/twbs/bootstrap v5.3.7+incompatible // indirect
 )

go.sum

@@ -8,6 +8,8 @@ github.com/cloudcannon/bookshop/hugo/v3 v3.16.1 h1:WByz6rqg28h94VLVLscu77/CHhi2p
 github.com/cloudcannon/bookshop/hugo/v3 v3.16.1/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
 github.com/cloudcannon/bookshop/hugo/v3 v3.16.3 h1:/Z66xKILl1SNGQePHZCnxo6vFgED7AGI600OSPotXj4=
 github.com/cloudcannon/bookshop/hugo/v3 v3.16.3/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
+github.com/cloudcannon/bookshop/hugo/v3 v3.16.4 h1:k233xdD3ydE6iN8QB+c37//rSsFVtLIo5OUNRN4E3bc=
+github.com/cloudcannon/bookshop/hugo/v3 v3.16.4/go.mod h1:s7mIonDhtsLcn10ZKuVXyqd6BDHI8vT1WQhZw8rPfY8=
 github.com/gethinode/mod-bootstrap v1.0.1 h1:NDZar+UEL42YHCvzzO+jVgqkZU5INA12BpjX3y6U4I4=
 github.com/gethinode/mod-bootstrap v1.0.1/go.mod h1:DcpPc2cNaXUPGEvhD7npuEEPA7573NvakTlrwFbyjr8=
 github.com/gethinode/mod-bootstrap v1.1.0 h1:BbalsW8kmFhv+J+dcc41TGcjIlM/p69AB0h0oGhAXIU=
@@ -326,6 +328,10 @@ github.com/gethinode/mod-mermaid/v2 v2.0.2 h1:uRHS3RyrMBK/hhDbEX39HnYkypSvSeci0k
 github.com/gethinode/mod-mermaid/v2 v2.0.2/go.mod h1:kp3oUFAjKxuwzFbwxGWPEx5VQOu2ZHzcrwcNhDv08BI=
 github.com/gethinode/mod-mermaid/v2 v2.0.3 h1:vWiAE640GAzkQCj0NFyn1VtnpFwiJ5Bljm2YgoQ3qG4=
 github.com/gethinode/mod-mermaid/v2 v2.0.3/go.mod h1:kp3oUFAjKxuwzFbwxGWPEx5VQOu2ZHzcrwcNhDv08BI=
+github.com/gethinode/mod-mermaid/v3 v3.0.0 h1:pFF2soB3ZQcY4KuMzDprcSv2zdC3yTKywNId4yhcPOA=
+github.com/gethinode/mod-mermaid/v3 v3.0.0/go.mod h1:+8p5KbFjIkB/I77Gpd8LTQgmNrRBfJpmKGnjclzwJFo=
+github.com/gethinode/mod-mermaid/v3 v3.0.1 h1:h4v3QvGpSln9PDbWccSktULq9FbRZ57JN4Lp+gVjvVI=
+github.com/gethinode/mod-mermaid/v3 v3.0.1/go.mod h1:rbI8IKFfKVGqTY/eJnuNJwzB5kSjaEUNX0NRHc4rBfA=
 github.com/gethinode/mod-simple-datatables v1.0.0 h1:Dj4WGw12OkaimwkCpLn5Jhmd49dvNJW9O2P/W9F+HlQ=
 github.com/gethinode/mod-simple-datatables v1.0.0/go.mod h1:K8T7fIdb8pMOB+OSW4A5lz5IW99+HyzcTgx764fvOGw=
 github.com/gethinode/mod-simple-datatables v1.0.2 h1:zhqxHet3iLQWYCBbGROALpOY9zQlptMycFkz1Tto5bA=
@@ -490,6 +496,10 @@ github.com/gethinode/mod-utils/v4 v4.11.0 h1:24RObT99j/jiQnCyHvXahJHIA8e8uQuBb1p
 github.com/gethinode/mod-utils/v4 v4.11.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
 github.com/gethinode/mod-utils/v4 v4.11.1 h1:12CzZjyLOb/FSXbX8mDAWqs8y4OCXOEavKww7T4V9jU=
 github.com/gethinode/mod-utils/v4 v4.11.1/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.12.0 h1:5sSfYIxZCeQbXLoZdS//rl6thwLwtXuvM0ujaWKyPmc=
+github.com/gethinode/mod-utils/v4 v4.12.0/go.mod h1:bYmvRdAo4ICy5MpSGafDvO4p5bTDpsDKFCPL3bH0mN4=
+github.com/gethinode/mod-utils/v4 v4.13.0 h1:VKAA+wKy4saayXfgJuVBRfhNVWQWmxOjO8LSpQCvLfw=
+github.com/gethinode/mod-utils/v4 v4.13.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=

i18n/en.yaml

@@ -101,6 +101,10 @@
   translation: "See also"
 - id: sectionMenu
   translation: "Select a topic"
+- id: tocShowMore
+  translation: "Show {{ . }} more"
+- id: tocShowLess
+  translation: "Show less"
 
 # Sidebar
 - id: toggleSidebar

i18n/nl.yaml

@@ -99,6 +99,10 @@
   translation: "Zie ook"
 - id: sectionMenu
   translation: "Selecteer een onderwerp"
+- id: tocShowMore
+  translation: "Toon {{ . }} meer"
+- id: tocShowLess
+  translation: "Toon minder"
 
 # Sidebar
 - id: toggleSidebar

layouts/_markup/render-codeblock.html

@@ -1,4 +1,4 @@
-<div class="mb-3 syntax-highlight">
+<div class="codeblock syntax-highlight mb-3">
     {{- $result := transform.HighlightCodeBlock . -}}
     {{- $result.Wrapped -}}
 </div>

layouts/_partials/assets/card.html

@@ -168,7 +168,7 @@
 -}}
 
 {{/* Main code */}}
-{{ if or (ne $args.gutter "0") ($args.wrapper) }}<div class="g-{{ $args.gutter }} {{ $args.wrapper }} h-100">{{ end }}
+{{ if or (gt $args.gutter "0") ($args.wrapper) }}<div class="{{ with $args.gutter }}g-{{ . }}{{ end }} {{ $args.wrapper }}">{{ end }}
 
 {{ $stack := "" }}
 
@@ -301,4 +301,4 @@
     </div>
 {{- end -}}
 
-{{ if or (ne $args.gutter "0") ($args.wrapper) }}</div>{{ end }}
+{{ if or (gt $args.gutter "0") ($args.wrapper) }}</div>{{ end }}

layouts/_partials/assets/timeline.html

@@ -111,7 +111,7 @@
     {{ end }}
 
     {{/* Render default timeline */}}
-    <div class="container p-0 d-none d-md-block {{ with $background }} timeline-{{ . }} {{ . }}{{ end }}{{ with $args.class }} {{ . }}{{ end }}">
+    <div class="timeline-container container p-0 d-none d-md-block {{ with $background }} timeline-{{ . }} {{ . }}{{ end }}{{ with $args.class }} {{ . }}{{ end }}">
         {{ $title | safeHTML }}
         {{ range $index, $item := $data }}
             <div class="row timeline timeline-{{ $item.color }} timeline-dot g-0 ">
@@ -137,7 +137,7 @@
     </div>
 
     {{/* Render timeline for smaller devices */}}
-    <div class="container p-0 d-block d-md-none small{{ with $background }} timeline-bg-{{ . }} bg-{{ . }}{{ end }}{{ with $args.class }} {{ . }}{{ end }}">
+    <div class="timeline-container container p-0 d-block d-md-none small{{ with $background }} timeline-bg-{{ . }} bg-{{ . }}{{ end }}{{ with $args.class }} {{ . }}{{ end }}">
         {{ range $index, $item := $data }}
             <div class="row timeline-sm timeline-{{ $item.color }} timeline-dot g-0">
                 {{ partial "inline/timeline-icon.html" (dict "icon" $item.icon "direction" "end" "col" 3) }}

layouts/_partials/assets/toc-parse-content.html

@@ -1,107 +1,88 @@
-{{- /*
+{{/* 
-  Copyright 2023 Veriphor, LLC
+    Copyright © 2025 The Hinode Team / Mark Dumay. All rights reserved.
-  
+    Use of this source code is governed by The MIT License (MIT) that can be found in the LICENSE file.
-  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+    Visit gethinode.com/license for more details.
-  use this file except in compliance with the License. You may obtain a copy of
+*/}}
-  the License at
+
-  
+{{ define "_partials/inline/toc-item.html" }}
-  https://www.apache.org/licenses/LICENSE-2.0
+    {{ $base := .base }}
-  
+    {{ $startLevel := .startLevel }}
-  Unless required by applicable law or agreed to in writing, software
+    {{ $endLevel := .endLevel }}
-  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+    {{ $item := .item }}
-  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+    {{ $maxNumHeadings := .maxNumHeadings }}
-  License for the specific language governing permissions and limitations under
+    {{ $result := .result | default slice }}
-  the License.
+
-  */}}
+    {{ if and (ge $item.Level $startLevel) (le $item.Level $endLevel) }}
-  
+        {{- $attrs := dict "class" (printf "toc-item toc-level-%d" (add 1 (sub $item.Level $startLevel))) }}
-  {{- /*
+        {{- with $item.ID }}
-  Renders a table of contents by parsing rendered content.
+            {{- $attrs = merge $attrs (dict "href" (printf "%s#%s" $base .)) }}
-  
+        {{- end }}
-  In site configuration, set the default start level, end level, and the minimum
+
-  number of headings required to show the table of contents:
+        {{ $htmlAttr := "" }}
-  
+        {{ range $k, $v := $attrs }}{{ $htmlAttr = printf "%s %s=%q" $htmlAttr $k $v | safeHTMLAttr }}{{ end }}
-      [params.toc]
+        {{ $rendered := printf "<a %s>%s</a>" $htmlAttr $item.Title }}
-      startLevel = 2      # default is 2
+        {{ $result = $result | append $rendered }}
-      endLevel = 3        # default is 3
+    {{ end }}
-      minNumHeadings = 2  # default is 2
+
-  
+    {{ range $item.Headings }}
-  To display the table of contents on a page:
+        {{ $result = $result | append (partial "inline/toc-item.html" (dict
-  
+            "base"           $base
-      +++
+            "item"           .
-      title = 'Post 1'
+            "startLevel"     $startLevel
-      toc = true
+            "endLevel"       $endLevel
-      +++
+            "maxNumHeadings" $maxNumHeadings
-  
+        )) }}
-  To display the table of contents on a page, and override one or more of the
+    {{ end }}
-  default settings:
+
-  
+    {{ return $result }}
-      +++
+{{ end }}
-      title = 'Post 1'
+
-      [toc]
+{{- /* Get configuration. */}}
-      startLevel = 2      # default is 2
+{{- $startLevel := or (.Site.Params.navigation.startLevel | int) 2 }}
-      endLevel = 3        # default is 3
+{{- $endLevel := or (.Site.Params.navigation.endLevel | int) 3 }}
-      minNumHeadings = 2  # default is 2
+{{- $minNumHeadings := or (.Site.Params.navigation.minNumHeadings | int) 2 }}
-      +++
+{{- $maxNumHeadings := or (.Site.Params.navigation.maxNumHeadings | int) 9 }}
-  
+
-  Change or localize the title with a "toc_title" key in your i18n file(s).
+{{- /* Render */}}
-  
+{{- if and .Site.Params.navigation.toc (ge (len .Fragments.HeadingsMap) $minNumHeadings) }}
-  Start with these basic CSS rules to style the table of contents:
+    <strong class="d-block h6 my-2 pt-4">{{ T "toc" }}:</strong>
-  
+    <nav class="toc">
-      a.toc-item {
+        {{ $result := slice }}
-        display: block;
+        {{ range .Fragments.Headings }}
-      }
+            {{ $result = $result | append (partial "inline/toc-item.html" (dict
-      a.toc-level-1 {
+                "base"           $.RelPermalink
-        margin-left: 0em;
+                "item"           .
-      }
+                "startLevel"     $startLevel
-      a.toc-level-2 {
+                "endLevel"       $endLevel
-        margin-left: 1em;
+                "maxNumHeadings" $maxNumHeadings
-      }
+            )) }} 
-      a.toc-level-3 {
+        {{ end }}
-        margin-left: 2em;
+
-      }
+        {{ range $i, $v := $result }}
-      a.toc-level-4 {
+            {{ if eq $i $maxNumHeadings }}
-        margin-left: 3em;
+                {{ partial "assets/button.html" (dict
-      }
+                    "id"          "btnTOCShowMore"
-      a.toc-level-5 {
+                    "collapse-id" "toc-collapse-items"
-        margin-left: 4em;
+                    "link-type"   "link"
-      }
+                    "class"       "toc-item"
-      a.toc-level-6 {
+                    "title"       (T "tocShowMore" (sub (len $result) $i))
-        margin-left: 5em;
+                    "spacing"     false
-      }
+                ) }}
-  
+                <div class="collapse" id="toc-collapse-items">
-  @context {page} .
+                {{ end }}
-  
+            {{ print $v | safeHTML }}
-  @returns {template.HTML}
+        {{ end }}
-  
+
-  @example {{ partial "toc-parse-content.html" . }}
+        {{ if gt (len $result) $maxNumHeadings }}
-  */}}
+            &nbsp;
-  
+            {{ partial "assets/button.html" (dict
-  {{- /* Get configuration. */}}
+                "id"          "btnTOCShowLess"
-  {{- $startLevel := or (.Site.Params.navigation.startLevel | int) 2 }}
+                "collapse-id" "toc-collapse-items"
-  {{- $endLevel := or (.Site.Params.navigation.endLevel | int) 3 }}
+                "link-type"   "link"
-  {{- $minNumHeadings := or (.Site.Params.navigation.minNumHeadings | int) 2 }}
+                "class"       "toc-item"
-  
+                "title"       (T "tocShowLess")
-  {{- /* Initialize. */}}
+                "spacing"     false
-  {{ $headings := partial "assets/toc-headings.html" . }}
+            ) }}
-  
+        </div>{{ end }}
-  {{- /* Render */}}
+    </nav>
-  {{- if .Site.Params.navigation.toc }}
+{{ end }}
-    {{- with $headings }}
-      {{- if ge (len .) $minNumHeadings }}
-        <strong class="d-block h6 my-2 pt-4">{{ T "toc" }}:</strong>
-        <nav class="toc">
-          {{- range . }}
-            {{- $attrs := dict "class" (printf "toc-item toc-level-%d" (add 1 (sub .level $startLevel))) }}
-            {{- with .id }}
-              {{- $attrs = merge $attrs (dict "href" (printf "%s#%s" $.RelPermalink .)) }}
-            {{- end }}
-            <a
-            {{- range $k, $v := $attrs }}
-              {{- printf " %s=%q" $k $v | safeHTMLAttr }}
-            {{- end -}}
-            >{{ .text }}</a>
-          {{- end }}
-        </nav>
-      {{- end }}
-    {{- end }}
-  {{- end }}

layouts/_partials/footer/scripts.html

@@ -4,175 +4,204 @@
     Visit gethinode.com/license for more details.
 */}}
 
-{{ $error := false }}
+{{- $error := false -}}
 
 {{/* Define inline partials */}}
-{{ define "_partials/inline/match.html" }}
+{{- define "_partials/inline/match.html" -}}
-    {{ $result := "" }}
+    {{- $result := "" -}}
-    {{ $matches := slice }}
+    {{- $matches := slice -}}
-    {{ if gt (len .modules) 0 }}
+    {{- if gt (len .modules) 0 -}}
-        {{ range .modules }}
+        {{- range .modules -}}
-            {{ $matches = $matches | append (printf "js/modules/%s/**.js" .) }}
+            {{- $matches = $matches | append (printf "js/modules/%s/**.*js" .) -}}
-        {{ end }}
+        {{- end -}}
-        {{ $result = printf "{%s}" (delimit $matches ",") }}
+        {{- $result = printf "{%s}" (delimit $matches ",") -}}
-    {{ end }}
-
-    {{ return $result }}
-{{ end }}
-
-{{ define "_partials/inline/bundle-script.html" }}
-    {{ $page := .page }}
-    {{ $match := .match }}
-    {{ $destination := .destination }}
-    {{ $cat := .cat }}
-    {{ $localize := .localize }}
-    {{ $modules := .modules }}
-    {{ $skipTemplate := .skipTemplate }}
-    {{ $absoluteURL := .absoluteURL }}
-    {{ $state := cond (ne .state "immediate") .state "" }}
-
-    {{ if and $cat (ne $cat "other") }}
-        {{ $destination = path.Join (path.Dir $destination) (printf "%s-%s%s" (path.BaseName $destination) $cat (path.Ext $destination)) }}
-    {{ end }}
-
-    {{ if $localize }}
-        {{ $destination = path.Join (path.Dir $destination) (printf "%s.%s%s" (path.BaseName $destination) $page.Language.Lang (path.Ext $destination)) }}
-    {{ end }}
-
-    {{- $bundle := partial "utilities/bundle.html" (dict
-        "match" $match
-        "filename" $destination
-        "modules" $modules
-        "basepath" "js/modules"
-        "all" true
-        "debugging" site.Params.debugging.showJS
-    ) -}}
-    {{- $js := $bundle -}}
-    {{- if not $skipTemplate -}}
-        {{- $js = $bundle | resources.ExecuteAsTemplate $destination $page -}}
     {{- end -}}
 
+    {{- return $result -}}
+{{- end -}}
+
+{{- define "_partials/inline/bundle-script.html" -}}
+    {{- $page := .page -}}
+    {{- $match := .match -}}
+    {{- $destination := .destination -}}
+    {{- $cat := .cat -}}
+    {{- $localize := .localize -}}
+    {{- $modules := .modules -}}
+    {{- $skipTemplate := .skipTemplate -}}
+    {{- $enableTemplate := .enableTemplate }}
+    {{- $absoluteURL := .absoluteURL -}}
+    {{- $state := cond (ne .state "immediate") .state "" -}}
+
+    {{- if and $cat (ne $cat "other") -}}
+        {{- $destination = path.Join (path.Dir $destination) (printf "%s-%s%s" (path.BaseName $destination) $cat (path.Ext $destination)) -}}
+    {{- end -}}
+
+    {{- if $localize -}}
+        {{- $destination = path.Join (path.Dir $destination) (printf "%s.%s%s" (path.BaseName $destination) $page.Language.Lang (path.Ext $destination)) -}}
+    {{- end -}}
+
+    {{- $bundle := partial "utilities/bundlev2.html" (dict
+        "page"            $page
+        "match"           $match
+        "filename"        $destination
+        "modules"         $modules
+        "basepath"        "js/modules"
+        "all"             true
+        "skip-template"   $skipTemplate
+        "enable-template" $enableTemplate
+        "debugging"       site.Params.debugging.showJS
+    ) -}}
+    {{- $js := $bundle.bundle -}}
+    {{- $jsmod := $bundle.module -}}
+
     {{- if gt (len $js.Content) 0 -}}
-        {{ $integrity := "" }}
+        {{- $integrity := "" -}}
         {{- if hugo.IsProduction -}}
-            {{ $js = $js | minify | fingerprint -}}
+            {{- $js = $js | minify | fingerprint -}}
-            {{ $integrity = $js.Data.Integrity }}
+            {{- $integrity = $js.Data.Integrity -}}
-        {{ end -}}
+        {{- end -}}
-        {{ partial "templates/script.html" (dict "link" (cond $absoluteURL $js.Permalink $js.RelPermalink) "category" $cat "state" $state "integrity" $integrity) }}
+
-    {{ end -}}
+        {{- partial "templates/script.html" (dict
-{{ end }}
+            "link"        (cond $absoluteURL $js.Permalink $js.RelPermalink)
+            "category"    $cat 
+            "state"       $state
+            "integrity"   $integrity
+        ) -}}
+    {{- end -}}
+
+    {{- if gt (len $jsmod.Content) 0 -}}
+        {{- $integrity := "" -}}
+        {{- if hugo.IsProduction -}}
+            {{- $jsmod = $jsmod | minify | fingerprint -}}
+            {{- $integrity = $jsmod.Data.Integrity -}}
+        {{- end -}}
+
+        {{- partial "templates/script.html" (dict
+            "link"        (cond $absoluteURL $jsmod.Permalink $jsmod.RelPermalink)
+            "category"    $cat 
+            "state"       $state
+            "integrity"   $integrity
+            "script-type" "module"
+        ) -}}
+    {{- end -}}
+{{- end -}}
 
 {{/* Initialize arguments */}}
-{{ $args := partial "utilities/InitArgs.html" (dict "structure" "scripts" "args" .) }}
+{{- $args := partial "utilities/InitArgs.html" (dict "structure" "scripts" "args" .) -}}
-{{ if $args.err }}
+{{- if $args.err -}}
-    {{ partial "utilities/LogErr.html" (dict 
+    {{- partial "utilities/LogErr.html" (dict 
         "partial" "footer/scripts.html" 
         "msg"     "Invalid arguments"
         "details" $args.errmsg
         "file"    page.File
     )}}
-    {{ $error = true }}
+    {{- $error = true -}}
-{{ end }}
+{{- end -}}
 
-{{ $page := $args.page | default page }}
+{{- $page := $args.page | default page -}}
 
 {{/* Initialize local arguments */}}
-{{ $patterns := dict 
+{{- $patterns := dict 
-    "other" "js/critical/*.js"
+    "other"         "js/critical/*.*js"
-    "functional" "js/critical/functional/**.js"
+    "functional"    "js/critical/functional/**.*js"
-    "analytics" "js/critical/analytics/**.js"
+    "analytics"     "js/critical/analytics/**.*js"
-    "performance" "js/critical/performance/**.js"
+    "performance"   "js/critical/performance/**.*js"
-    "advertisement" "js/critical/advertisement/**.js"
+    "advertisement" "js/critical/advertisement/**.*js"
-    "core" "{js/*.js,js/vendor/**.js}"
+    "core"          "{js/*.*js,js/vendor/**.*js}"
 }}
 
 {{- $absoluteURL := site.Params.main.canonifyAssetsURLs | default false -}}
-{{ $state := "immediate" }}
+{{- $state := "immediate" -}}
-{{ $config := $page.Scratch.Get "modules" }}
+{{- $config := $page.Scratch.Get "modules" -}}
 
-{{ $page_modules := slice }}
+{{- $page_modules := slice -}}
-{{ if reflect.IsMap $page.Params.modules }}
+{{- if reflect.IsMap $page.Params.modules -}}
-    {{ $page_modules = $page.Params.modules }}
+    {{- $page_modules = $page.Params.modules -}}
-{{ else }}
+{{- else -}}
-    {{ $page_modules = $page_modules | append $page.Params.modules }}
+    {{- $page_modules = $page_modules | append $page.Params.modules -}}
-{{ end }}
+{{- end -}}
-{{ with $page.Scratch.Get "dependencies" }}{{ $page_modules = append $page_modules . | uniq }}{{ end }}
+{{- with $page.Scratch.Get "dependencies" -}}{{- $page_modules = append $page_modules . | uniq -}}{{- end -}}
 
 {{- $categories := dict "other" slice -}}
 
-{{ $modules := slice }}
+{{- $modules := slice -}}
-{{ if eq $args.type "critical" }}
+{{- if eq $args.type "critical" -}}
     {{- $modules = $config.critical -}}
-    {{ $categories = merge $categories (dict "functional" slice "analytics" slice "performance" slice "advertisement" slice) }}
+    {{- $categories = merge $categories (dict "functional" slice "analytics" slice "performance" slice "advertisement" slice) -}}
-{{ else if eq $args.type "core" }}
+{{- else if eq $args.type "core" -}}
     {{- $modules = $config.core -}}
-{{ else if eq $args.type "optional" }}
+{{- else if eq $args.type "optional" -}}
     {{- $modules = $config.optional | intersect $page_modules  -}}
-{{ end }}
+{{- end -}}
 
-{{ range $cat, $val := $config.categories }}
+{{- range $cat, $val := $config.categories -}}
-    {{ $categories = merge $categories (dict $cat (intersect $val $modules)) }}
+    {{- $categories = merge $categories (dict $cat (intersect $val $modules)) -}}
-{{ end }}
+{{- end -}}
 
-{{ $localize := false }}
+{{- $localize := false -}}
-{{ if gt (intersect (or $config.localize slice) $modules | len) 0 }}{{ $localize = true }}{{ end }}
+{{- if gt (intersect (or $config.localize slice) $modules | len) 0 }}{{ $localize = true }}{{ end -}}
 
-{{ $skipTemplate := false }}
+{{- $skipTemplate := false -}}
-{{ if gt (intersect (or $config.skipTemplate slice) $modules | len) 0 }}{{ $skipTemplate = true }}{{ end }}
+{{- if gt (intersect (or $config.skipTemplate slice) $modules | len) 0 }}{{ $skipTemplate = true }}{{ end -}}
 
 {{/* Main code */}}
-{{ if not $error }}
+{{- if not $error -}}
     {{/* include external scripts first */}}
-    {{ range $mod, $cfg := $config.modules }}
+    {{- range $mod, $cfg := $config.modules -}}
-        {{ if in $modules $mod }}
+        {{- if in $modules $mod -}}
-            {{ if or (index $cfg "local") (not hugo.IsServer) }}
+            {{- if or (index $cfg "local") (not hugo.IsServer) -}}
-                {{ with index $cfg "url" }}
+                {{- with index $cfg "url" -}}
-                    {{ partial "templates/script.html" (dict "link" . "category" (index $cfg "category") "state" (index $cfg "state")) }}
+                    {{- partial "templates/script.html" (dict
-                {{ end }}
+                        "link"     .
-            {{ end }}
+                        "category" (index $cfg "category")
-        {{ end }}
+                        "state"    (index $cfg "state")) 
-    {{ end }}
+                    -}}
+                {{- end -}}
+            {{- end -}}
+        {{- end -}}
+    {{- end -}}
 
     {{/* Bundle the critical and core scripts by category */}}
-    {{ if ne $args.type "optional" }}
+    {{- if ne $args.type "optional" -}}
-        {{ range $cat, $val := $categories }}
+        {{- range $cat, $val := $categories -}}
-            {{ if or (gt ($val | len) 0) (eq $args.type "critical") }}
+            {{- if or (gt ($val | len) 0) (eq $args.type "critical") -}}
-                {{ $match := "" }}
+                {{- $match := "" -}}
-                {{ if eq $args.type "critical" }}
+                {{- if eq $args.type "critical" -}}
-                    {{ $match = index $patterns $cat }}
+                    {{- $match = index $patterns $cat -}}
-                {{ else if eq $cat "other" }}
+                {{- else if eq $cat "other" -}}
-                    {{ $match = index $patterns $args.type }}
+                    {{- $match = index $patterns $args.type -}}
-                {{ end }}
+                {{- end -}}
 
-                {{ partial "inline/bundle-script.html" (dict 
+                {{- partial "inline/bundle-script.html" (dict 
-                    "page" $page
+                    "page"           $page
-                    "match" $match
+                    "match"          $match
-                    "destination" (printf "js/%s.bundle.js" $args.type)
+                    "destination"    (printf "js/%s.bundle.js" $args.type)
-                    "cat" $cat
+                    "cat"            $cat
-                    "modules" $val
+                    "modules"        $val
-                    "localize" $localize
+                    "localize"       $localize
-                    "skipTemplate" $skipTemplate
+                    "skipTemplate"   $skipTemplate
-                    "absoluteURL" $absoluteURL
+                    "absoluteURL"    $absoluteURL
-                    "state" (cond (eq $args.type "critical") "immediate" "async")
+                    "state"          (cond (eq $args.type "critical") "immediate" "async")
                 )}} 
-            {{ end }}
+            {{- end -}}
-        {{ end }}
+        {{- end -}}
-    {{ else }}
+    {{- else -}}
         {{/* Bundle the optional scripts by module name and category */}}
-        {{ range $cat, $val := $categories }}
+        {{- range $cat, $val := $categories -}}
-            {{ range $val }}
+            {{- range $val -}}
-                {{ $modconfig := index $config.modules . }}
+                {{- $modconfig := index $config.modules . -}}
-                {{ partial "inline/bundle-script.html" (dict 
+                {{- partial "inline/bundle-script.html" (dict 
-                    "page" $page
+                    "page"           $page
-                    "destination" (printf "js/%s.js" .)
+                    "destination"    (printf "js/%s.js" .)
-                    "cat" $cat
+                    "cat"            $cat
-                    "modules" (slice .)
+                    "modules"        (slice .)
-                    "localize" $modconfig.localize
+                    "localize"       $modconfig.localize
-                    "skipTemplate" $modconfig.disabletemplate
+                    "skipTemplate"   $modconfig.disabletemplate
-                    "absoluteURL" $absoluteURL
+                    "enableTemplate" $modconfig.enableTemplate
-                    "state" $modconfig.state
+                    "absoluteURL"    $absoluteURL
+                    "state"          $modconfig.state
                 )}} 
-            {{ end }}
+            {{- end -}}
-        {{ end }}
+        {{- end -}}
-    {{ end }}
+    {{- end -}}
-{{ end }}
+{{- end -}}

layouts/_partials/head/seo.html

@@ -46,7 +46,7 @@
 {{ if eq .Kind "404" -}}
     <meta name="robots" content="noindex, follow">
 {{ else }}
-  {{ with or .Params.robots .Params.meta.robots -}}
+  {{ with or .Params.robots .Params.meta.robots .Site.Params.meta.robots -}}
     <meta name="robots" content="{{ . }}">
   {{ else -}}
     <meta name="robots" content="index, follow">

layouts/_partials/head/stylesheet.html

@@ -66,11 +66,24 @@
     "dark-mode-tint"          (default "0%" site.Params.style.darkModeTint)
 -}}
 
-{{- $options := (dict "transpiler" $transpiler "silenceDeprecations" $silence "targetPath" $target "enableSourceMap" (not hugo.IsProduction) "vars" $vars) -}}
+{{- $options := (dict
-{{- $bundle := partial "utilities/bundle.html" (dict "match" $source "filename" (printf "scss/bundle-%d.scss" now.UnixNano) "modules" $modules "basepath" "scss" "debugging" site.Params.debugging.showSCSS) -}}
+    "transpiler"          $transpiler
+    "silenceDeprecations" $silence
+    "targetPath"          $target
+    "enableSourceMap"     (not hugo.IsProduction)
+    "vars"                $vars
+) -}}
+{{- $bundle := partial "utilities/bundlev2.html" (dict
+    "page"      page
+    "match"     $source
+    "filename"  (printf "scss/bundle-%d.scss" now.UnixNano)
+    "modules"   $modules
+    "basepath"  "scss"
+    "debugging" site.Params.debugging.showSCSS
+) -}}
 
-{{- if gt ($bundle.Content | len) 0 }}
+{{- if gt ($bundle.bundle.Content | len) 0 }}
-    {{- $css := $bundle | resources.ExecuteAsTemplate $target . | toCSS $options -}}
+    {{- $css := $bundle.bundle | resources.ExecuteAsTemplate $target . | toCSS $options -}}
 
     {{ if $core }}
         {{- partial "head/icons.html" (dict "css" $css) -}}

layouts/_partials/templates/script.html

@@ -6,7 +6,7 @@
 
 {{/* Initialize arguments */}}
 {{- $args := partial "utilities/InitArgs.html" (dict "structure" "script" "args" .) -}}
-{{ if or $args.err $args.warnmsg }}
+{{- if or $args.err $args.warnmsg -}}
     {{- partial (cond $args.err "utilities/LogErr.html" "utilities/LogWarn.html") (dict 
         "partial" "templates/script.html" 
         "warnid"  "warn-invalid-arguments"
@@ -16,15 +16,15 @@
     ) -}}
 {{- end -}}
 
-
 {{/* Initialize local arguments */}}
 {{- $category := cond (ne $args.category "other") $args.category "" -}}
 
 {{/* Main code */}}
 {{- if not $args.err -}}
     <script src="{{ $args.link }}"
+        {{/* with $args.scriptType generates an error when using type="{{ . }}", possibly a Hugo bug */}}
+        {{- with $args.scriptType }}{{ printf ` type="%s"` . | safeHTMLAttr }}{{ end -}}
         {{- with $category }} data-category="{{ . }}"{{ end -}}
-        {{- with $args.integrity }}integrity="{{ . }}" crossorigin="anonymous"{{ end }}
+        {{- with $args.integrity }} integrity="{{ . }}" crossorigin="anonymous"{{ end }}
-        {{- with $args.state }} {{ . | safeHTMLAttr }}{{ end -}}>
+        {{- with $args.state }} {{ . | safeHTMLAttr }}{{ end -}}></script>
-    </script>
 {{- end -}}

layouts/_partials/utilities/InitModules.html

@@ -45,14 +45,14 @@
 {{ end }}
 
 {{ $modules := dict 
-    "modules" $modules
+    "modules"         $modules
-    "critical" $critical
+    "critical"        $critical
-    "core" $core
+    "core"            $core
-    "optional" $optional
+    "optional"        $optional
-    "excludeSCSS" $excludeSCSS
+    "excludeSCSS"     $excludeSCSS
     "disableTemplate" $disableTemplate
-    "localize" $localize
+    "localize"        $localize
-    "categories" $category
+    "categories"      $category
 }}
 
 {{- if and .IsPage (not (in $core "bootstrap")) -}}

layouts/_shortcodes/command.html

@@ -72,7 +72,7 @@
         {{- $output = (replace $output "<span class=\"c\">#" "<span class=\"c\">" | safeHTML) -}}
     {{- end -}}
 
-    <div class="mb-3 syntax-highlight{{ with $args.class }} {{ . }}{{ end }}">
+    <div class="command syntax-highlight mb-3{{ with $args.class }} {{ . }}{{ end }}">
         {{- $output -}}
     </div>
 {{ end }}

layouts/_shortcodes/docs.html

@@ -71,33 +71,35 @@
     {{- $match = replace $match $captureStart "" -}}
     {{- $match = replace $match $captureEnd "" -}}
 
-    <ul class="nav nav-tabs{{ with $args.class }} {{ . }}{{ end }}">
+    <div class="docs">
-        <li class="nav-item">
+        <ul class="docs-controls nav nav-tabs{{ with $args.class }} {{ . }}{{ end }}">
-            <a class="nav-link active font-monospace" 
+            <li class="nav-item">
-                href="#body-{{ $id }}" 
+                <a class="nav-link active font-monospace" 
-                aria-current="page" 
+                    href="#body-{{ $id }}" 
-                data-bs-toggle="collapse" 
+                    aria-current="page" 
-                data-bs-target=".multi-{{ $id }}" 
+                    data-bs-toggle="collapse" 
-                aria-expanded="false" 
+                    data-bs-target=".multi-{{ $id }}" 
-                aria-controls="body-{{ $id }} footer-{{ $id }}">
+                    aria-expanded="false" 
-                <small>{{ if $args.full }}{{ strings.TrimPrefix "/" (strings.TrimPrefix $basePath $file) }}{{ else }}{{ path.Base $file }}{{ end }}</small>
+                    aria-controls="body-{{ $id }} footer-{{ $id }}">
-            </a>
+                    <small>{{ if $args.full }}{{ strings.TrimPrefix "/" (strings.TrimPrefix $basePath $file) }}{{ else }}{{ path.Base $file }}{{ end }}</small>
-        </li>
+                </a>
-    </ul>
+            </li>
-    <div class="border-start border-end border-bottom mb-3">
+        </ul>
-        <div class="collapse multi-{{ $id }}{{ if $args.show }} show{{ end }} syntax-highlight" id="body-{{ $id }}">
+        <div class="docs-panel mb-3">
-            {{- highlight (trim $match "\r\n") $extension "" -}}
+            <div class="collapse multi-{{ $id }}{{ if $args.show }} show{{ end }} syntax-highlight" id="body-{{ $id }}">
-        </div>
+                {{- highlight (trim $match "\r\n") $extension "" -}}
-        <div class="collapse multi-{{ $id }}{{ if not $args.show }} show{{ end }} p-3" id="footer-{{ $id }}">
+            </div>
-            <a class="nav-link active" 
+            <div class="collapse multi-{{ $id }}{{ if not $args.show }} show{{ end }} p-3" id="footer-{{ $id }}">
-                href="#body-{{ $id }}" 
+                <a class="nav-link active" 
-                aria-current="page" 
+                    href="#body-{{ $id }}" 
-                data-bs-toggle="collapse" 
+                    aria-current="page" 
-                data-bs-target=".multi-{{ $id }}" 
+                    data-bs-toggle="collapse" 
-                aria-expanded="false" 
+                    data-bs-target=".multi-{{ $id }}" 
-                aria-controls="body-{{ $id }} footer-{{ $id }}">
+                    aria-expanded="false" 
-                <small><i>{{ T "clickToExpand" }}</i></small>
+                    aria-controls="body-{{ $id }} footer-{{ $id }}">
-            </a>
+                    <small><i>{{ T "clickToExpand" }}</i></small>
+                </a>
+            </div>
         </div>
     </div>
 {{- end -}}

layouts/_shortcodes/file.html

@@ -58,33 +58,35 @@
     {{- $tmp := os.Stat $file -}}
     {{- $content := readFile $file -}}
 
-    <ul class="nav nav-tabs{{ with $args.class }} {{ . }}{{ end }}">
+    <div class="file">
-        <li class="nav-item">
+        <ul class="file-controls nav nav-tabs{{ with $args.class }} {{ . }}{{ end }}">
-            <a class="nav-link active font-monospace" 
+            <li class="nav-item">
-                href="#body-{{ $id }}" 
+                <a class="nav-link active font-monospace" 
-                aria-current="page" 
+                    href="#body-{{ $id }}" 
-                data-bs-toggle="collapse" 
+                    aria-current="page" 
-                data-bs-target=".multi-{{ $id }}" 
+                    data-bs-toggle="collapse" 
-                aria-expanded="false" 
+                    data-bs-target=".multi-{{ $id }}" 
-                aria-controls="body-{{ $id }} footer-{{ $id }}">
+                    aria-expanded="false" 
-                <small>{{ if $args.full }}{{ strings.TrimPrefix $basePath $file }}{{ else }}{{ path.Base $file }}{{ end }}</small>
+                    aria-controls="body-{{ $id }} footer-{{ $id }}">
-            </a>
+                    <small>{{ if $args.full }}{{ strings.TrimPrefix $basePath $file }}{{ else }}{{ path.Base $file }}{{ end }}</small>
-        </li>
+                </a>
-    </ul>
+            </li>
-    <div class="border-start border-end border-bottom mb-3">
+        </ul>
-        <div class="collapse multi-{{ $id }}{{ if $args.show }} show{{ end }} syntax-highlight" id="body-{{ $id }}">
+        <div class="file-panel mb-3">
-            {{- highlight (trim $content "\r\n") $lang (or $args.highlightOptions $args.options) -}}
+            <div class="collapse multi-{{ $id }}{{ if $args.show }} show{{ end }} syntax-highlight" id="body-{{ $id }}">
-        </div>
+                {{- highlight (trim $content "\r\n") $lang (or $args.highlightOptions $args.options) -}}
-        <div class="collapse multi-{{ $id }}{{ if not $args.show }} show{{ end }} p-3" id="footer-{{ $id }}">
+            </div>
-            <a class="nav-link active" 
+            <div class="collapse multi-{{ $id }}{{ if not $args.show }} show{{ end }} p-3" id="footer-{{ $id }}">
-                href="#body-{{ $id }}" 
+                <a class="nav-link active" 
-                aria-current="page" 
+                    href="#body-{{ $id }}" 
-                data-bs-toggle="collapse" 
+                    aria-current="page" 
-                data-bs-target=".multi-{{ $id }}" 
+                    data-bs-toggle="collapse" 
-                aria-expanded="false" 
+                    data-bs-target=".multi-{{ $id }}" 
-                aria-controls="body-{{ $id }} footer-{{ $id }}">
+                    aria-expanded="false" 
-                <small><i>{{ T "clickToExpand" }}</i></small>
+                    aria-controls="body-{{ $id }} footer-{{ $id }}">
-            </a>
+                    <small><i>{{ T "clickToExpand" }}</i></small>
+                </a>
+            </div>
         </div>
     </div>
 {{- end -}}

layouts/baseof.html

@@ -23,8 +23,9 @@
 {{- /* Define main breakpoint */ -}}
 {{- $.Scratch.Set "breakpoint" (partialCached "utilities/GetBreakpoint.html" .) }}
 
-{{- /* Render blocks and establish overlay mode */ -}}
+{{- /* Prepare content blocks and establish overlay mode */ -}}
 {{ $blocks := partial "utilities/RenderContentBlocks.html" (dict "page" . "blocks" .Params.content_blocks) }}
+{{ $.Scratch.Set "blocks" $blocks }}
 {{ $overlayMode := $.Scratch.Get "overlayMode" }}
 
 {{- /* Define base URL */ -}}
@@ -51,7 +52,6 @@
         -}}
 
         <div id="container" class="main">
-            {{ $blocks }}
             {{ block "main" . }}{{ end -}}
         </div>
 

layouts/list.html

@@ -1,5 +1,8 @@
 {{ define "main" -}}
     {{- $breakpoint := $.Scratch.Get "breakpoint" -}}
+    {{- $blocks := $.Scratch.Get "blocks" -}}
+
+    {{ $blocks | safeHTML }}
 
     <div class="container-xxl flex-fill p-4 px-xxl-0">
         {{ .Render "body" }}

layouts/single.html

@@ -1,4 +1,5 @@
 {{ define "main" -}}
+    {{- $blocks := $.Scratch.Get "blocks" -}}
     {{- $breakpoint := $.Scratch.Get "breakpoint" -}}
     {{- $sidebar := partial "page/sidebar" . -}}
     {{- $toc := partial "page/panel-toc" . -}}
@@ -15,6 +16,8 @@
         </div>
     {{ end }}
 
+    {{ $blocks | safeHTML }}
+
     <div class="container-xxl flex-fill p-4 px-xxl-0">
         <div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2 row-cols-{{ $breakpoint.next }}-3">
             <div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top pt-5">

package.json

@@ -73,9 +73,9 @@
   "dependencies": {
     "@fullhuman/postcss-purgecss": "^7.0.2",
     "autoprefixer": "^10.4.21",
-    "cssnano": "^7.0.7",
+    "cssnano": "^7.1.0",
-    "cssnano-preset-advanced": "^7.0.7",
+    "cssnano-preset-advanced": "^7.0.8",
-    "hugo-bin": "0.145.0",
+    "hugo-bin": "0.145.2",
     "purgecss-whitelister": "^2.4.0"
   },
   "devDependencies": {
@@ -85,9 +85,9 @@
     "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
     "commitizen": "^4.3.1",
-    "cpy-cli": "^5.0.0",
+    "cpy-cli": "^6.0.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^9.30.1",
+    "eslint": "^9.33.0",
     "husky": "^9.1.7",
     "markdownlint-cli2": "^0.18.1",
     "neostandard": "^0.12.2",
@@ -96,9 +96,9 @@
     "postcss-cli": "^11.0.1",
     "replace-in-files-cli": "^3.0.0",
     "rimraf": "^6.0.1",
-    "semantic-release": "^24.2.6",
+    "semantic-release": "^24.2.7",
     "shx": "^0.4.0",
-    "stylelint": "^16.21.1",
+    "stylelint": "^16.23.1",
     "stylelint-config-standard-scss": "^15.0.1"
   },
   "optionalDependencies": {