Merge 8355a69cba into 82b5481914

🔀 Merge pull request #748 from jpanther/dependabot/npm_and_yarn/prettier-3.1.1
📌 Bump prettier from 3.1.0 to 3.1.1
2023-12-17 11:50:00 +09:00 · 2023-12-12 10:15:54 +11:00 · 2023-12-10 22:09:36 +00:00 · 2023-11-27 23:15:51 +08:00 · 2023-11-27 23:00:14 +08:00
8 changed files with 231 additions and 445 deletions
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@ -19,7 +19,7 @@ enableQuicklink = true
 fingerprintAlgorithm = "sha256"

 [header]
-  layout = "basic" # valid options: basic, hamburger, hybrid, custom
+  layout = "hybrid" # valid options: basic, hamburger, hybrid, custom
  # logo = "img/logo.jpg"
  # logoDark = "img/dark-logo.jpg"
  showTitle = true
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@ -7,105 +7,7 @@
    {{/* Main menu */}}
    {{ if or .Site.Menus.main (.Site.Params.enableSearch | default false) }}
      <ul class="flex flex-col list-none text-end sm:flex-row">
-        {{ if .Site.Menus.main }}
-          {{ range .Site.Menus.main }}
-            {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
-              {{ continue }}
-            {{ end }}
-            <li class="group mb-1 sm:mb-0 sm:me-7 sm:last:me-0.5">
-              {{ if eq .Params.action "search" }}
-                {{ $.Scratch.Add "searchCount" 1 }}
-                {{ if $.Site.Params.enableSearch | default false }}
-                  <button
-                    id="search-button-{{ $.Scratch.Get "searchCount" }}"
-                    title="{{ .Title | default (i18n "search.open_button_title") }}"
-                  >
-                    {{ with .Params.icon | default "search" }}
-                      <span
-                        class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                      >
-                        {{- partial "icon.html" . -}}
-                      </span>
-                    {{- end -}}{{- if .Params.showName | default true -}}
-                      <span
-                        class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                        >{{ .Name | markdownify | emojify }}</span
-                      >
-                    {{ end }}
-                  </button>
-                {{ end }}
-              {{ else if eq .Params.action "appearance" }}
-                {{ $.Scratch.Add "switchCount" 1 }}
-                <button
-                  id="appearance-switcher-{{ $.Scratch.Get "switchCount" }}"
-                  type="button"
-                  aria-label="appearance switcher"
-                >
-                  <span
-                    class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
-                    title="{{ i18n "footer.dark_appearance" }}"
-                  >
-                    {{ with .Params.icon | default "moon" }}
-                      {{- partial "icon.html" . -}}
-                    {{- end -}}
-                    {{- if .Params.showName | default true -}}
-                      <span
-                        class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                        >{{ .Name | markdownify | emojify }}</span
-                      >
-                    {{ end }}
-                  </span>
-                  <span
-                    class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
-                    title="{{ i18n "footer.light_appearance" }}"
-                  >
-                    {{ with .Params.icon | default "sun" }}
-                      {{ partial "icon.html" . }}
-                    {{ end }}
-                    {{ if .Params.showName | default true }}
-                      <span
-                        class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                        >{{ .Name | markdownify | emojify }}</span
-                      >
-                    {{ end }}
-                  </span>
-                </button>
-              {{ else if eq .Params.action "locale" }}
-                {{ $.Scratch.Add "localeCount" 1 }}
-                {{ partial "translations.html" . }}
-              {{ else }}
-                <a
-                  href="{{ .URL }}"
-                  title="{{ .Title }}"
-                  {{ with .Params.target }}target="{{ . }}"{{ end }}
-                  >{{ with .Params.icon }}
-                    <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                    >
-                      {{- partial "icon.html" . -}}
-                    </span>
-                  {{- end -}}{{- if .Params.showName | default true -}}
-                    <span
-                      class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                      >{{ .Name | markdownify | emojify }}</span
-                    >
-                  {{ end }}</a
-                >
-              {{ end }}
-            </li>
-          {{ end }}
-          {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-            <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">
-              <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
-                <span
-                  class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                >
-                  {{ partial "icon.html" "search" }}
-                </span>
-              </button>
-            </li>
-          {{ end }}
-        {{ end }}
+        {{ partial "header/basic/basic-content.html" . }}
      </ul>
    {{ end }}
  </nav>
--- a/layouts/partials/header/basic/basic-content.html
+++ b/layouts/partials/header/basic/basic-content.html
@ -0,0 +1,99 @@
+{{ if .Site.Menus.main }}
+    {{ range .Site.Menus.main }}
+    {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
+        {{ continue }}
+    {{ end }}
+    <li class="group mb-1 sm:mb-0 sm:me-7 sm:last:me-0">
+        {{ if eq .Params.action "search" }}
+        {{ $.Scratch.Add "searchCount" 1 }}
+        {{ if $.Site.Params.enableSearch | default false }}
+            <button
+            id="search-button-{{ $.Scratch.Get "searchCount" }}"
+            title="{{ .Title | default (i18n "search.open_button_title") }}"
+            >
+            {{ with .Params.icon | default "search" }}
+                <span
+                class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                >
+                {{- partial "icon.html" . -}}
+                </span>
+            {{- end -}}{{- if .Params.showName | default true -}}
+                <span
+                class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                >{{ .Name | markdownify | emojify }}</span
+                >
+            {{ end }}
+            </button>
+        {{ end }}
+        {{ else if eq .Params.action "appearance" }}
+        {{ $.Scratch.Add "switchCount" 1 }}
+        <button
+            id="appearance-switcher-{{ $.Scratch.Get "switchCount" }}"
+            type="button"
+            aria-label="appearance switcher"
+        >
+            <span
+            class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+            title="{{ i18n "footer.dark_appearance" }}"
+            >
+            {{ with .Params.icon | default "moon" }}
+                {{- partial "icon.html" . -}}
+            {{- end -}}
+            {{- if .Params.showName | default true -}}
+                <span
+                class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                >{{ .Name | markdownify | emojify }}</span
+                >
+            {{ end }}
+            </span>
+            <span
+            class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+            title="{{ i18n "footer.light_appearance" }}"
+            >
+            {{ with .Params.icon | default "sun" }}
+                {{ partial "icon.html" . }}
+            {{ end }}
+            {{ if .Params.showName | default true }}
+                <span
+                class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                >{{ .Name | markdownify | emojify }}</span
+                >
+            {{ end }}
+            </span>
+        </button>
+        {{ else if eq .Params.action "locale" }}
+        {{ $.Scratch.Add "localeCount" 1 }}
+        {{ partial "translations.html" . }}
+        {{ else }}
+        <a
+            href="{{ .URL }}"
+            title="{{ .Title }}"
+            {{ with .Params.target }}target="{{ . }}"{{ end }}
+            >{{ with .Params.icon }}
+            <span
+                class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+            >
+                {{- partial "icon.html" . -}}
+            </span>
+            {{- end -}}{{- if .Params.showName | default true -}}
+            <span
+                class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                >{{ .Name | markdownify | emojify }}</span
+            >
+            {{ end }}</a
+        >
+        {{ end }}
+    </li>
+    {{ end }}
+    {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
+    <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">
+        <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
+        <span
+            class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+        >
+            {{ partial "icon.html" "search" }}
+        </span>
+        </button>
+    </li>
+    {{ end }}
+{{ end }}
--- a/layouts/partials/header/hamburger.html
+++ b/layouts/partials/header/hamburger.html
@ -7,124 +7,7 @@
    {{/* Hamburger menu */}}
    {{ if or .Site.Menus.main (.Site.Params.enableSearch | default false) }}
      <label id="menu-button" for="menu-controller" class="block">
-        <input type="checkbox" id="menu-controller" class="hidden" />
-        <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
-          {{ partial "icon.html" "bars" }}
-        </div>
-        <div
-          id="menu-wrapper"
-          class="fixed inset-0 z-30 invisible w-full h-full m-auto overflow-auto transition-opacity opacity-0 cursor-default bg-neutral-100/50 backdrop-blur-sm dark:bg-neutral-900/50"
-        >
-          <ul
-            class="flex flex-col w-full px-6 py-6 mx-auto overflow-visible list-none max-w-7xl text-end sm:px-14 sm:py-10 sm:pt-10 md:px-24 lg:px-32"
-          >
-            <li class="mb-1">
-              <span class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400"
-                >{{ partial "icon.html" "xmark" }}</span
-              >
-            </li>
-            {{ if .Site.Menus.main }}
-              {{ range .Site.Menus.main }}
-                {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
-                  {{ continue }}
-                {{ end }}
-                <li class="mb-1 group">
-                  {{ if eq .Params.action "search" }}
-                    {{ $.Scratch.Add "searchCount" 1 }}
-                    {{ if $.Site.Params.enableSearch | default false }}
-                      <button
-                        id="search-button-{{ $.Scratch.Get "searchCount" }}"
-                        title="{{ .Title | default (i18n "search.open_button_title") }}"
-                      >
-                        {{ with .Params.icon | default "search" }}
-                          <span
-                            class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                          >
-                            {{- partial "icon.html" . -}}
-                          </span>
-                        {{- end -}}{{- if .Params.showName | default true -}}
-                          <span
-                            class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                            >{{ .Name | markdownify | emojify }}</span
-                          >
-                        {{ end }}
-                      </button>
-                    {{ end }}
-                  {{ else if eq .Params.action "appearance" }}
-                    {{ $.Scratch.Add "switchCount" 1 }}
-                    <button
-                      id="appearance-switcher-{{ $.Scratch.Get "switchCount" }}"
-                      type="button"
-                      aria-label="appearance switcher"
-                    >
-                      <span
-                        class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
-                        title="{{ i18n "footer.dark_appearance" }}"
-                      >
-                        {{ with .Params.icon | default "moon" }}
-                          {{- partial "icon.html" . -}}
-                        {{- end -}}
-                        {{- if .Params.showName | default true -}}
-                          <span
-                            class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                            >{{ .Name | markdownify | emojify }}</span
-                          >
-                        {{ end }}
-                      </span>
-                      <span
-                        class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
-                        title="{{ i18n "footer.light_appearance" }}"
-                      >
-                        {{ with .Params.icon | default "sun" }}
-                          {{- partial "icon.html" . -}}
-                        {{- end -}}
-                        {{- if .Params.showName | default true -}}
-                          <span
-                            class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                            >{{ .Name | markdownify | emojify }}</span
-                          >
-                        {{ end }}
-                      </span>
-                    </button>
-                  {{ else if eq .Params.action "locale" }}
-                    {{ $.Scratch.Add "localeCount" 1 }}
-                    {{ partial "translations.html" . }}
-                  {{ else }}
-                    <a
-                      href="{{ .URL }}"
-                      title="{{ .Title }}"
-                      onclick="close_menu()"
-                      {{ with .Params.target }}target="{{ . }}"{{ end }}
-                      >{{ with .Params.icon }}
-                        <span
-                          class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                        >
-                          {{- partial "icon.html" . -}}
-                        </span>
-                      {{- end -}}{{- if .Params.showName | default true -}}
-                        <span
-                          class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                          >{{ .Name | markdownify | emojify }}</span
-                        >
-                      {{ end }}</a
-                    >
-                  {{ end }}
-                </li>
-              {{ end }}
-              {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-                <li class="mb-1 group">
-                  <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
-                    <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                    >
-                      {{ partial "icon.html" "search" }}
-                    </span>
-                  </button>
-                </li>
-              {{ end }}
-            {{ end }}
-          </ul>
-        </div>
+        {{ partial "header/hamburger/hamburger-content.html" . }}
      </label>
    {{ end }}
  </nav>
--- a/layouts/partials/header/hamburger/hamburger-content.html
+++ b/layouts/partials/header/hamburger/hamburger-content.html
@ -0,0 +1,118 @@
+<input type="checkbox" id="menu-controller" class="hidden" />
+<div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
+    {{ partial "icon.html" "bars" }}
+</div>
+<div
+    id="menu-wrapper"
+    class="fixed inset-0 z-30 invisible w-full h-full m-auto overflow-auto transition-opacity opacity-0 cursor-default bg-neutral-100/50 backdrop-blur-sm dark:bg-neutral-900/50"
+>
+    <ul
+    class="flex flex-col w-full px-6 py-6 mx-auto overflow-visible list-none max-w-7xl text-end sm:px-14 sm:py-10 sm:pt-10 md:px-24 lg:px-32"
+    >
+    <li class="mb-1">
+        <span class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400"
+        >{{ partial "icon.html" "xmark" }}</span
+        >
+    </li>
+    {{ if .Site.Menus.main }}
+        {{ range .Site.Menus.main }}
+        {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
+            {{ continue }}
+        {{ end }}
+        <li class="mb-1 group">
+            {{ if eq .Params.action "search" }}
+            {{ $.Scratch.Add "searchCount" 1 }}
+            {{ if $.Site.Params.enableSearch | default false }}
+                <button
+                id="search-button-{{ $.Scratch.Get "searchCount" }}"
+                title="{{ .Title | default (i18n "search.open_button_title") }}"
+                >
+                {{ with .Params.icon | default "search" }}
+                    <span
+                    class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                    >
+                    {{- partial "icon.html" . -}}
+                    </span>
+                {{- end -}}{{- if .Params.showName | default true -}}
+                    <span
+                    class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                    >{{ .Name | markdownify | emojify }}</span
+                    >
+                {{ end }}
+                </button>
+            {{ end }}
+            {{ else if eq .Params.action "appearance" }}
+            {{ $.Scratch.Add "switchCount" 1 }}
+            <button
+                id="appearance-switcher-{{ $.Scratch.Get "switchCount" }}"
+                type="button"
+                aria-label="appearance switcher"
+            >
+                <span
+                class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                title="{{ i18n "footer.dark_appearance" }}"
+                >
+                {{ with .Params.icon | default "moon" }}
+                    {{- partial "icon.html" . -}}
+                {{- end -}}
+                {{- if .Params.showName | default true -}}
+                    <span
+                    class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                    >{{ .Name | markdownify | emojify }}</span
+                    >
+                {{ end }}
+                </span>
+                <span
+                class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                title="{{ i18n "footer.light_appearance" }}"
+                >
+                {{ with .Params.icon | default "sun" }}
+                    {{- partial "icon.html" . -}}
+                {{- end -}}
+                {{- if .Params.showName | default true -}}
+                    <span
+                    class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                    >{{ .Name | markdownify | emojify }}</span
+                    >
+                {{ end }}
+                </span>
+            </button>
+            {{ else if eq .Params.action "locale" }}
+            {{ $.Scratch.Add "localeCount" 1 }}
+            {{ partial "translations.html" . }}
+            {{ else }}
+            <a
+                href="{{ .URL }}"
+                title="{{ .Title }}"
+                onclick="close_menu()"
+                {{ with .Params.target }}target="{{ . }}"{{ end }}
+                >{{ with .Params.icon }}
+                <span
+                    class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                >
+                    {{- partial "icon.html" . -}}
+                </span>
+                {{- end -}}{{- if .Params.showName | default true -}}
+                <span
+                    class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
+                    >{{ .Name | markdownify | emojify }}</span
+                >
+                {{ end }}</a
+            >
+            {{ end }}
+        </li>
+        {{ end }}
+        {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
+        <li class="mb-1 group">
+            <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
+            <span
+                class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+            >
+                {{ partial "icon.html" "search" }}
+            </span>
+            </button>
+        </li>
+        {{ end }}
+    {{ end }}
+    </ul>
+</div>
--- a/layouts/partials/header/hybrid.html
+++ b/layouts/partials/header/hybrid.html
@ -5,229 +5,13 @@
      {{ partial "logo.html" . }}
    </div>
    {{ if or .Site.Menus.main (.Site.Params.enableSearch | default false) }}
-      {{/* Hamburger menu */}}
      <label id="menu-button" for="menu-controller" class="block sm:hidden">
-        <input type="checkbox" id="menu-controller" class="hidden" />
-        <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
-          {{ partial "icon.html" "bars" }}
-        </div>
-        <div
-          id="menu-wrapper"
-          class="fixed inset-0 z-30 invisible w-full h-full m-auto overflow-auto transition-opacity opacity-0 cursor-default bg-neutral-100/50 backdrop-blur-sm dark:bg-neutral-900/50"
-        >
-          <ul
-            class="flex flex-col w-full px-6 py-6 mx-auto overflow-visible list-none max-w-7xl text-end sm:px-14 sm:py-10 sm:pt-10 md:px-24 lg:px-32"
-          >
-            <li class="mb-1">
-              <span class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400"
-                >{{ partial "icon.html" "xmark" }}</span
-              >
-            </li>
-            {{ if .Site.Menus.main }}
-              {{ range .Site.Menus.main }}
-                {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
-                  {{ continue }}
-                {{ end }}
-                <li class="mb-1 group">
-                  {{ if eq .Params.action "search" }}
-                    {{ $.Scratch.Add "searchCount" 1 }}
-                    {{ if $.Site.Params.enableSearch | default false }}
-                      <button
-                        id="search-button-{{ $.Scratch.Get "searchCount" }}"
-                        title="{{ .Title | default (i18n "search.open_button_title") }}"
-                      >
-                        {{ with .Params.icon | default "search" }}
-                          <span
-                            class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                          >
-                            {{- partial "icon.html" . -}}
-                          </span>
-                        {{- end -}}{{- if .Params.showName | default true -}}
-                          <span
-                            class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                            >{{ .Name | markdownify | emojify }}</span
-                          >
-                        {{ end }}
-                      </button>
-                    {{ end }}
-                  {{ else if eq .Params.action "appearance" }}
-                    {{ $.Scratch.Add "switchCount" 1 }}
-                    <button
-                      id="appearance-switcher-{{ $.Scratch.Get "switchCount" }}"
-                      type="button"
-                      aria-label="appearance switcher"
-                    >
-                      <span
-                        class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
-                        title="{{ i18n "footer.dark_appearance" }}"
-                      >
-                        {{ with .Params.icon | default "moon" }}
-                          {{- partial "icon.html" . -}}
-                        {{- end -}}
-                        {{- if .Params.showName | default true -}}
-                          <span
-                            class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                            >{{ .Name | markdownify | emojify }}</span
-                          >
-                        {{ end }}
-                      </span>
-                      <span
-                        class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
-                        title="{{ i18n "footer.light_appearance" }}"
-                      >
-                        {{ with .Params.icon | default "sun" }}
-                          {{- partial "icon.html" . -}}
-                        {{- end -}}
-                        {{- if .Params.showName | default true -}}
-                          <span
-                            class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                            >{{ .Name | markdownify | emojify }}</span
-                          >
-                        {{ end }}
-                      </span>
-                    </button>
-                  {{ else if eq .Params.action "locale" }}
-                    {{ $.Scratch.Add "localeCount" 1 }}
-                    {{ partial "translations.html" . }}
-                  {{ else }}
-                    <a
-                      href="{{ .URL }}"
-                      title="{{ .Title }}"
-                      onclick="close_menu()"
-                      {{ with .Params.target }}target="{{ . }}"{{ end }}
-                      >{{ with .Params.icon }}
-                        <span
-                          class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                        >
-                          {{- partial "icon.html" . -}}
-                        </span>
-                      {{- end -}}{{- if .Params.showName | default true -}}
-                        <span
-                          class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                          >{{ .Name | markdownify | emojify }}</span
-                        >
-                      {{ end }}</a
-                    >
-                  {{ end }}
-                </li>
-              {{ end }}
-              {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-                <li class="mb-1 group">
-                  <button id="search-button-m0" title="{{ i18n "search.open_button_title" }}">
-                    <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                    >
-                      {{ partial "icon.html" "search" }}
-                    </span>
-                  </button>
-                </li>
-              {{ end }}
-            {{ end }}
-          </ul>
-        </div>
+        {{/* Hamburger menu */}}
+        {{ partial "header/hamburger/hamburger-content.html" . }}
      </label>
      {{/* Basic menu */}}
      <ul class="flex-row hidden list-none text-end sm:flex">
-        {{ if .Site.Menus.main }}
-          {{ range .Site.Menus.main }}
-            {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
-              {{ continue }}
-            {{ end }}
-            <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">
-              {{ if eq .Params.action "search" }}
-                {{ $.Scratch.Add "searchCount" 1 }}
-                {{ if $.Site.Params.enableSearch | default false }}
-                  <button
-                    id="search-button-{{ $.Scratch.Get "searchCount" }}"
-                    title="{{ .Title | default (i18n "search.open_button_title") }}"
-                  >
-                    {{ with .Params.icon | default "search" }}
-                      <span
-                        class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                      >
-                        {{- partial "icon.html" . -}}
-                      </span>
-                    {{- end -}}{{- if .Params.showName | default true -}}
-                      <span
-                        class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                        >{{ .Name | markdownify | emojify }}</span
-                      >
-                    {{ end }}
-                  </button>
-                {{ end }}
-              {{ else if eq .Params.action "appearance" }}
-                {{ $.Scratch.Add "switchCount" 1 }}
-                <button
-                  id="appearance-switcher-{{ $.Scratch.Get "switchCount" }}"
-                  type="button"
-                  aria-label="appearance switcher"
-                >
-                  <span
-                    class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
-                    title="{{ i18n "footer.dark_appearance" }}"
-                  >
-                    {{ with .Params.icon | default "moon" }}
-                      {{- partial "icon.html" . -}}
-                    {{- end -}}
-                    {{- if .Params.showName | default true -}}
-                      <span
-                        class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                        >{{ .Name | markdownify | emojify }}</span
-                      >
-                    {{ end }}
-                  </span>
-                  <span
-                    class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
-                    title="{{ i18n "footer.light_appearance" }}"
-                  >
-                    {{ with .Params.icon | default "sun" }}
-                      {{- partial "icon.html" . -}}
-                    {{- end -}}
-                    {{- if .Params.showName | default true -}}
-                      <span
-                        class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                        >{{ .Name | markdownify | emojify }}</span
-                      >
-                    {{ end }}
-                  </span>
-                </button>
-              {{ else if eq .Params.action "locale" }}
-                {{ $.Scratch.Add "localeCount" 1 }}
-                {{ partial "translations.html" . }}
-              {{ else }}
-                <a
-                  href="{{ .URL }}"
-                  title="{{ .Title }}"
-                  {{ with .Params.target }}target="{{ . }}"{{ end }}
-                  >{{ with .Params.icon }}
-                    <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                    >
-                      {{- partial "icon.html" . -}}
-                    </span>
-                  {{- end -}}{{- if .Params.showName | default true -}}
-                    <span
-                      class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
-                      >{{ .Name | markdownify | emojify }}</span
-                    >
-                  {{ end }}</a
-                >
-              {{ end }}
-            </li>
-          {{ end }}
-          {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-            <li class="mb-1 group sm:mb-0 sm:me-7 sm:last:me-0">
-              <button id="search-button-m1" title="{{ i18n "search.open_button_title" }}">
-                <span
-                  class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
-                >
-                  {{ partial "icon.html" "search" }}
-                </span>
-              </button>
-            </li>
-          {{ end }}
-
-        {{ end }}
+        {{ partial "header/basic/basic-content.html" . }}
      </ul>
    {{ end }}
  </nav>
--- a/package-lock.json
+++ b/package-lock.json
@ -15,7 +15,7 @@
        "fuse.js": "^7.0.0",
        "katex": "^0.16.9",
        "mermaid": "^10.6.1",
-        "prettier": "^3.1.0",
+        "prettier": "^3.1.1",
        "prettier-plugin-go-template": "^0.0.15",
        "prettier-plugin-tailwindcss": "^0.5.9",
        "quicklink": "^2.3.0",
@ -2333,9 +2333,9 @@
      "dev": true
    },
    "node_modules/prettier": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+      "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
      "dev": true,
      "bin": {
        "prettier": "bin/prettier.cjs"
@ -4845,9 +4845,9 @@
      "dev": true
    },
    "prettier": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+      "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
      "dev": true
    },
    "prettier-plugin-go-template": {
--- a/package.json
+++ b/package.json
@ -34,7 +34,7 @@
    "fuse.js": "^7.0.0",
    "katex": "^0.16.9",
    "mermaid": "^10.6.1",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
    "prettier-plugin-go-template": "^0.0.15",
    "prettier-plugin-tailwindcss": "^0.5.9",
    "quicklink": "^2.3.0",
Author	SHA1	Message	Date
Wen Junhua	80cff7fee8	Merge `8355a69cba` into `82b5481914`	2023-12-17 11:50:00 +09:00
James Panther	82b5481914	🔀 Merge pull request #748 from jpanther/dependabot/npm_and_yarn/prettier-3.1.1 📌 Bump prettier from 3.1.0 to 3.1.1	2023-12-12 10:15:54 +11:00
dependabot[bot]	d19572206a	📌 Bump prettier from 3.1.0 to 3.1.1 Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.1.0...3.1.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-10 22:09:36 +00:00
Wen Junhua	8355a69cba	fix: fix hamburger menu	2023-11-27 23:15:51 +08:00
Wen Junhua	c75289eea7	refactor: refactor headers to use same code	2023-11-27 23:00:14 +08:00