Merge branch 'dev' into feat/add-icon-script

🎨 Tailwind classes cleanup
🎨 Code cleanup
2023-12-26 17:19:40 +09:00 · 2023-12-26 11:56:32 +11:00 · 2023-12-26 11:22:55 +11:00
53 changed files with 254 additions and 200 deletions
--- a/.github/labeller.yml
+++ b/.github/labeller.yml
@ -1,7 +1,7 @@
 i18n:
- changed-files:
-  - any-glob-to-any-file: i18n/*
+  - changed-files:
+      - any-glob-to-any-file: i18n/*

 documentation:
- changed-files:
-  - any-glob-to-any-file: '**/*.md'
+  - changed-files:
+      - any-glob-to-any-file: "**/*.md"
--- a/.prettierignore
+++ b/.prettierignore
@ -0,0 +1,8 @@
+/assets/css/compiled/
+/assets/lib/
+
+/layouts/_default/_markup/*.html
+/layouts/shortcodes/figure.html
+/layouts/shortcodes/screenshot.html
+
+/exampleSite/content/docs/version-2/lighthouse.html
--- a/.prettierrc
+++ b/.prettierrc
@ -1,5 +1,5 @@
 {
-  "plugins": ["prettier-plugin-go-template"],
+  "plugins": ["prettier-plugin-go-template", "prettier-plugin-tailwindcss"],
  "goTemplateBracketSpacing": true,
  "htmlWhitespaceSensitivity": "css",
  "printWidth": 100,
@ -9,7 +9,7 @@
  "trailingComma": "es5",
  "overrides": [
    {
-      "files": ["*.html"],
+      "files": ["*.html", "layouts/_default/*.json"],
      "options": {
        "parser": "go-template"
      }
--- a/assets/css/compiled/main.css
+++ b/assets/css/compiled/main.css
@ -1192,8 +1192,8 @@ body:has(#menu-controller:checked) {
 .copy-button {
  visibility: hidden;
  position: absolute;
-  top: 0px;
  right: 0px;
+  top: 0px;
  z-index: 10;
  width: 5rem;
  cursor: pointer;
--- a/assets/css/main.css
+++ b/assets/css/main.css
@ -67,7 +67,7 @@ body:has(#menu-controller:checked) {

 .toc ul,
 .toc li {
-  @apply px-0 leading-snug list-none;
+  @apply list-none px-0 leading-snug;
 }
 .toc ul ul {
  @apply ps-4;
@ -90,7 +90,7 @@ body:has(#menu-controller:checked) {
  @apply visible;
 }
 .copy-button {
-  @apply absolute top-0 right-0 z-10 invisible w-20 py-1 font-mono text-sm cursor-pointer whitespace-nowrap rounded-bl-md rounded-tr-md bg-neutral-200 text-neutral-700 opacity-90 dark:bg-neutral-600 dark:text-neutral-200;
+  @apply invisible absolute right-0 top-0 z-10 w-20 cursor-pointer whitespace-nowrap rounded-bl-md rounded-tr-md bg-neutral-200 py-1 font-mono text-sm text-neutral-700 opacity-90 dark:bg-neutral-600 dark:text-neutral-200;
 }
 .copy-button:hover,
 .copy-button:focus,
@ -122,20 +122,20 @@ code {
 /* -- Chroma Highlight -- */
 /* Background */
 .chroma {
-  @apply py-3 rounded-md bg-neutral-50 text-neutral-700 dark:bg-neutral-700 dark:text-neutral-200;
+  @apply rounded-md bg-neutral-50 py-3 text-neutral-700 dark:bg-neutral-700 dark:text-neutral-200;
 }
 .chroma pre {
-  @apply p-0 m-0;
+  @apply m-0 p-0;
 }
 /* LineTable */
 .chroma .lntable {
-  @apply block w-auto m-0 overflow-auto text-base;
+  @apply m-0 block w-auto overflow-auto text-base;
 }
 /* LineNumbersTable */
 /* LineNumbers */
 .chroma .lnt,
 .chroma .ln {
-  @apply px-2 mr-2 text-neutral-600 dark:text-neutral-300;
+  @apply mr-2 px-2 text-neutral-600 dark:text-neutral-300;
 }
 .chroma .lntd {
  @apply p-0 align-top;
@ -297,7 +297,7 @@ code {
 }
 /* CommentHashbang */
 .chroma .ch {
-  @apply italic font-semibold text-neutral-500 dark:text-neutral-400;
+  @apply font-semibold italic text-neutral-500 dark:text-neutral-400;
 }
 /* GenericEmph */
 .chroma .ge {
--- a/assets/js/menu.js
+++ b/assets/js/menu.js
@ -2,5 +2,5 @@
    Closes the hamburger menu when a link is clicked.
 */
 function close_menu() {
-    document.getElementById('menu-controller').checked=false
-}
+  document.getElementById("menu-controller").checked = false;
+}
--- a/assets/js/quicklink.js
+++ b/assets/js/quicklink.js
@ -1,4 +1,3 @@
 window.addEventListener("load", () => {
  quicklink.listen();
 });
-
--- a/assets/js/search.js
+++ b/assets/js/search.js
@ -133,6 +133,7 @@ function executeQuery(term) {
  let resultsHTML = "";

  if (results.length > 0) {
+    // prettier-ignore
    resultsHTML = results.map(function (value, key) {
      return `<li class="mb-2">
        <a class="flex items-center px-3 py-2 rounded-md appearance-none bg-neutral-100 dark:bg-neutral-700 focus:bg-primary-100 hover:bg-primary-100 dark:hover:bg-primary-900 dark:focus:bg-primary-900 focus:outline-dotted focus:outline-transparent focus:outline-2" href="${value.item.permalink}" tabindex="0">
--- a/data/sharing.json
+++ b/data/sharing.json
@ -46,7 +46,7 @@
  },
  "weibo": {
    "icon": "weibo",
-    "title":"sharing.weibo",
+    "title": "sharing.weibo",
    "url": "https://service.weibo.com/share/share.php?url=%s&appkey=&title=%s&pic=&ralateUid=&lang"
  }
 }
--- a/exampleSite/content/docs/content-examples/index.ja.md
+++ b/exampleSite/content/docs/content-examples/index.ja.md
@ -18,7 +18,7 @@ tags: ["content", "example"]

 ## ブランチページ

-Hugoのブランチページバンドルは、ホームページ、セクションリスト、Taxonomyページのような項目をカバーしています。ブランチバンドルについて覚えておくべき重要なことは、このコンテンツタイプのファイル名は **_index.md`** であるということです。
+Hugoのブランチページバンドルは、ホームページ、セクションリスト、Taxonomyページのような項目をカバーしています。ブランチバンドルについて覚えておくべき重要なことは、このコンテンツタイプのファイル名は **`_index.md`** であるということです。

 Congoはブランチページで指定されたフロントマターを尊重し、デフォルト設定を上書きします。例えば、ブランチページで `title` パラメーターを設定すると、ページタイトルを上書きすることができます。

--- a/exampleSite/content/docs/getting-started/index.ja.md
+++ b/exampleSite/content/docs/getting-started/index.ja.md
@ -100,7 +100,7 @@ Congoは、テーマ全体で使用される3色のパレットを定義して

 ## コンテンツの整理

-Congoは特定のコンテンツタイプを強制しません。そのため、自由にコンテンツを定義することができます。静的なサイトには_pages_、ブログには_posts_、ポートフォリオには_projects_がいいかもしれません。
+Congoは特定のコンテンツタイプを強制しません。そのため、自由にコンテンツを定義することができます。静的なサイトには*pages*、ブログには*posts*、ポートフォリオには*projects*がいいかもしれません。

 ### ディレクトリ構造

--- a/exampleSite/content/docs/version-2/upgrade/index.ja.md
+++ b/exampleSite/content/docs/version-2/upgrade/index.ja.md
@ -176,7 +176,7 @@ Congoでのダークモードの動作方法が変更され、より柔軟に設

 ファビコンを除くすべてのassetsが、Hugo Pipesにて最適化されるようになりました。テーマがあなたのファイルを見つけるためには、以前の `static/` から `assets/` ディレクトリに移動する必要があります。主に、著者画像とサイトロゴです:

-`static/me.jpg` **&rarr;** `assets/me.jpg`  
+`static/me.jpg` **&rarr;** `assets/me.jpg`
 `static/logo.jpg` **&rarr;** `assets/logo.jpg`

 著者画像やサイトロゴを提供した場合は、これらのアセットを `static/` から `assets/` に移動するだけです。同じディレクトリ構造を使用している場合、テーマはこれらのファイルがどこにあるかを自動的に認識します。新しいパスを指定したい場合は、 `logo` と `author.image` の設定値を適宜更新してください。
@ -195,5 +195,4 @@ Congo 2.0では `figure` ショートコードの振る舞いが変わります

 エラーに遭遇した場合は、設定が正しいことを確認し、[ドキュメント]({{<ref "docs" >}})を参照してください。テーマに同梱されている設定ファイルの例には、デフォルトのパラメーターがすべて含まれており、出発点として最適です。

-
-🙋‍♀️  それでもまだ助けが必要な場合は、[GitHub Discussions](https://github.com/jpanther/congo/discussions)で遠慮なく質問してください。
+🙋‍♀️ それでもまだ助けが必要な場合は、[GitHub Discussions](https://github.com/jpanther/congo/discussions)で遠慮なく質問してください。
--- a/exampleSite/content/samples/markdown/index.de.md
+++ b/exampleSite/content/samples/markdown/index.de.md
@ -67,7 +67,7 @@ Tabellen sind nicht Teil der Markdown-Kernspezifikation, aber Hugo unterstützt
 ### Code-Block mit backticks

 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -134,7 +134,7 @@ Tabellen sind nicht Teil der Markdown-Kernspezifikation, aber Hugo unterstützt

 ## Andere Elemente — abbr, sub, sup, kbd, mark

-<abbr title="Graphics Interchange Format">GIF</abbr>  ist ein Bitmap-Bildformat.
+<abbr title="Graphics Interchange Format">GIF</abbr> ist ein Bitmap-Bildformat.

 H<sub>2</sub>O

--- a/exampleSite/content/samples/markdown/index.es.md
+++ b/exampleSite/content/samples/markdown/index.es.md
@ -59,7 +59,7 @@ Las tablas no forman parte de la especificación principal de Markdown, pero Hug
 ### Markdown dentro de las tablas

 | Cursiva   | Negritas    | Código   |
-| --------- | ----------  | -------- |
+| --------- | ----------- | -------- |
 | _Cursiva_ | **Negrita** | `Código` |

 ## Bloques de código
@ -67,7 +67,7 @@ Las tablas no forman parte de la especificación principal de Markdown, pero Hug
 ### Bloque de código con acentos graves

 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
--- a/exampleSite/content/samples/markdown/index.ja.md
+++ b/exampleSite/content/samples/markdown/index.ja.md
@ -52,9 +52,9 @@ Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sap
 表はMarkdownのコア仕様には含まれていませんが、Hugoはサポートしています。

 | 名前  | 年齢 |
-| ----- | --- |
-| Bob   | 27  |
-| Alice | 23  |
+| ----- | ---- |
+| Bob   | 27   |
+| Alice | 23   |

 ### 表中のMarkdown

@ -67,7 +67,7 @@ Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sap
 ### Code block with backticks

 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
--- a/exampleSite/content/samples/markdown/index.md
+++ b/exampleSite/content/samples/markdown/index.md
@ -67,7 +67,7 @@ Tables aren't part of the core Markdown spec, but Hugo supports supports them ou
 ### Code block with backticks

 ```html
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
--- a/exampleSite/content/users/index.es.md
+++ b/exampleSite/content/users/index.es.md
@ -44,7 +44,7 @@ La lista a continuación es solo un puñado de sitios web creados con el tema Co
 | [medical-humanities](https://medical-humanities.org)                   | Academic site                   |
 | [boyersnet.com](https://boyersnet.com)                                 | Personal site and Blog          |
 | [major.io](https://major.io)                                           | Personal site and Blog          |
-| [顾宇的博客](https://www.guyu.me/)                                       | Personal Blog (in Chinese)      |
+| [顾宇的博客](https://www.guyu.me/)                                     | Personal Blog (in Chinese)      |
 | [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/)              | Personal site and Tech blog     |
 | [adam.sr](https://adam.sr)                                             | Personal site and Blog          |
 | [kpavlov.me](https://kpavlov.me)                                       | Personal site and Blog          |
--- a/exampleSite/content/users/index.ja.md
+++ b/exampleSite/content/users/index.ja.md
@ -44,7 +44,7 @@ Congoを使用して構築された実際のウェブサイト。
 | [medical-humanities](https://medical-humanities.org)                   | Academic site                   |
 | [boyersnet.com](https://boyersnet.com)                                 | Personal site and Blog          |
 | [major.io](https://major.io)                                           | Personal site and Blog          |
-| [顾宇的博客](https://www.guyu.me/)                                       | Personal Blog (in Chinese)      |
+| [顾宇的博客](https://www.guyu.me/)                                     | Personal Blog (in Chinese)      |
 | [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/)              | Personal site and Tech blog     |
 | [adam.sr](https://adam.sr)                                             | Personal site and Blog          |
 | [kpavlov.me](https://kpavlov.me)                                       | Personal site and Blog          |
--- a/exampleSite/content/users/index.md
+++ b/exampleSite/content/users/index.md
@ -44,7 +44,7 @@ The list below is just a handful of the websites that are built using the Congo
 | [medical-humanities](https://medical-humanities.org)                   | Academic site                   |
 | [boyersnet.com](https://boyersnet.com)                                 | Personal site and Blog          |
 | [major.io](https://major.io)                                           | Personal site and Blog          |
-| [顾宇的博客](https://www.guyu.me/)                                       | Personal Blog (in Chinese)      |
+| [顾宇的博客](https://www.guyu.me/)                                     | Personal Blog (in Chinese)      |
 | [cgutierr-zgz.github.io](https://cgutierr-zgz.github.io/)              | Personal site and Tech blog     |
 | [adam.sr](https://adam.sr)                                             | Personal site and Blog          |
 | [kpavlov.me](https://kpavlov.me)                                       | Personal site and Blog          |
--- a/exampleSite/layouts/partials/home/custom.html
+++ b/exampleSite/layouts/partials/home/custom.html
@ -5,4 +5,9 @@
 <div id="profile" class="hidden h-full">
  {{ partial "partials/home/profile.html" . }}
 </div>
-<script defer type="text/javascript" src="{{ $jsHome.RelPermalink }}" integrity="{{ $jsHome.Data.Integrity }}"></script>
+<script
+  defer
+  type="text/javascript"
+  src="{{ $jsHome.RelPermalink }}"
+  integrity="{{ $jsHome.Data.Integrity }}"
+></script>
--- a/i18n/cs.yaml
+++ b/i18n/cs.yaml
@ -53,7 +53,7 @@ sharing:
  twitter: "Tweet na Twitter"
  telegram: "Sdílejte na Telegram"
  line: "Sdílejte na LINE"
-  line: "Sdílejte na Weibo"
+  weibo: "Sdílejte na Weibo"

 shortcode:
  recent_articles: "Nedávné"
--- a/layouts/404.html
+++ b/layouts/404.html
@ -1,6 +1,6 @@
 {{ define "main" }}
  <h1 class="mb-3 text-4xl font-extrabold">{{ i18n "error.404_title" | emojify }}</h1>
-  <p class="mt-8 mb-12 text-neutral-400 dark:text-neutral-500">
+  <p class="mb-12 mt-8 text-neutral-400 dark:text-neutral-500">
    {{ i18n "error.404_error" | emojify }}
  </p>
  <div class="prose dark:prose-invert">
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@ -6,8 +6,8 @@
 {{ $file := $url.Path }}
 {{ $img := .Page.Resources.GetMatch $file }}
 {{- if and (not $img) .Page.File }}
-    {{ $path := path.Join .Page.File.Dir $file }}
-    {{ $img = resources.Get $path }}
+  {{ $path := path.Join .Page.File.Dir $file }}
+  {{ $img = resources.Get $path }}
 {{ end -}}

 {{/* https://github.com/gohugoio/hugo/pull/10666 */}}
@ -15,14 +15,14 @@
 {{- $x2Param := $params.Get "2x" -}}
 {{- $x2 := false -}}
 {{- if eq $x2Param "true" -}}
-    {{- $x2 = true  -}}
+  {{- $x2 = true -}}
 {{- end -}}

 <figure>
  {{- with $img -}}
    {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "x2" $x2) }}
  {{- else -}}
-    <img src="{{ .Destination | safeURL }}" alt="{{ $altText }}" class="{{ $class }}"/>
+    <img src="{{ .Destination | safeURL }}" alt="{{ $altText }}" class="{{ $class }}" />
  {{- end -}}
  {{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
 </figure>
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@ -14,4 +14,5 @@
    {{ end -}}
  {{ end -}}
 {{ end -}}
+<!-- prettier-ignore -->
 <a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank" rel="noreferrer"{{ end }}>{{- .Text | safeHTML -}}</a>
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -1,6 +1,6 @@
 {{- partial "partials/functions/warnings.html" .Site -}}
 {{- partial "partials/functions/init.html" . -}}
-<!DOCTYPE html>
+<!doctype html>
 <html
  lang="{{- site.Language.LanguageCode | default "" -}}"
  dir="{{- site.Language.LanguageDirection | default "ltr" -}}"
@ -10,13 +10,13 @@
 >
  {{- partial "head.html" . -}}
  <body
-    class="flex flex-col h-screen px-6 m-auto text-lg leading-7 max-w-7xl bg-neutral text-neutral-900 dark:bg-neutral-800 dark:text-neutral sm:px-14 md:px-24 lg:px-32"
+    class="m-auto flex h-screen max-w-7xl flex-col bg-neutral px-6 text-lg leading-7 text-neutral-900 sm:px-14 md:px-24 lg:px-32 dark:bg-neutral-800 dark:text-neutral"
  >
    <div id="the-top" class="absolute flex self-center">
      <a
-        class="px-3 py-1 text-sm -translate-y-8 rounded-b-lg bg-primary-200 focus:translate-y-0 dark:bg-neutral-600"
+        class="-translate-y-8 rounded-b-lg bg-primary-200 px-3 py-1 text-sm focus:translate-y-0 dark:bg-neutral-600"
        href="#main-content"
-        ><span class="font-bold pe-2 text-primary-600 dark:text-primary-400">&darr;</span
+        ><span class="pe-2 font-bold text-primary-600 dark:text-primary-400">&darr;</span
        >{{ i18n "nav.skip_to_main" }}</a
      >
    </div>
@ -26,7 +26,7 @@
    {{ else }}
      {{ partial "partials/header/basic.html" . }}
    {{ end }}
-    <div class="relative flex flex-col grow">
+    <div class="relative flex grow flex-col">
      <main id="main-content" class="grow">
        {{ block "main" . }}{{ end }}
        {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 200) }}
--- a/layouts/_default/index.json
+++ b/layouts/_default/index.json
@ -9,6 +9,7 @@
    "summary" (.Summary | emojify | safeJS)
    "content" (.Plain | emojify | safeJS)
    "permalink" .RelPermalink
-  ) -}}
+    )
+  -}}
 {{- end -}}
 {{- $index | jsonify -}}
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -20,7 +20,7 @@
        </div>
      </div>
    {{ end }}
-    <div class="min-w-0 min-h-0 max-w-prose grow">
+    <div class="min-h-0 min-w-0 max-w-prose grow">
      {{ .Content | emojify }}
    </div>
  </section>
@ -31,7 +31,7 @@
          <h2 class="mt-12 text-2xl font-bold text-neutral-700 first:mt-8 dark:text-neutral-300">
            {{ .Key }}
          </h2>
-          <hr class="border-dotted w-36 border-neutral-400" />
+          <hr class="w-36 border-dotted border-neutral-400" />
          {{ range .Pages }}
            {{ partial "article-link.html" . }}
          {{ end }}
@ -44,8 +44,8 @@
    </section>
    {{ partial "pagination.html" . }}
  {{ else }}
-    <section class="mt-10 prose dark:prose-invert">
-      <p class="py-8 border-t">
+    <section class="prose mt-10 dark:prose-invert">
+      <p class="border-t py-8">
        <em>{{ i18n "list.no_articles" | emojify }}</em>
      </p>
    </section>
--- a/layouts/_default/simple.html
+++ b/layouts/_default/simple.html
@ -8,7 +8,7 @@
        {{ .Title | emojify }}
      </h1>
    </header>
-    <section class="max-w-full mt-6 prose dark:prose-invert">
+    <section class="prose mt-6 max-w-full dark:prose-invert">
      {{ .Content | emojify }}
    </section>
    <footer class="pt-8">
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -10,21 +10,22 @@
      <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">
        {{ .Title | emojify }}
      </h1>
-      <div class="mt-8 mb-12 text-base text-neutral-500 dark:text-neutral-400 print:hidden">
+      <div class="mb-12 mt-8 text-base text-neutral-500 print:hidden dark:text-neutral-400">
        {{ partial "article-meta.html" (dict "context" . "scope" "single") }}
      </div>
+      ß
      {{ with $feature }}
        <div class="prose">
          {{ $altText := $.Params.featureAlt | default $.Params.coverAlt | default "" }}
          {{ $class := "mb-6 -mt-4 rounded-md" }}
          {{ partial "picture.html" (dict "img" . "alt" $altText "class" $class "lazy" false) }}
          {{ with $.Params.coverCaption }}
-            <figcaption class="mb-6 -mt-3 text-center">{{ . | markdownify }}</figcaption>
+            <figcaption class="-mt-3 mb-6 text-center">{{ . | markdownify }}</figcaption>
          {{ end }}
        </div>
      {{ end }}
    </header>
-    <section class="flex flex-col max-w-full mt-0 prose dark:prose-invert lg:flex-row">
+    <section class="prose mt-0 flex max-w-full flex-col dark:prose-invert lg:flex-row">
      {{ if and (.Params.showTableOfContents | default (.Site.Params.article.showTableOfContents | default false)) (in .TableOfContents "<ul") }}
        <div class="order-first px-0 lg:order-last lg:max-w-xs lg:ps-8">
          <div class="toc pe-5 print:hidden lg:sticky lg:top-10">
@ -32,11 +33,11 @@
          </div>
        </div>
      {{ end }}
-      <div class="min-w-0 min-h-0 max-w-prose grow">
+      <div class="min-h-0 min-w-0 max-w-prose grow">
        {{ .Content | emojify }}
      </div>
    </section>
-    <footer class="pt-8 max-w-prose print:hidden">
+    <footer class="max-w-prose pt-8 print:hidden">
      {{ partial "author.html" . }}
      {{ partial "sharing-links.html" . }}
      {{ partial "article-pagination.html" . }}
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@ -6,15 +6,15 @@
    <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .Title }}</h1>
  </header>
  {{ if .Content }}
-    <section class="flex flex-col max-w-full mt-0 prose dark:prose-invert lg:flex-row">
-      <div class="min-w-0 min-h-0 max-w-prose grow">
+    <section class="prose mt-0 flex max-w-full flex-col dark:prose-invert lg:flex-row">
+      <div class="min-h-0 min-w-0 max-w-prose grow">
        {{ .Content | emojify }}
      </div>
    </section>
  {{ end }}
-  <section class="flex flex-wrap -mx-2 overflow-hidden">
+  <section class="-mx-2 flex flex-wrap overflow-hidden">
    {{ range .Data.Terms }}
-      <article class="w-full px-2 my-3 overflow-hidden sm:w-1/2 md:w-1/3 lg:w-1/4 xl:w-1/5">
+      <article class="my-3 w-full overflow-hidden px-2 sm:w-1/2 md:w-1/3 lg:w-1/4 xl:w-1/5">
        <h2 class="flex items-center">
          <a
            class="text-xl font-medium decoration-primary-500 hover:underline hover:underline-offset-2"
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@ -6,8 +6,8 @@
    <h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .Title }}</h1>
  </header>
  {{ if .Content }}
-    <section class="flex flex-col max-w-full mt-0 prose dark:prose-invert lg:flex-row">
-      <div class="min-w-0 min-h-0 max-w-prose grow">
+    <section class="prose mt-0 flex max-w-full flex-col dark:prose-invert lg:flex-row">
+      <div class="min-h-0 min-w-0 max-w-prose grow">
        {{ .Content | emojify }}
      </div>
    </section>
@ -20,7 +20,7 @@
            <h2 class="mt-12 text-2xl font-bold text-neutral-700 first:mt-8 dark:text-neutral-300">
              {{ .Key }}
            </h2>
-            <hr class="border-dotted w-36 border-neutral-400" />
+            <hr class="w-36 border-dotted border-neutral-400" />
            {{ range .Pages }}
              {{ partial "article-link.html" . }}
            {{ end }}
@ -33,8 +33,8 @@
      </section>
      {{ partial "pagination.html" . }}
    {{ else }}
-      <section class="mt-10 prose dark:prose-invert">
-        <p class="py-8 border-t">
+      <section class="prose mt-10 dark:prose-invert">
+        <p class="border-t py-8">
          <em>{{ i18n "list.no_articles" | emojify }}</em>
        </p>
      </section>
--- a/layouts/partials/analytics.html
+++ b/layouts/partials/analytics.html
@ -3,10 +3,12 @@
    <script defer src="https://cdn.usefathom.com/script.js" data-site="{{ . }}"></script>
  {{ end }}
  {{ with site.Params.plausibleAnalytics.domain }}
-    <script defer
+    <script
+      defer
      data-domain="{{ . }}"
      data-api="{{ default "https://plausible.io/api/event" site.Params.plausibleAnalytics.event }}"
-      src="{{ default "https://plausible.io/js/script.js" site.Params.plausibleAnalytics.script }}"></script>
+      src="{{ default "https://plausible.io/js/script.js" site.Params.plausibleAnalytics.script }}"
+    ></script>
  {{ end }}
  {{ template "_internal/google_analytics.html" . }}
-{{ end }}
+{{ end }}
--- a/layouts/partials/article-link.html
+++ b/layouts/partials/article-link.html
@ -21,9 +21,7 @@
            class="w-24 rounded-md sm:w-40" srcset="
            {{- (.Fill "160x120 smart").RelPermalink }}
            160w, {{- (.Fill "320x240 smart").RelPermalink }} 2x"
-            src="{{ (.Fill "160x120 smart").RelPermalink }}"
-            width="160"
-            height="120"
+            src="{{ (.Fill "160x120 smart").RelPermalink }}" width="160" height="120"
          {{ end }}
          {{ if $.Site.Params.enableImageLazyLoading | default true }}
            loading="lazy"
--- a/layouts/partials/article-meta.html
+++ b/layouts/partials/article-meta.html
@ -50,7 +50,7 @@
    (and (ne $scope "single") (.Params.showTaxonomies | default (.Site.Params.list.showTaxonomies | default (.Site.Params.article.showTaxonomies | default false))))
    (and (eq $scope "single") (.Params.showTaxonomies | default (.Site.Params.article.showTaxonomies | default false)))
  }}
-    <div class="flex flex-wrap my-1 text-xs leading-relaxed text-neutral-500 dark:text-neutral-400 ">
+    <div class="my-1 flex flex-wrap text-xs leading-relaxed text-neutral-500 dark:text-neutral-400">
      {{ range $taxonomy, $terms := .Site.Taxonomies }}
        {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }}
          {{ range $context.GetTerms $taxonomy }}
--- a/layouts/partials/breadcrumbs.html
+++ b/layouts/partials/breadcrumbs.html
@ -1,4 +1,4 @@
-<ol class="text-sm text-neutral-500 dark:text-neutral-400 print:hidden">
+<ol class="text-sm text-neutral-500 print:hidden dark:text-neutral-400">
  {{ template "crumb" (dict "p1" . "p2" .) }}
 </ol>
 {{ define "crumb" }}
@ -7,9 +7,9 @@
  {{ else if not .p1.IsHome }}
    {{ template "crumb" (dict "p1" .p1.Site.Home "p2" .p2 ) }}
  {{ end }}
-  <li class="inline {{ if or (eq .p1 .p2) (.p1.IsHome) }}hidden{{ end }}">
+  <li class="{{ if or (eq .p1 .p2) (.p1.IsHome) }}hidden{{ end }} inline">
    <a
-      class="hover:underline decoration-neutral-300 dark:underline-neutral-600"
+      class="dark:underline-neutral-600 decoration-neutral-300 hover:underline"
      href="{{ .p1.RelPermalink }}"
      >{{ if .p1.Title }}
        {{- .p1.Title -}}
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -2,12 +2,12 @@
  {{/* Footer menu */}}
  {{ if .Site.Menus.footer }}
    <nav class="pb-4 text-base font-medium text-neutral-500 dark:text-neutral-400">
-      <ul class="flex flex-col list-none sm:flex-row">
+      <ul class="flex list-none flex-col sm:flex-row">
        {{ range .Site.Menus.footer }}
          {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
            {{ continue }}
          {{ end }}
-          <li class="mb-1 group text-end sm:mb-0 sm:me-7 sm:last:me-0">
+          <li class="group mb-1 text-end 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 }}
@ -17,7 +17,7 @@
                >
                  {{ with .Params.icon }}
                    <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                    >
                      {{- partial "icon.html" . -}}
                    </span>
@ -37,13 +37,13 @@
                aria-label="appearance switcher"
              >
                <span
-                  class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                  class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                  title="{{ i18n "footer.dark_appearance" }}"
                >
                  {{ partial "icon.html" "moon" }}
                </span>
                <span
-                  class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                  class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                  title="{{ i18n "footer.light_appearance" }}"
                >
                  {{ partial "icon.html" "sun" }}
@ -59,7 +59,7 @@
                {{ with .Params.target }}target="{{ . }}"{{ end }}
                >{{ with .Params.icon }}
                  <span
-                    class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                    class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                  >
                    {{- partial "icon.html" . -}}
                  </span>
@ -117,13 +117,13 @@
        >
          <button id="appearance-switcher-0" type="button" aria-label="appearance switcher">
            <div
-              class="flex items-center justify-center w-12 h-12 dark:hidden"
+              class="flex h-12 w-12 items-center justify-center dark:hidden"
              title="{{ i18n "footer.dark_appearance" }}"
            >
              {{ partial "icon.html" "moon" }}
            </div>
            <div
-              class="items-center justify-center hidden w-12 h-12 dark:flex"
+              class="hidden h-12 w-12 items-center justify-center dark:flex"
              title="{{ i18n "footer.light_appearance" }}"
            >
              {{ partial "icon.html" "sun" }}
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@ -1,4 +1,4 @@
-<header class="py-6 font-semibold text-neutral-900 dark:text-neutral print:hidden sm:py-10">
+<header class="py-6 font-semibold text-neutral-900 print:hidden sm:py-10 dark:text-neutral">
  <nav class="flex items-start justify-between sm:items-center">
    {{/* Site logo/title */}}
    <div class="flex flex-row items-center">
@ -6,7 +6,7 @@
    </div>
    {{/* Main menu */}}
    {{ if or .Site.Menus.main (.Site.Params.enableSearch | default false) }}
-      <ul class="flex flex-col list-none text-end sm:flex-row">
+      <ul class="flex list-none flex-col 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)) }}
@ -22,7 +22,7 @@
                  >
                    {{ with .Params.icon | default "search" }}
                      <span
-                        class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                        class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                      >
                        {{- partial "icon.html" . -}}
                      </span>
@ -42,7 +42,7 @@
                  aria-label="appearance switcher"
                >
                  <span
-                    class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                    class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                    title="{{ i18n "footer.dark_appearance" }}"
                  >
                    {{ with .Params.icon | default "moon" }}
@ -56,7 +56,7 @@
                    {{ end }}
                  </span>
                  <span
-                    class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                    class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                    title="{{ i18n "footer.light_appearance" }}"
                  >
                    {{ with .Params.icon | default "sun" }}
@ -80,7 +80,7 @@
                  {{ with .Params.target }}target="{{ . }}"{{ end }}
                  >{{ with .Params.icon }}
                    <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                    >
                      {{- partial "icon.html" . -}}
                    </span>
@ -95,10 +95,10 @@
            </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">
+            <li class="group mb-1 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"
+                  class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                >
                  {{ partial "icon.html" "search" }}
                </span>
--- a/layouts/partials/header/hamburger.html
+++ b/layouts/partials/header/hamburger.html
@ -1,4 +1,4 @@
-<header class="py-6 font-semibold text-neutral-900 dark:text-neutral print:hidden sm:py-10">
+<header class="py-6 font-semibold text-neutral-900 print:hidden sm:py-10 dark:text-neutral">
  <nav class="flex items-start justify-between sm:items-center">
    {{/* Site logo/title */}}
    <div class="z-40 flex flex-row items-center">
@ -13,10 +13,10 @@
        </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"
+          class="invisible fixed inset-0 z-30 m-auto h-full w-full cursor-default overflow-auto bg-neutral-100/50 opacity-0 backdrop-blur-sm transition-opacity 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"
+            class="mx-auto flex w-full max-w-7xl list-none flex-col overflow-visible px-6 py-6 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"
@ -28,7 +28,7 @@
                {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
                  {{ continue }}
                {{ end }}
-                <li class="mb-1 group">
+                <li class="group mb-1">
                  {{ if eq .Params.action "search" }}
                    {{ $.Scratch.Add "searchCount" 1 }}
                    {{ if $.Site.Params.enableSearch | default false }}
@ -38,7 +38,7 @@
                      >
                        {{ with .Params.icon | default "search" }}
                          <span
-                            class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                            class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                          >
                            {{- partial "icon.html" . -}}
                          </span>
@ -58,7 +58,7 @@
                      aria-label="appearance switcher"
                    >
                      <span
-                        class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                        class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                        title="{{ i18n "footer.dark_appearance" }}"
                      >
                        {{ with .Params.icon | default "moon" }}
@ -72,7 +72,7 @@
                        {{ end }}
                      </span>
                      <span
-                        class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                        class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                        title="{{ i18n "footer.light_appearance" }}"
                      >
                        {{ with .Params.icon | default "sun" }}
@ -97,7 +97,7 @@
                      {{ with .Params.target }}target="{{ . }}"{{ end }}
                      >{{ with .Params.icon }}
                        <span
-                          class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                          class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                        >
                          {{- partial "icon.html" . -}}
                        </span>
@ -112,10 +112,10 @@
                </li>
              {{ end }}
              {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-                <li class="mb-1 group">
+                <li class="group mb-1">
                  <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"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                    >
                      {{ partial "icon.html" "search" }}
                    </span>
--- a/layouts/partials/header/hybrid.html
+++ b/layouts/partials/header/hybrid.html
@ -1,4 +1,4 @@
-<header class="py-6 font-semibold text-neutral-900 dark:text-neutral print:hidden sm:py-10">
+<header class="py-6 font-semibold text-neutral-900 print:hidden sm:py-10 dark:text-neutral">
  <nav class="flex items-start justify-between sm:items-center">
    {{/* Site logo/title */}}
    <div class="z-40 flex flex-row items-center">
@ -13,10 +13,10 @@
        </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"
+          class="invisible fixed inset-0 z-30 m-auto h-full w-full cursor-default overflow-auto bg-neutral-100/50 opacity-0 backdrop-blur-sm transition-opacity 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"
+            class="mx-auto flex w-full max-w-7xl list-none flex-col overflow-visible px-6 py-6 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"
@ -28,7 +28,7 @@
                {{ if and (eq .Params.action "locale") (or (not page.IsTranslated) (not site.IsMultiLingual)) }}
                  {{ continue }}
                {{ end }}
-                <li class="mb-1 group">
+                <li class="group mb-1">
                  {{ if eq .Params.action "search" }}
                    {{ $.Scratch.Add "searchCount" 1 }}
                    {{ if $.Site.Params.enableSearch | default false }}
@ -38,7 +38,7 @@
                      >
                        {{ with .Params.icon | default "search" }}
                          <span
-                            class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                            class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                          >
                            {{- partial "icon.html" . -}}
                          </span>
@ -58,7 +58,7 @@
                      aria-label="appearance switcher"
                    >
                      <span
-                        class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                        class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                        title="{{ i18n "footer.dark_appearance" }}"
                      >
                        {{ with .Params.icon | default "moon" }}
@ -72,7 +72,7 @@
                        {{ end }}
                      </span>
                      <span
-                        class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                        class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                        title="{{ i18n "footer.light_appearance" }}"
                      >
                        {{ with .Params.icon | default "sun" }}
@ -97,7 +97,7 @@
                      {{ with .Params.target }}target="{{ . }}"{{ end }}
                      >{{ with .Params.icon }}
                        <span
-                          class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                          class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                        >
                          {{- partial "icon.html" . -}}
                        </span>
@ -112,10 +112,10 @@
                </li>
              {{ end }}
              {{ if and ($.Site.Params.enableSearch | default false) (eq ($.Scratch.Get "searchCount") 0) }}
-                <li class="mb-1 group">
+                <li class="group mb-1">
                  <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"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                    >
                      {{ partial "icon.html" "search" }}
                    </span>
@ -127,13 +127,13 @@
        </div>
      </label>
      {{/* Basic menu */}}
-      <ul class="flex-row hidden list-none text-end sm:flex">
+      <ul class="hidden list-none flex-row 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">
+            <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 }}
@ -143,7 +143,7 @@
                  >
                    {{ with .Params.icon | default "search" }}
                      <span
-                        class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                        class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                      >
                        {{- partial "icon.html" . -}}
                      </span>
@ -163,7 +163,7 @@
                  aria-label="appearance switcher"
                >
                  <span
-                    class="inline transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:hidden"
+                    class="group-dark:hover:text-primary-400 inline transition-colors group-hover:text-primary-600 dark:hidden"
                    title="{{ i18n "footer.dark_appearance" }}"
                  >
                    {{ with .Params.icon | default "moon" }}
@ -177,7 +177,7 @@
                    {{ end }}
                  </span>
                  <span
-                    class="hidden transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600 dark:inline"
+                    class="group-dark:hover:text-primary-400 hidden transition-colors group-hover:text-primary-600 dark:inline"
                    title="{{ i18n "footer.light_appearance" }}"
                  >
                    {{ with .Params.icon | default "sun" }}
@ -201,7 +201,7 @@
                  {{ with .Params.target }}target="{{ . }}"{{ end }}
                  >{{ with .Params.icon }}
                    <span
-                      class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+                      class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                    >
                      {{- partial "icon.html" . -}}
                    </span>
@ -216,10 +216,10 @@
            </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">
+            <li class="group mb-1 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"
+                  class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                >
                  {{ partial "icon.html" "search" }}
                </span>
--- a/layouts/partials/home/page.html
+++ b/layouts/partials/home/page.html
@ -1,4 +1,4 @@
-<article class="max-w-full prose dark:prose-invert">
+<article class="prose max-w-full dark:prose-invert">
  {{ with .Title }}
    <header>
      <h1>{{ . | emojify }}</h1>
--- a/layouts/partials/icon.html
+++ b/layouts/partials/icon.html
@ -1,6 +1,6 @@
 {{- $icon := resources.Get (print "icons/" . ".svg") -}}
 {{- if $icon -}}
-  <span class="relative inline-block align-text-bottom px-1 icon">
+  <span class="icon relative inline-block px-1 align-text-bottom">
    {{- $icon.Content | safeHTML -}}
  </span>
 {{- end -}}
--- a/layouts/partials/logo.html
+++ b/layouts/partials/logo.html
@ -3,22 +3,24 @@
  {{- $logo_dark := resources.Get .Site.Params.header.logoDark }}
  {{- if $logo }}
    <a href="{{ "" | relLangURL }}" class="mr-2">
+      <!-- prettier-ignore-attribute -->
      <img
        src="{{ $logo.RelPermalink }}"
        width="{{ div $logo.Width 2 }}"
        height="{{ div $logo.Height 2 }}"
-        class="max-h-[10rem] max-w-[10rem] object-scale-down object-left{{ if $logo_dark }} hidden dark:flex{{ end }}"
+        class="max-h-[10rem] max-w-[10rem] object-scale-down object-left
+        {{ if $logo_dark }}hidden dark:flex{{ end }}"
        alt="{{ .Site.Title }}"
      />
      {{- if $logo_dark }}
-      <img
-        src="{{ $logo_dark.RelPermalink }}"
-        width="{{ div $logo_dark.Width 2 }}"
-        height="{{ div $logo_dark.Height 2 }}"
-        class="max-h-[10rem] max-w-[10rem] object-scale-down object-left dark:hidden"
-        alt="{{ .Site.Title }}"
-      />
-      {{- end}}
+        <img
+          src="{{ $logo_dark.RelPermalink }}"
+          width="{{ div $logo_dark.Width 2 }}"
+          height="{{ div $logo_dark.Height 2 }}"
+          class="max-h-[10rem] max-w-[10rem] object-scale-down object-left dark:hidden"
+          alt="{{ .Site.Title }}"
+        />
+      {{- end }}
    </a>
  {{- end }}
 {{- end }}
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@ -4,8 +4,7 @@
  {{- if gt .TotalPages 1 }}
    {{- $start := math.Max 1 (sub .PageNumber $width) }}
    {{- $end := math.Min .TotalPages (add $start (mul $width 2)) }}
-
-    <ul class="flex flex-row mt-8">
+    <ul class="mt-8 flex flex-row">
      {{- with .Prev }}
        <li>
          <a
@ -18,7 +17,6 @@
          </a>
        </li>
      {{- end }}
-
      {{- with .First }}
        {{- if gt $currentPageNumber (add 1 $width) }}
          <li class="mx-1 min-w-[1.8rem] text-center">
@ -35,14 +33,13 @@
          {{- end }}
        {{- end }}
      {{- end }}
-
      {{- range $i := seq $start $end }}
        <li class="mx-1 min-w-[1.8rem] text-center">
          {{- if eq $.Paginator.PageNumber $i }}
            <span
              aria-current="page"
              aria-label="Page {{ $i }}"
-              class="block font-semibold rounded bg-primary-200 text-primary-700 dark:bg-primary-400 dark:text-neutral-800"
+              class="block rounded bg-primary-200 font-semibold text-primary-700 dark:bg-primary-400 dark:text-neutral-800"
            >
              {{ $i }}
            </span>
@ -57,7 +54,6 @@
          {{- end }}
        </li>
      {{- end }}
-
      {{- with .Last }}
        {{- if and (lt $currentPageNumber (sub .TotalPages $width)) (lt $end .TotalPages) }}
          {{- if lt $currentPageNumber (sub .TotalPages (add $width 1)) }}
@ -74,7 +70,6 @@
          </li>
        {{- end }}
      {{- end }}
-
      {{- with .Next }}
        <li>
          <a
--- a/layouts/partials/picture.html
+++ b/layouts/partials/picture.html
@ -8,8 +8,8 @@

 {{ with $img }}
  {{ if (eq .MediaType.SubType "svg") }}
-    {{ $width := ""}}
-    {{ $height := ""}}
+    {{ $width := "" }}
+    {{ $height := "" }}
    {{ $svgContent := .Content }}
    {{ range (findRESubmatch `<svg[^>]*width=["']([.0-9]*)["'a-zA-Z]` $svgContent 1) }}
      {{ $width = index . 1 }}
@ -28,39 +28,39 @@
      {{/* do not use lazy without dimensions */}}
      {{ $lazy = false }}
    {{ end }}
+    <!-- prettier-ignore -->
    <picture {{ with $class }} class="{{ . }}" {{ end }}>
      <img
        src="{{ .RelPermalink }}"
-        {{ with $width }} width="{{ . }}" {{ end }}
-        {{ with $height }} height="{{ . }}" {{ end }}
-        {{ with $class }} class="{{ . }}" {{ end }}
-        {{ with $alt }} alt="{{ . }}" {{ end }}
-        {{ with $lazy }} loading="lazy" decoding="async" {{ end }}
-      >
+        {{ with $width }}width="{{ . }}"{{ end }}
+        {{ with $height }}height="{{ . }}"{{ end }}
+        {{ with $class }}class="{{ . }}"{{ end }}
+        {{ with $alt }}alt="{{ . }}"{{ end }}
+        {{ with $lazy }}loading="lazy" decoding="async"{{ end }}
+      />
    </picture>
  {{ else }}
-    <picture 
-      {{ with $class }} class="{{ . }}" {{ end }}
+    <picture
+      {{ with $class }}class="{{ . }}"{{ end }}
      {{ if $lqip }}
        {{ $bg := (.Resize "20x webp q20").Content | base64Encode }}
        style="background-image:url(data:image/webp;base64,{{ $bg }});background-size:cover"
      {{ end }}
    >
-    {{ $width := .Width }}
-    {{ $height := .Height }}
-    {{ if $x2 }}
-      {{ $width = div .Width 2 }}
-      {{ $height = div .Height 2 }}
-    {{ end }}
-    {{ if $webp }}
-      <source 
-        {{ if lt .Width 660 }}
-          {{ with .Resize (printf "%dx%d webp" .Width .Height) }}
-            src="{{ .RelPermalink }}"
-          {{ end }}
-        {{ else }}
-          srcset="
-            {{- (.Resize "330x webp").RelPermalink }} 330w,
+      {{ $width := .Width }}
+      {{ $height := .Height }}
+      {{ if $x2 }}
+        {{ $width = div .Width 2 }}
+        {{ $height = div .Height 2 }}
+      {{ end }}
+      {{ if $webp }}
+        <source
+          {{ if lt .Width 660 }}
+            {{ with .Resize (printf "%dx%d webp" .Width .Height) }}
+              src="{{ .RelPermalink }}"
+            {{ end }}
+          {{ else }}
+            srcset=" {{- (.Resize "330x webp").RelPermalink }} 330w,
            {{- (.Resize "660x webp").RelPermalink }} 660w
            {{ if gt .Width 1024 }}
              ,{{ (.Resize "1024x webp").RelPermalink }} 1024w
@ -76,24 +76,24 @@
                ,{{ .RelPermalink }} {{ .Width }}w
              {{ end }}
            {{ end }}"
-          src="{{ (.Resize "660x webp").RelPermalink }}" 
-        {{ end }}
-        type="image/webp" 
-      />
-    {{ end }}
+            src="{{ (.Resize "660x webp").RelPermalink }}"
+          {{ end }}
+          type="image/webp"
+        />
+      {{ end }}
      <img
        src="{{ .RelPermalink }}"
        width="{{ $width }}"
        height="{{ $height }}"
-        {{ with $class }} class="{{ . }}" {{ end }}
-        {{ with $alt }} alt="{{ . }}" {{ end }}
-        {{ with $lazy }} loading="lazy" decoding="async" {{ end }}
+        {{ with $class }}class="{{ . }}"{{ end }}
+        {{ with $alt }}alt="{{ . }}"{{ end }}
+        {{ with $lazy }}loading="lazy" decoding="async"{{ end }}
        {{ if lt .Width 660 }}
          src="{{ .RelPermalink }}"
        {{ else }}
-          srcset="
-          {{- (.Resize "330x").RelPermalink }} 330w,
-          {{- (.Resize "660x").RelPermalink }} 660w
+          srcset=" {{- (.Resize "330x").RelPermalink }} 330w,
+          {{- (.Resize "660x").RelPermalink }}
+          660w
          {{ if gt .Width 1024 }}
            ,{{ (.Resize "1024x").RelPermalink }} 1024w
          {{ else }}
@ -106,7 +106,7 @@
          {{ end }}"
          src="{{ (.Resize "660x").RelPermalink }}"
        {{ end }}
-      >
+      />
    </picture>
  {{ end }}
-{{ end }}
+{{ end }}
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@ -1,34 +1,34 @@
 <div
  id="search-wrapper"
-  class="invisible fixed inset-0 z-50 flex h-screen w-screen cursor-default flex-col bg-neutral-500/50 p-4 backdrop-blur-sm dark:bg-neutral-900/50 sm:p-6 md:p-[10vh] lg:p-[12vh]"
+  class="invisible fixed inset-0 z-50 flex h-screen w-screen cursor-default flex-col bg-neutral-500/50 p-4 backdrop-blur-sm sm:p-6 md:p-[10vh] lg:p-[12vh] dark:bg-neutral-900/50"
  data-url="{{ "" | absLangURL }}"
 >
  <div
    id="search-modal"
-    class="flex flex-col w-full max-w-3xl min-h-0 mx-auto border rounded-md shadow-lg top-20 border-neutral-200 bg-neutral dark:border-neutral-700 dark:bg-neutral-800"
+    class="top-20 mx-auto flex min-h-0 w-full max-w-3xl flex-col rounded-md border border-neutral-200 bg-neutral shadow-lg dark:border-neutral-700 dark:bg-neutral-800"
  >
-    <header class="relative z-10 flex items-center justify-between flex-none px-2">
-      <form class="flex items-center flex-auto min-w-0">
-        <div class="flex items-center justify-center w-8 h-8 text-neutral-400">
+    <header class="relative z-10 flex flex-none items-center justify-between px-2">
+      <form class="flex min-w-0 flex-auto items-center">
+        <div class="flex h-8 w-8 items-center justify-center text-neutral-400">
          {{ partial "icon.html" "search" }}
        </div>
        <input
          type="search"
          id="search-query"
-          class="flex flex-auto h-12 mx-1 bg-transparent appearance-none focus:outline-dotted focus:outline-2 focus:outline-transparent"
+          class="mx-1 flex h-12 flex-auto appearance-none bg-transparent focus:outline-dotted focus:outline-2 focus:outline-transparent"
          placeholder="{{ i18n "search.input_placeholder" }}"
          tabindex="0"
        />
      </form>
      <button
        id="close-search-button"
-        class="flex items-center justify-center w-8 h-8 text-neutral-700 hover:text-primary-600 dark:text-neutral dark:hover:text-primary-400"
+        class="flex h-8 w-8 items-center justify-center text-neutral-700 hover:text-primary-600 dark:text-neutral dark:hover:text-primary-400"
        title="{{ i18n "search.close_button_title" }}"
      >
        {{ partial "icon.html" "xmark" }}
      </button>
    </header>
-    <section class="flex-auto px-2 overflow-auto">
+    <section class="flex-auto overflow-auto px-2">
      <ul id="search-results">
        <!-- <li class="mb-2">
          <a class="flex items-center px-3 py-2 rounded-md appearance-none bg-neutral-100 dark:bg-neutral-700 focus:bg-primary-100 hover:bg-primary-100 dark:hover:bg-primary-900 dark:focus:bg-primary-900 focus:outline-dotted focus:outline-transparent focus:outline-2" href="${value.item.permalink}" tabindex="0">
--- a/layouts/partials/toc.html
+++ b/layouts/partials/toc.html
@ -1,6 +1,6 @@
 <details open class="-ms-5 mt-0 overflow-hidden rounded-lg ps-5">
  <summary
-    class="-ms-5 block cursor-pointer bg-neutral-100 py-1 ps-5 text-lg font-semibold text-neutral-800 dark:bg-neutral-700 dark:text-neutral-100 lg:hidden"
+    class="-ms-5 block cursor-pointer bg-neutral-100 py-1 ps-5 text-lg font-semibold text-neutral-800 lg:hidden dark:bg-neutral-700 dark:text-neutral-100"
  >
    {{ i18n "article.table_of_contents" }}
  </summary>
--- a/layouts/partials/translations.html
+++ b/layouts/partials/translations.html
@ -10,9 +10,9 @@
  {{ if .IsTranslated }}
    {{ $currentLang := .Page.Lang }}
    {{ if site.IsMultiLingual }}
-      <div class="relative group">
+      <div class="group relative">
        <button
-          class="flex items-center justify-end w-full transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
+          class="group-dark:hover:text-primary-400 flex w-full items-center justify-end transition-colors group-hover:text-primary-600"
        >
          {{ partial "icon.html" "translate" }}<span class="text-sm">{{ .Lang | upper }}</span
          ><span class="text-[0.6rem]"
@ -20,10 +20,10 @@
          >
        </button>
        {{ if eq $dir "down" }}
-          <div class="invisible w-full h-2 bg-transparent group-hover:visible"></div>
+          <div class="invisible h-2 w-full bg-transparent group-hover:visible"></div>
        {{ end }}
        <div
-          class="{{ cond (eq $dir "down") "top-8" "bottom-7" }} invisible absolute ltr:right-0 rtl:left-0 z-50 flex flex-col whitespace-nowrap rounded border border-neutral-300 bg-neutral text-start text-base shadow group-hover:visible dark:border-neutral-600 dark:bg-neutral-800"
+          class="{{ cond (eq $dir "down") "top-8" "bottom-7" }} invisible absolute z-50 flex flex-col whitespace-nowrap rounded border border-neutral-300 bg-neutral text-start text-base shadow group-hover:visible ltr:right-0 rtl:left-0 dark:border-neutral-600 dark:bg-neutral-800"
        >
          {{ $siteLanguages := site.Languages }}
          {{ $pageLang := .Page.Lang }}
@ -36,9 +36,9 @@
                  {{ if eq $pageLang .Lang }}
                    <a
                      href="{{ $translation.RelPermalink }}"
-                      class="flex items-center justify-between w-full px-2 py-1 bg-primary-100 dark:bg-primary-900"
+                      class="flex w-full items-center justify-between bg-primary-100 px-2 py-1 dark:bg-primary-900"
                      >{{ .LanguageName }}<span
-                        class="w-6 ms-2 text-primary-600 dark:text-primary-400"
+                        class="ms-2 w-6 text-primary-600 dark:text-primary-400"
                        >{{ partial "icon.html" "check" }}</span
                      ></a
                    >
--- a/layouts/partials/vendor.html
+++ b/layouts/partials/vendor.html
@ -4,7 +4,12 @@
  {{ $mermaidConfig := resources.Get "js/mermaid.js" }}
  {{ $mermaidConfig := $mermaidConfig | resources.Minify }}
  {{ $mermaidJS := slice $mermaidLib $mermaidConfig | resources.Concat "js/mermaid.bundle.js" | resources.Fingerprint "sha512" }}
-  <script defer type="text/javascript" src="{{ $mermaidJS.RelPermalink }}" integrity="{{ $mermaidJS.Data.Integrity }}"></script>
+  <script
+    defer
+    type="text/javascript"
+    src="{{ $mermaidJS.RelPermalink }}"
+    integrity="{{ $mermaidJS.Data.Integrity }}"
+  ></script>
 {{ end }}
 {{/* Chart */}}
 {{ if .Page.HasShortcode "chart" }}
@ -12,23 +17,38 @@
  {{ $chartConfig := resources.Get "js/chart.js" }}
  {{ $chartConfig := $chartConfig | resources.Minify }}
  {{ $chartJS := slice $chartLib $chartConfig | resources.Concat "js/chart.bundle.js" | resources.Fingerprint "sha512" }}
-  <script defer type="text/javascript" src="{{ $chartJS.RelPermalink }}" integrity="{{ $chartJS.Data.Integrity }}"></script>
+  <script
+    defer
+    type="text/javascript"
+    src="{{ $chartJS.RelPermalink }}"
+    integrity="{{ $chartJS.Data.Integrity }}"
+  ></script>
 {{ end }}
 {{/* Katex */}}
 {{ if .Page.HasShortcode "katex" }}
  {{ $katexCSS := resources.Get "lib/katex/katex.min.css" }}
  {{ $katexCSS := $katexCSS | resources.Fingerprint "sha512" }}
  <link
-    type="text/css" rel="stylesheet"
+    type="text/css"
+    rel="stylesheet"
    href="{{ $katexCSS.RelPermalink }}"
    integrity="{{ $katexCSS.Data.Integrity }}"
  />
  {{ $katexJS := resources.Get "lib/katex/katex.min.js" }}
  {{ $katexJS := $katexJS | resources.Fingerprint "sha512" }}
-  <script defer src="{{ $katexJS.RelPermalink }}" integrity="{{ $katexJS.Data.Integrity }}"></script>
+  <script
+    defer
+    src="{{ $katexJS.RelPermalink }}"
+    integrity="{{ $katexJS.Data.Integrity }}"
+  ></script>
  {{ $katexRenderJS := resources.Get "lib/katex/auto-render.min.js" }}
  {{ $katexRenderJS := $katexRenderJS | resources.Fingerprint "sha512" }}
-  <script defer src="{{ $katexRenderJS.RelPermalink }}" integrity="{{ $katexRenderJS.Data.Integrity }}" onload="renderMathInElement(document.body);"></script>
+  <script
+    defer
+    src="{{ $katexRenderJS.RelPermalink }}"
+    integrity="{{ $katexRenderJS.Data.Integrity }}"
+    onload="renderMathInElement(document.body);"
+  ></script>
  {{ $katexFonts := resources.Match "lib/katex/fonts/*" }}
  {{ range $katexFonts }}
    {{ .Publish }}
--- a/layouts/shortcodes/alert.html
+++ b/layouts/shortcodes/alert.html
@ -1,4 +1,4 @@
-<div class="flex px-4 py-3 rounded-md bg-primary-100 dark:bg-primary-900">
+<div class="flex rounded-md bg-primary-100 px-4 py-3 dark:bg-primary-900">
  <span class="pe-3 text-primary-400">
    {{ partial "icon.html" (.Get 0 | default "triangle-exclamation") }}
  </span>
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@ -14,6 +14,7 @@
    {{ $img = resources.Get $path }}
  {{ end -}}

+  <!-- prettier-ignore -->
  <figure{{ with $class }} class="{{ . }}"{{ end }}>
    {{ with $href }}<a href="{{ . }}">{{ end }}

--- a/layouts/shortcodes/icon.html
+++ b/layouts/shortcodes/icon.html
@ -1,6 +1,6 @@
 {{ $icon := resources.Get (printf "icons/%s.svg" ($.Get 0)) }}
 {{ if $icon }}
-  <span class="relative inline-block align-text-bottom icon">
+  <span class="icon relative inline-block align-text-bottom">
    {{ $icon.Content | safeHTML }}
  </span>
 {{ else }}
--- a/layouts/shortcodes/screenshot.html
+++ b/layouts/shortcodes/screenshot.html
@ -1,5 +1,6 @@
 {{ if .Get "src" }}
  {{ $image := .Page.Resources.GetMatch (printf "*%s*" (.Get "src")) }}
+  <!-- prettier-ignore -->
  <figure{{ with .Get "class" }} class="{{ . }}"{{ end }}>
    {{- if .Get "href" -}}
      <a href="{{ .Get "href" }}">
--- a/static/site.webmanifest
+++ b/static/site.webmanifest
@ -1 +1,21 @@
-{"name":"Congo","short_name":"Congo","icons":[{"src": "/android-chrome-192x192.png","sizes": "192x192","type": "image/png","purpose": "any maskable"},{"src": "/android-chrome-512x512.png","sizes": "512x512","type": "image/png","purpose": "any maskable"}],"theme_color":"#ffffff","background_color":"#7c3aed","display":"standalone"}
+{
+  "name": "Congo",
+  "short_name": "Congo",
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "any maskable"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#7c3aed",
+  "display": "standalone"
+}
Author	SHA1	Message	Date
Wen Junhua	a7fa3be37d	Merge branch 'dev' into feat/add-icon-script	2023-12-26 17:19:40 +09:00
James Panther	68ce84075e	🎨 Tailwind classes cleanup	2023-12-26 11:56:32 +11:00
James Panther	6415614513	🎨 Code cleanup	2023-12-26 11:22:55 +11:00