🎨 Code cleanup

2026-07-20 18:01:36 -04:00 · 2023-12-26 11:22:55 +11:00
parent 4c8e536b64
commit 6415614513
33 changed files with 154 additions and 102 deletions
@@ -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 }}
@@ -1,4 +1,4 @@
-<article class="mt-6 flex max-w-prose flex-row">
+<article class="flex flex-row mt-6 max-w-prose">
  {{- $images := $.Resources.ByType "image" }}
  {{- $thumbnail := $images.GetMatch (.Params.thumbnail | default "*thumb*") }}
  {{- $feature := $images.GetMatch (.Params.feature | default "*feature*") | default $thumbnail }}
@@ -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"
@@ -44,7 +42,7 @@
            >{{ $.Title | emojify }}</a
          >
          <span
-            class="cursor-default align-top text-xs text-neutral-400 dark:text-neutral-500"
+            class="text-xs align-top cursor-default text-neutral-400 dark:text-neutral-500"
            title="{{ i18n "list.externalurl_title" }}"
          >
            <span class="rtl:hidden">&#8599;</span>
@@ -71,7 +69,7 @@
      {{ partial "article-meta.html" . }}
    </div>
    {{ if .Params.showSummary | default (.Site.Params.list.showSummary | default false) }}
-      <div class="prose py-1 dark:prose-invert">
+      <div class="py-1 prose dark:prose-invert">
        {{ .Summary | emojify }}
      </div>
    {{ end }}
@@ -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="flex flex-wrap my-1 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 }}
@@ -7,18 +7,19 @@
        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 }}
@@ -4,7 +4,6 @@
  {{- 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">
      {{- with .Prev }}
        <li>
@@ -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,7 +33,6 @@
          {{- end }}
        {{- end }}
      {{- end }}
-
      {{- range $i := seq $start $end }}
        <li class="mx-1 min-w-[1.8rem] text-center">
          {{- if eq $.Paginator.PageNumber $i }}
@@ -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
@@ -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 }}
@@ -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 }}