Merge branch 'main' of https://code.mygenius.co/Genius/hextra

* feat: add customize flexsearch tokenize feature instruction to docs

* Update configuration.md

* Update configuration.md

* Update configuration.zh-cn.md

---------

Co-authored-by: loenvom <loenvom@qq.com>
Co-authored-by: Xin <xin@imfing.com>

.github/CONTRIBUTING.md

@@ -57,7 +57,7 @@ We recommend that you search existing [issues][issues] or discussions before ope
 
 ### Local development setup
 
-- [Hugo][hugo] >= v0.115.0 (extended version)
+- [Hugo][hugo] >= v0.124.0 (extended version)
 - [Node.js][nodejs]
 - [Go][go]
 

.github/workflows/pages.yml

@@ -31,7 +31,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      HUGO_VERSION: 0.124.1
+      HUGO_VERSION: 0.126.1
     steps:
       - name: Checkout
         uses: actions/checkout@v4

assets/css/components/sidebar.css

@@ -1,5 +1,5 @@
 @media (max-width: 767px) {
-  .hextra-sidebar-container {
+  .sidebar-container {
     @apply hx-fixed hx-pt-[calc(var(--navbar-height))] hx-top-0 hx-w-full hx-bottom-0 hx-z-[15] hx-overscroll-contain hx-bg-white dark:hx-bg-dark;
     transition: transform 0.8s cubic-bezier(0.52, 0.16, 0.04, 1);
     will-change: transform, opacity;
@@ -8,7 +8,7 @@
   }
 }
 
-.hextra-sidebar-container {
+.sidebar-container {
   li > div {
     @apply hx-h-0;
   }
@@ -18,19 +18,4 @@
   li.open > a > span > svg > path {
     @apply hx-rotate-90;
   }
-
-  .hextra-sidebar-item-list {
-    @apply hx-relative hx-flex hx-flex-col hx-gap-1 before:hx-absolute before:hx-inset-y-1 before:hx-w-px before:hx-bg-gray-200 ltr:hx-ml-3 ltr:hx-pl-3 ltr:before:hx-left-0 rtl:hx-mr-3 rtl:hx-pr-3 rtl:before:hx-right-0 dark:before:hx-bg-neutral-800;
-  }
-
-  .hextra-sidebar-item-link {
-    @apply hx-flex hx-items-center hx-justify-between hx-gap-2 hx-cursor-pointer hx-rounded hx-px-2 hx-py-1.5 hx-text-sm hx-transition-colors;
-
-    &.active {
-      @apply hx-bg-primary-100 hx-font-semibold hx-text-primary-800 contrast-more:hx-border contrast-more:hx-border-primary-500 dark:hx-bg-primary-400/10 dark:hx-text-primary-600 contrast-more:dark:hx-border-primary-500;
-    }
-    &.inactive {
-      @apply hx-text-gray-500 hover:hx-bg-gray-100 hover:hx-text-gray-900 contrast-more:hx-border contrast-more:hx-border-transparent contrast-more:hx-text-gray-900 contrast-more:hover:hx-border-gray-900 dark:hx-text-neutral-400 dark:hover:hx-bg-primary-100/5 dark:hover:hx-text-gray-50 contrast-more:dark:hx-text-gray-50 contrast-more:dark:hover:hx-border-gray-50;
-    }
-  }
 }

assets/js/menu.js

@@ -3,7 +3,7 @@
 document.addEventListener('DOMContentLoaded', function () {
   const menu = document.querySelector('.hamburger-menu');
   const overlay = document.querySelector('.mobile-menu-overlay');
-  const sidebarContainer = document.querySelector('.hextra-sidebar-container');
+  const sidebarContainer = document.querySelector('.sidebar-container');
 
   // Initialize the overlay
   const overlayClasses = ['hx-fixed', 'hx-inset-0', 'hx-z-10', 'hx-bg-black/80', 'dark:hx-bg-black/60'];

assets/js/sidebar.js

@@ -1,12 +1,3 @@
-/**
- * Check if the element is visible.
- * @param {Element} element Dom element
- * @returns boolean
- */
-function isVisible(element) {
-  return element.offsetWidth > 0 || element.offsetHeight > 0;
-}
-
 document.addEventListener("DOMContentLoaded", function () {
   const buttons = document.querySelectorAll(".hextra-sidebar-collapsible-button");
   buttons.forEach(function (button) {
@@ -14,41 +5,8 @@ document.addEventListener("DOMContentLoaded", function () {
       e.preventDefault();
       const list = button.parentElement.parentElement;
       if (list) {
-        list.classList.toggle("open");
+        list.classList.toggle("open")
       }
     });
   });
-
-  const isCached = "{{- site.Params.page.sidebar.cache | default false -}}" === "true";
-  const currentPagePath = window.location.href;
-
-  if (isCached) {
-    // find the current page in the sidebar and open the parent lists
-    const sidebar = document.querySelector(".hextra-sidebar-container");
-    if (sidebar) {
-      // find a tags and compare href with current page path
-      const links = sidebar.querySelectorAll("a");
-      links.forEach(function (link) {
-        const linkPath = link.href;
-
-        if (currentPagePath === linkPath) {
-          // add active class to the link
-          link.classList.add("active");
-          link.classList.remove("inactive");
-
-          if (!isVisible(link)) {
-            return;
-          }
-          // recursively open parent lists
-          let parent = link.parentElement;
-          while (parent && !parent.classList.contains("hextra-sidebar-container")) {
-            if (parent.tagName === "LI" && parent.classList.contains("hextra-sidebar-item")) {
-              parent.classList.add("open");
-            }
-            parent = parent.parentElement;
-          }
-        }
-      });
-    }
-  }
 });

data/icons.yaml

@@ -9,6 +9,11 @@ github: >
     <path d="M12 3C7.0275 3 3 7.12937 3 12.2276C3 16.3109 5.57625 19.7597 9.15374 20.9824C9.60374 21.0631 9.77249 20.7863 9.77249 20.5441C9.77249 20.3249 9.76125 19.5982 9.76125 18.8254C7.5 19.2522 6.915 18.2602 6.735 17.7412C6.63375 17.4759 6.19499 16.6569 5.8125 16.4378C5.4975 16.2647 5.0475 15.838 5.80124 15.8264C6.51 15.8149 7.01625 16.4954 7.18499 16.7723C7.99499 18.1679 9.28875 17.7758 9.80625 17.5335C9.885 16.9337 10.1212 16.53 10.38 16.2993C8.3775 16.0687 6.285 15.2728 6.285 11.7432C6.285 10.7397 6.63375 9.9092 7.20749 9.26326C7.1175 9.03257 6.8025 8.08674 7.2975 6.81794C7.2975 6.81794 8.05125 6.57571 9.77249 7.76377C10.4925 7.55615 11.2575 7.45234 12.0225 7.45234C12.7875 7.45234 13.5525 7.55615 14.2725 7.76377C15.9937 6.56418 16.7475 6.81794 16.7475 6.81794C17.2424 8.08674 16.9275 9.03257 16.8375 9.26326C17.4113 9.9092 17.76 10.7281 17.76 11.7432C17.76 15.2843 15.6563 16.0687 13.6537 16.2993C13.98 16.5877 14.2613 17.1414 14.2613 18.0065C14.2613 19.2407 14.25 20.2326 14.25 20.5441C14.25 20.7863 14.4188 21.0746 14.8688 20.9824C16.6554 20.364 18.2079 19.1866 19.3078 17.6162C20.4077 16.0457 20.9995 14.1611 21 12.2276C21 7.12937 16.9725 3 12 3Z"></path>
   </svg>
 
+gitea: >
+  <svg fill="currentColor" viewBox="75 100 824 824">
+    <path d="M762.2 350.3c-100.9 5.3-160.7 8-212 8.5v114.1l-16-7.9-.1-106.1c-58.9 0-110.7-3.1-209.1-8.6-12.3-.1-29.5-2.4-47.9-2.5-47.1-.1-110.2 33.5-106.7 118C175.8 597.6 296 609.9 344 610.9c5.3 24.7 61.8 110.1 103.6 114.6H631c109.9-8.2 192.3-373.8 131.2-375.2zm-546 117.3c-4.7-36.6 11.8-74.8 73.2-73.2C296.1 462 307 501.5 329 561.9c-56.2-7.4-104-25.7-112.8-94.3zm415.6 83.5-51.3 105.6c-6.5 13.4-22.7 19-36.2 12.5l-105.6-51.3c-13.4-6.5-19-22.7-12.5-36.2l51.3-105.6c6.5-13.4 22.7-19 36.2-12.5l105.6 51.3c13.4 6.6 19 22.8 12.5 36.2z M555 609.9c.1-.2.2-.3.2-.5 17.2-35.2 24.3-49.8 19.8-62.4-3.9-11.1-15.5-16.6-36.7-26.6-.8-.4-1.7-.8-2.5-1.2.2-2.3-.1-4.7-1-7-.8-2.3-2.1-4.3-3.7-6l13.6-27.8-11.9-5.8-13.7 28.4c-2 0-4.1.3-6.2 1-8.9 3.2-13.5 13-10.3 21.9.7 1.9 1.7 3.5 2.8 5l-23.6 48.4c-1.9 0-3.8.3-5.7 1-8.9 3.2-13.5 13-10.3 21.9 3.2 8.9 13 13.5 21.9 10.3 8.9-3.2 13.5-13 10.3-21.9-.9-2.5-2.3-4.6-4-6.3l23-47.2c2.5.2 5 0 7.5-.9 2.1-.8 3.9-1.9 5.5-3.3.9.4 1.9.9 2.7 1.3 17.4 8.2 27.9 13.2 30 19.1 2.6 7.5-5.1 23.4-19.3 52.3-.1.2-.2.5-.4.7-2.2-.1-4.4.2-6.5 1-8.9 3.2-13.5 13-10.3 21.9 3.2 8.9 13 13.5 21.9 10.3 8.9-3.2 13.5-13 10.3-21.9-.6-2-1.9-4-3.4-5.7z"></path>
+  </svg>
+
 codeberg: >
   <svg fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <path d="M11.955.49A12 12 0 0 0 0 12.49a12 12 0 0 0 1.832 6.373L11.838 5.928a.187.14 0 0 1 .324 0l10.006 12.935A12 12 0 0 0 24 12.49a12 12 0 0 0-12-12 12 12 0 0 0-.045 0zm.375 6.467 4.416 16.553a12 12 0 0 0 5.137-4.213z"/>

exampleSite/content/docs/guide/configuration.md

@@ -251,6 +251,23 @@ Options for `flexsearch.index`:
 - `heading` - level 1 and level 2 headings
 - `title` - only include the page title
 
+To customize the search tokenize, set the `params.search.flexsearch.tokenize` parameter in the config file:
+
+```yaml {filename="hugo.yaml"}
+params:
+    # ...
+    flexsearch:
+      # full | forward | reverse | strict 
+      tokenize: forward
+```
+
+Options for [`flexsearch.tokenize`](https://github.com/nextapps-de/flexsearch/#tokenizer-prefix-search):
+
+- `strict` - index whole words
+- `forward` - incrementally index words in forward direction
+- `reverse` - incrementally index words in both directions
+- `full` - index every possible combination
+
 To exclude a page from the search index, set the `excludeSearch: true` in the front matter of the page:
 
 ```yaml {filename="content/docs/guide/configuration.md"}

exampleSite/content/docs/guide/configuration.zh-cn.md

@@ -219,6 +219,25 @@ params:
 - `heading` - 一级和二级标题
 - `title` - 仅搜索标题
 
+要自定义检索分词，请在配置文件中设置`params.search.flexsearch.tokenize`：
+
+```hugo.yaml
+params:
+    # ...
+    flexsearch:
+      # full | forward | reverse | strict 
+      tokenize: forward
+```
+
+[`flexsearch.tokenize`](https://github.com/nextapps-de/flexsearch/#tokenizer-prefix-search)的可选项:
+
+- `strict` - 严格单词匹配
+- `forward` - 单词前缀匹配
+- `reverse` - 单词前后缀匹配
+- `full` - 单词子串匹配。
+
+> 在默认的分词逻辑下，中文一句话就是一个“单词”
+
 要从搜索索引中排除页面，更改 front matter 中的 `excludeSearch: true`:
 
 ```yaml {filename="content/docs/guide/configuration.md"}

exampleSite/content/docs/guide/markdown.md

@@ -14,7 +14,7 @@ Hugo supports [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax for form
 | Style   | Syntax     | Example   | Output   |
 | --------  | -------- | ------ | ------ |
 | Bold | `**bold text**` | `**bold text**` | **bold text** |
-| Italic | `*italicized text*` | `*italicized text* | *italicized text* |
+| Italic | `*italicized text*` | `*italicized text*` | *italicized text* |
 | Strikethrough | `~~strikethrough text~~` | `~~strikethrough text~~` | ~~strikethrough text~~ |
 | Subscript | `<sub></sub>` | `This is a <sub>subscript</sub> text` | This is a <sub>subscript</sub> text |
 | Superscript | `<sup></sup>` | `This is a <sup>superscript</sup> text` | This is a <sup>superscript</sup> text |

exampleSite/content/docs/guide/organize-files.md

@@ -82,6 +82,45 @@ weight: 2
   It is recommended to keep the sidebar not too deep. If you have a lot of content, consider **splitting them into multiple sections**.
 {{< /callout >}}
 
+## Breadcrumb Navigation
+
+Breadcrumbs are auto-generated based on the directory structure of `/content`.
+
+For example, consider the file structure [demonstrated above](#directory-structure). Given that structure, the breadcrumbs atop the page at `/docs/guide/organize-files/` would appear automatically as follows:
+
+```
+Documentation > Guide > Organize Files
+```
+
+### Customizing Breadcrumb Link Titles
+
+By default, each breadcrumb link is generated based on that page's `title` parameter. You can customize this by specifying a `linkTitle`.
+
+For example, if instead of `Organize Files` we wanted the breadcrumb to be `Foo Bar`:
+
+```yaml {filename="content/docs/guide/organize-files.md"}
+---
+linkTitle: Foo Bar
+title: Organize Files
+---
+```
+
+This would now generate the following breadcrumbs:
+```
+Documentation > Guide > Foo Bar
+```
+
+### Hiding Breadcrumbs
+
+You can hide breadcrumbs completely from a page by specfying `breadcrumbs: false` in its front matter:
+
+```yaml {filename="content/docs/guide/organize-files.md"}
+---
+breadcrumbs: false
+title: Organize Files
+---
+```
+
 ## Configure Content Directory
 
 By default, the root `content/` directory is used by Hugo to build the site.

exampleSite/content/showcase/index.md

@@ -13,6 +13,13 @@ Open source projects powered by Hextra
 
 {{< cards >}}
 
+  {{< card
+        link="https://github.com/axivo/website"
+        title="AXIVO Docs"
+        image="https://github.com/imfing/hextra/assets/19806136/f22f0710-23a0-430b-8bad-616283b8a3e5"
+        imageStyle="object-fit:cover; aspect-ratio:16/9;"
+  >}}
+
   {{< card
         link="https://github.com/infracourse/web"
         title="Stanford CS 40"

exampleSite/content/showcase/index.zh-cn.md

@@ -13,6 +13,13 @@ layout: wide
 
 {{< cards >}}
 
+  {{< card
+        link="https://github.com/axivo/website"
+        title="AXIVO Docs"
+        image="https://github.com/imfing/hextra/assets/19806136/f22f0710-23a0-430b-8bad-616283b8a3e5"
+        imageStyle="object-fit:cover; aspect-ratio:16/9;"
+  >}}
+
   {{< card
         link="https://github.com/infracourse/web"
         title="Stanford CS 40"

i18n/he.yaml

@@ -0,0 +1,14 @@
+backToTop: "גלול למעלה"
+changeLanguage: "שנה שפה"
+changeTheme: "שנה ערכת צבעים"
+copyCode: "העתק קוד"
+copyright: "© 2024 פרוייקט Hextra"
+dark: "כהה"
+editThisPage: "← ערוך עמוד זה בגיטהאב"
+lastUpdated: "עודכן לאחרונה ב"
+light: "בהיר"
+noResultsFound: "לא נמצאו תוצאות."
+onThisPage: "בעמוד זה"
+poweredBy: "Hextra מופעל על-ידי"
+readMore: "← קרא עוד"
+searchPlaceholder: "חיפוש..."

i18n/nl.yaml

@@ -0,0 +1,14 @@
+backToTop: "Terug naar boven"
+changeLanguage: "Taal veranderen"
+changeTheme: "Thema aanpassen"
+copyCode: "Kopieer code"
+copyright: "© 2024 Hextra Project."
+dark: "Donker"
+editThisPage: "Bewerk deze pagina op GitHub →"
+lastUpdated: "Laatst bijgewerkt op"
+light: "Licht"
+noResultsFound: "Geen resultaten gevonden."
+onThisPage: "Op deze pagina"
+poweredBy: "Mogelijk gemaakt door Hextra"
+readMore: "Lees meer →"
+searchPlaceholder: "Zoeken..."

i18n/uk.yaml

@@ -0,0 +1,14 @@
+backToTop: "Прокрутити до початку"
+changeLanguage: "Змінити мову"
+changeTheme: "Змінити тему"
+copyCode: "Скопіювати код"
+copyright: "2024 Проєкт Hextra."
+dark: "Темна"
+editThisPage: "Редагувати цю сторінку на Github →"
+lastUpdated: "Востаннє оновлено"
+light: "Світла"
+noResultsFound: "Не знайдено результатів"
+onThisPage: "На цій сторінці"
+poweredBy: "Працює завдяки Hextra"
+readMore: "Читати більше →"
+searchPlaceholder: "Пошук..."

layouts/partials/breadcrumb.html

@@ -1,8 +1,9 @@
+{{- if (default true .Params.breadcrumbs) }}
   <div class="hx-mt-1.5 hx-flex hx-items-center hx-gap-1 hx-overflow-hidden hx-text-sm hx-text-gray-500 dark:hx-text-gray-400 contrast-more:hx-text-current">
     {{- range .Ancestors.Reverse }}
       {{- if not .IsHome }}
         <div class="hx-whitespace-nowrap hx-transition-colors hx-min-w-[24px] hx-overflow-hidden hx-text-ellipsis hover:hx-text-gray-900 dark:hover:hx-text-gray-100">
-        <a href="{{ .Permalink }}">{{- partial "utils/title" . -}}</a>
+          <a href="{{ .RelPermalink }}">{{- partial "utils/title" . -}}</a>
         </div>
         {{- partial "utils/icon.html" (dict "name" "chevron-right" "attributes" "class=\"hx-w-3.5 hx-shrink-0 rtl:-hx-rotate-180\"") -}}
       {{ end -}}
@@ -11,3 +12,4 @@
       {{- partial "utils/title" . -}}
     </div>
   </div>
+{{ end -}}

layouts/partials/components/sidebar/bottom.html

@@ -1,12 +0,0 @@
-{{- range site.Menus.sidebar }}
-  {{- $name := or (T .Identifier) .Name }}
-  {{- if eq .Params.type "separator" }}
-    <li class="[word-break:break-word] hx-mt-5 hx-mb-2 hx-px-2 hx-py-1.5 hx-text-sm hx-font-semibold hx-text-gray-900 first:hx-mt-0 dark:hx-text-gray-100">
-      <span class="hx-cursor-default">{{ $name }}</span>
-    </li>
-  {{- else }}
-    <li>
-      {{- partial "components/sidebar/item-link" (dict "active" false "title" $name "link" (.URL | relLangURL)) -}}
-    </li>
-  {{- end }}
-{{- end -}}

layouts/partials/components/sidebar/collapsible-button.html

@@ -1,5 +0,0 @@
-<span class="hextra-sidebar-collapsible-button">
-  <svg fill="none" viewBox="0 0 24 24" stroke="currentColor" class="hx-h-[18px] hx-min-w-[18px] hx-rounded-sm hx-p-0.5 hover:hx-bg-gray-800/5 dark:hover:hx-bg-gray-100/5">
-    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" class="hx-origin-center hx-transition-transform rtl:-hx-rotate-180"></path>
-  </svg>
-</span>

layouts/partials/components/sidebar/generate-section-data.html

@@ -1,51 +0,0 @@
-{{- $context := . -}}
-
-{{- $pages := union .RegularPages .Sections -}}
-{{- $pages = where $pages "Params.sidebar.exclude" "!=" true -}}
-
-{{- $data := slice -}}
-
-{{- range $pages.ByWeight -}}
-  {{ $structure := (partial "sidebar/section-walk" .) | unmarshal -}}
-  {{ $data = $data | append $structure -}}
-{{ end -}}
-
-{{- define "partials/sidebar/section-walk" -}}
-  {{- with . -}}
-  {
-    "title": "{{ partial "utils/title" . }}",
-    "link": "{{ .RelPermalink }}",
-    "toc": {{ partial "sidebar/section-page-toc" . }},
-    "open": {{ .Params.sidebar.open | default false }}
-    {{- if .IsSection }},
-    "items": [
-      {{ $pages := union .RegularPages .Sections -}}
-      {{ $pages = where $pages "Params.sidebar.exclude" "!=" true -}}
-      {{ range $index, $page := $pages.ByWeight -}}
-        {{ partial "sidebar/section-walk" . }}{{ if not (ge $index (sub (len $pages) 1)) }},{{ end -}}
-      {{ end -}}
-    ]
-    {{ end -}}
-  }
-  {{- end }}
-{{- end -}}
-
-{{- define "partials/sidebar/section-page-toc" -}}
-  {{/* Get level 2 headings list used mainly for mobile navigation */}}
-  [
-    {{- with .Fragments.Headings -}}
-      {{/* Loop over level 1 headings */}}
-      {{- range . }}
-        {{- with .Headings }}
-          {{ $headings := . }}
-          {{- range $index, $heading := $headings }}
-            {{ $heading.Title | jsonify (dict "noHTMLEscape" true) }}
-            {{- if not (ge $index (sub (len $headings) 1)) }},{{ end -}}
-          {{ end -}}
-        {{- end -}}
-      {{ end -}}
-    {{- end -}}
-  ]
-{{- end -}}
-
-{{ return ($data | jsonify (dict "noHTMLEscape" true)) }}

layouts/partials/components/sidebar/get-section-data.html

@@ -1,20 +0,0 @@
-{{/* Get section sidebar config from Hugo `data` directory
-
-  If the site is multilingual, the sidebar data is stored in a language-specific
-  directory. For example, the English sidebar data is stored in `data/en/sidebar.yaml`.
-*/}}
-{{ $data := "" }}
-{{ $section := .Section | default "index" }}
-{{ $filename := "sidebar" }}
-
-{{ if hugo.IsMultilingual }}
-  {{ with (index site.Data site.Language.Lang $filename $section) }}
-    {{ $data = . }}
-  {{ end }}
-{{ else }}
-  {{ with (index site.Data $filename $section) }}
-    {{ $data = . }}
-  {{ end }}
-{{ end }}
-
-{{ return $data }}

layouts/partials/components/sidebar/item-link.html

@@ -1,18 +0,0 @@
-{{- $external := strings.HasPrefix .link "http" -}}
-
-{{- $activeClass := cond (.active) "active" "inactive" -}}
-
-
-<a
-  class="hextra-sidebar-item-link {{ $activeClass }} [-webkit-tap-highlight-color:transparent] [-webkit-touch-callout:none] [word-break:break-word]"
-  href="{{ .link }}"
-  {{ if $external }}target="_blank" rel="noreferer"{{ end }}
->
-  {{- .title -}}
-  {{- with .context }}
-    {{- if or .RegularPages .Sections }}
-      {{- partialCached "components/sidebar/collapsible-button" . }}
-    {{- end }}
-  {{ end -}}
-  {{- with .items }}{{- partialCached "components/sidebar/collapsible-button" site.Home }}{{ end -}}
-</a>

layouts/partials/components/sidebar/render-data.html

@@ -1,16 +0,0 @@
-{{- $page := .page -}}
-{{- $pageLink :=  $page.RelPermalink -}}
-{{- $cached := .cached | default false }}
-
-{{- range .data -}}
-  {{- $active := and (not $cached) (or (eq $pageLink .link) (eq (strings.TrimSuffix "/" $pageLink) .link)) -}}
-  {{- $containsPage := hasPrefix $pageLink .link -}}
-  {{- $shouldOpen := or (.open) $containsPage $active | default false -}}
-
-  <li class="hextra-sidebar-item {{ if $shouldOpen }}open{{ end }}">
-    {{- partial "components/sidebar/item-link" (dict "active" $active "title" .title "link" .link "items" .items) -}}
-    {{- if .items -}}
-      {{- partial "components/sidebar/render-items" (dict "items" .items "link" $pageLink "cached" $cached) -}}
-    {{- end -}}
-  </li>
-{{ end }}

layouts/partials/components/sidebar/render-items.html

@@ -1,21 +0,0 @@
-{{- $items := .items -}}
-{{- $pageLink := .link -}}
-{{- $cached := .cached | default false }}
-
-
-<div class="ltr:hx-pr-0 hx-overflow-hidden">
-  <ul class="hextra-sidebar-item-list">
-    {{- range $items }}
-      {{- $active := and (not $cached) (or (eq $pageLink .link) (eq (strings.TrimSuffix "/" $pageLink) .link)) -}}
-      {{- $containsPage := hasPrefix $pageLink .link -}}
-      {{- $shouldOpen := or (.open) $containsPage $active | default false -}}
-
-      <li class="hextra-sidebar-item hx-flex hx-flex-col {{ if $shouldOpen }}open{{ end }}">
-        {{- partial "components/sidebar/item-link" (dict "active" $active "title" .title "link" .link "items" .items) -}}
-        {{- if .items -}}
-          {{- partial "components/sidebar/render-items" (dict "items" .items "link" $pageLink "cached" $cached) -}}
-        {{- end -}}
-      </li>
-    {{- end -}}
-  </ul>
-</div>

layouts/partials/footer.html

@@ -20,7 +20,7 @@
       {{- partial "language-switch.html" (dict "context" .) -}}
       {{- with $displayThemeToggle }}{{ partial "theme-toggle.html" }}{{ end -}}
     </div>
-    {{- if or site.IsMultiLingual $displayThemeToggle -}}
+    {{- if or hugo.IsMultilingual $displayThemeToggle -}}
       <hr class="dark:hx-border-neutral-800" />
     {{- end -}}
   {{- end -}}

layouts/partials/language-switch.html

@@ -5,7 +5,7 @@
 
 {{- $changeLanguage := (T "changeLanguage") | default "Change language" -}}
 
-{{- if site.IsMultiLingual -}}
+{{- if hugo.IsMultilingual -}}
   <div class="hx-flex hx-justify-items-start {{ if $grow }}hx-grow{{ end }}">
     <button
       title="{{ $changeLanguage }}"

layouts/partials/scripts.html

@@ -4,7 +4,7 @@
 {{- $jsLang := resources.Get "js/lang.js" -}}
 {{- $jsCodeCopy := resources.Get "js/code-copy.js" -}}
 {{- $jsFileTree := resources.Get "js/filetree.js" -}}
-{{- $jsSidebar := resources.Get "js/sidebar.js" | resources.ExecuteAsTemplate "sidebar.js" . -}}
+{{- $jsSidebar := resources.Get "js/sidebar.js" -}}
 {{- $jsBackToTop := resources.Get "js/back-to-top.js" -}}
 
 {{- $scripts := slice $jsTheme $jsMenu $jsCodeCopy $jsTabs $jsLang $jsFileTree $jsSidebar $jsBackToTop | resources.Concat "js/main.js" -}}

layouts/partials/sidebar-ng.html

@@ -1,95 +0,0 @@
-{{- $context := .context -}}
-
-{{- $disableSidebar := .disableSidebar | default false -}}
-{{- $displayPlaceholder := .displayPlaceholder | default false -}}
-
-{{- $sidebarClass := cond $disableSidebar (cond $displayPlaceholder "md:hx-hidden xl:hx-block" "md:hx-hidden") "md:hx-sticky" -}}
-
-{{- $navRoot := cond (eq site.Home.Type "docs") site.Home $context.FirstSection -}}
-{{- $pageURL := $context.RelPermalink -}}
-
-{{- $data := slice -}}
-{{- $dataMobile := slice -}}
-
-{{- if (eq site.Params.page.sidebar.source "data") -}}
-  {{ $data = partialCached "components/sidebar/get-section-data" $context $context.Section }}
-  {{- $dataMobile = $data -}}
-{{- else -}}
-  {{- $data = (partialCached "components/sidebar/generate-section-data" $navRoot $navRoot) | unmarshal -}}
-  {{- $dataMobile = (partialCached "components/sidebar/generate-section-data" site.Home site.Home) | unmarshal -}}
-{{- end -}}
-
-{{- $shouldCache := site.Params.page.sidebar.cache | default false -}}
-
-{{/* EXPERIMENTAL */}}
-{{- if .context.Params.sidebar.hide -}}
-  {{- $disableSidebar = true -}}
-  {{- $displayPlaceholder = true -}}
-{{- end -}}
-
-<div class="mobile-menu-overlay [transition:background-color_1.5s_ease] hx-fixed hx-inset-0 hx-z-10 hx-bg-black/80 dark:hx-bg-black/60 hx-hidden"></div>
-
-<aside class="hextra-sidebar-container hx-flex hx-flex-col print:hx-hidden md:hx-top-16 md:hx-shrink-0 md:hx-w-64 md:hx-self-start max-md:[transform:translate3d(0,-100%,0)] {{ $sidebarClass }}">
-  {{/* Search bar on small screen */}}
-  {{- partialCached "components/sidebar/mobile-search" . -}}
-
-
-  <div class="hextra-scrollbar hx-overflow-y-auto hx-overflow-x-hidden hx-p-4 hx-grow md:hx-h-[calc(100vh-var(--navbar-height)-var(--menu-height))]">
-    {{/* Mobile Navigation */}}
-    <ul class="hx-flex hx-flex-col hx-gap-1 md:hx-hidden">
-      {{- with $dataMobile -}}
-        {{- partial "components/sidebar/render-data" (dict "data" . "page" $context) -}}
-      {{- end -}}
-    </ul>
-
-    {{/* Sidebar on large screen */}}
-    {{- if $disableSidebar -}}
-      {{- if $displayPlaceholder }}<div class="max-xl:hx-hidden hx-h-0 hx-w-64 hx-shrink-0"></div>{{ end -}}
-      {{ .context.Scratch.Set "enableFooterSwitches" true }}
-    {{- else -}}
-      <ul class="hx-flex hx-flex-col hx-gap-1 max-md:hx-hidden">
-        {{- with $data -}}
-          {{- if $shouldCache -}}
-            {{- partialCached "components/sidebar/render-data" (dict "data" . "page" $context "cached" $shouldCache) $navRoot -}}
-          {{- else -}}
-            {{- partial "components/sidebar/render-data" (dict "data" . "page" $context "cached" $shouldCache) -}}
-          {{- end -}}
-        {{- end -}}
-        {{- partialCached "components/sidebar/bottom" $context site.Home -}}
-      </ul>
-    {{ end -}}
-  </div>
-  {{- partial "components/sidebar/switches" (dict "context" $context "disableSidebar" $disableSidebar) -}}
-</aside>
-
-{{- define "partials/components/sidebar/mobile-search" -}}
-  <div class="hx-px-4 hx-pt-4 md:hx-hidden">
-    {{- partialCached "search.html" . -}}
-  </div>
-{{- end -}}
-
-{{- define "partials/components/sidebar/switches" -}}
-  {{- $context := .context -}}
-  {{- $disableSidebar := .disableSidebar -}}
-  {{/* Hide theme switch when sidebar is disabled */}}
-  {{ $switchesClass := cond $disableSidebar "md:hx-hidden" "" -}}
-  {{ $displayThemeToggle := (site.Params.theme.displayToggle | default true) -}}
-
-  {{ if or site.IsMultiLingual $displayThemeToggle }}
-    <div
-      class="{{ $switchesClass }} {{ with site.IsMultiLingual }}
-        hx-justify-end
-      {{ end }} hx-sticky hx-bottom-0 hx-bg-white dark:hx-bg-dark hx-mx-4 hx-py-4 hx-shadow-[0_-12px_16px_#fff] hx-flex hx-items-center hx-gap-2 dark:hx-border-neutral-800 dark:hx-shadow-[0_-12px_16px_#111] contrast-more:hx-border-neutral-400 contrast-more:hx-shadow-none contrast-more:dark:hx-shadow-none hx-border-t"
-      data-toggle-animation="show"
-    >
-      {{- with site.IsMultiLingual -}}
-        {{- partial "language-switch" (dict "context" $context "grow" true) -}}
-        {{- with $displayThemeToggle }}{{ partial "theme-toggle" (dict "hideLabel" true) }}{{ end -}}
-      {{- else -}}
-        {{- with $displayThemeToggle -}}
-          <div class="hx-flex hx-grow hx-flex-col">{{ partial "theme-toggle" }}</div>
-        {{- end -}}
-      {{- end -}}
-    </div>
-  {{- end -}}
-{{- end -}}

layouts/partials/sidebar.html

@@ -43,9 +43,9 @@
   {{ $switchesClass := cond $disableSidebar "md:hx-hidden" "" -}}
   {{ $displayThemeToggle := (site.Params.theme.displayToggle | default true) -}}
 
-  {{ if or site.IsMultiLingual $displayThemeToggle }}
-    <div class="{{ $switchesClass }} {{ with site.IsMultiLingual }}hx-justify-end{{ end }} hx-sticky hx-bottom-0 hx-bg-white dark:hx-bg-dark hx-mx-4 hx-py-4 hx-shadow-[0_-12px_16px_#fff] hx-flex hx-items-center hx-gap-2 dark:hx-border-neutral-800 dark:hx-shadow-[0_-12px_16px_#111] contrast-more:hx-border-neutral-400 contrast-more:hx-shadow-none contrast-more:dark:hx-shadow-none hx-border-t" data-toggle-animation="show">
-      {{- with site.IsMultiLingual -}}
+  {{ if or hugo.IsMultilingual $displayThemeToggle }}
+    <div class="{{ $switchesClass }} {{ with hugo.IsMultilingual }}hx-justify-end{{ end }} hx-sticky hx-bottom-0 hx-bg-white dark:hx-bg-dark hx-mx-4 hx-py-4 hx-shadow-[0_-12px_16px_#fff] hx-flex hx-items-center hx-gap-2 dark:hx-border-neutral-800 dark:hx-shadow-[0_-12px_16px_#111] contrast-more:hx-border-neutral-400 contrast-more:hx-shadow-none contrast-more:dark:hx-shadow-none hx-border-t" data-toggle-animation="show">
+      {{- with hugo.IsMultilingual -}}
         {{- partial "language-switch" (dict "context" $context "grow" true) -}}
         {{- with $displayThemeToggle }}{{ partial "theme-toggle" (dict "hideLabel" true) }}{{ end -}}
       {{- else -}}

layouts/shortcodes/hextra/hero-container.html

@@ -0,0 +1,38 @@
+{{- $class := .Get "class" -}}
+{{- $cols := .Get "cols" | default 2 -}}
+{{- $image := .Get "image" -}}
+{{- $imageCard := .Get "imageCard" | default false -}}
+{{- $imageClass := .Get "imageClass" -}}
+{{- $imageLink := .Get "imageLink" -}}
+{{- $imageLinkExternal := hasPrefix $imageLink "http" -}}
+{{- $imageStyle := .Get "imageStyle" -}}
+{{- $imageTitle := .Get "imageTitle" -}}
+{{- $imageWidth := .Get "imageWidth" | default 350 -}}
+{{- $imageHeight := .Get "imageHeight" | default 350 -}}
+{{- $style := .Get "style" -}}
+
+{{- $css := printf "--hextra-feature-grid-cols: %v; %s" $cols $style -}}
+{{- $href := cond (hasPrefix $imageLink "/") ($imageLink | relURL) $imageLink -}}
+{{- if hasPrefix $image "/" -}}
+  {{- $image = relURL (strings.TrimPrefix "/" $image) -}}
+{{- end -}}
+
+<div
+  class="{{ $class }} hextra-feature-grid hx-grid sm:max-lg:hx-grid-cols-2 max-sm:hx-grid-cols-1 hx-gap-4 hx-w-full not-prose"
+  {{ with $css }}style="{{ . | safeCSS }}"{{ end }}
+>
+  <div class="hx-w-full">
+    {{ .Inner }}
+  </div>
+  {{- with $image }}
+  <div class="hx-mx-auto">
+    <a
+      {{ with $imageLink }}href="{{ $href }}" {{ with $imageLinkExternal }} target="_blank" rel="noreferrer"{{ end }}{{ end }}
+      {{ with $imageStyle }}style="{{ . | safeCSS }}"{{ end }}
+      class="{{ $imageClass }} {{ if $imageCard }}hextra-feature-card not-prose hx-block hx-relative hx-p-6 hx-overflow-hidden hx-rounded-3xl hx-border hx-border-gray-200 hover:hx-border-gray-300 dark:hx-border-neutral-800 dark:hover:hx-border-neutral-700 before:hx-pointer-events-none before:hx-absolute before:hx-inset-0 before:hx-bg-glass-gradient{{ end }}"
+    >
+      <img src="{{ $image }}" width="{{ $imageWidth }}" height="{{ $imageHeight }}" {{ with $imageTitle }}alt="{{ $imageTitle }}"{{ end }}/>
+    </a>
+  </div>
+  {{ end -}}
+</div>

netlify.toml

@@ -7,4 +7,6 @@ command = "cd exampleSite && hugo --gc --minify --themesDir ../.. -b ${DEPLOY_PR
 ignore = "false"
 
 [build.environment]
-HUGO_VERSION = "0.117.0"
+HUGO_VERSION = "0.126.1"
+GO_VERSION = "1.22.3"
+NODE_VERSION = "22.2.0"

theme.toml

@@ -9,7 +9,7 @@ homepage = "https://github.com/imfing/hextra/"
 demosite = "https://imfing.github.io/hextra/"
 tags = ["Modern", "Elegant", "Blog", "Documentation", "Responsive", "Clean", "Light", "Dark", "Minimal"]
 features = ["Responsive", "Dark Mode", "Search", "Syntax Highlighting", "Multilingual", "Social", "Blog", "RSS", "Customization"]
-min_version = "0.111.0"
+min_version = "0.124.0"
 
 [author]
   name = "Xin"