♻️ synced branch to dev and fixed conflicts

layouts/_default/baseof.html

@@ -26,13 +26,7 @@
     <main id="main-content" class="grow">
       {{ block "main" . }}{{ end }}
       {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 1) }}
-      <div class="pointer-events-none absolute top-[100vh] bottom-0 w-12 ltr:right-0 rtl:left-0">
-        <a href="#the-top"
-          class="pointer-events-auto sticky top-[calc(100vh-5.5rem)] flex h-12 w-12 mb-16 items-center justify-center rounded-full bg-neutral/50 text-xl text-neutral-700 backdrop-blur hover:text-primary-600 dark:bg-neutral-800/50 dark:text-neutral dark:hover:text-primary-400"
-          aria-label="{{ i18n " nav.scroll_to_top_title" }}" title="{{ i18n " nav.scroll_to_top_title" }}">
-          &uarr;
-        </a>
-      </div>
+      {{- partial "scroll-to-top.html" . -}}
       {{ end }}
     </main>
     {{- partial "footer.html" . -}}

layouts/_default/single.html

@@ -3,13 +3,15 @@
 
 <article>
   {{ if .Params.showHero | default (.Site.Params.article.showHero | default false) }}
-  {{ $heroStyle := print "partials/hero/" .Site.Params.article.heroStyle ".html" }}
-  {{ if templates.Exists $heroStyle }}
-  {{ partial $heroStyle . }}
-  {{ else }}
-  {{ partial "partials/hero/basic.html" . }}
+    {{ $heroStyle := .Params.heroStyle }}
+    {{ if not $heroStyle }}{{ $heroStyle = .Site.Params.article.heroStyle }}{{ end }} 
+    {{ $heroStyle := print "partials/hero/" $heroStyle ".html" }}
+    {{ if templates.Exists $heroStyle }}
+      {{ partial $heroStyle . }}
+    {{ else }}
+      {{ partial "partials/hero/basic.html" . }}
+    {{ end }}
   {{ end }}
-  {{- end -}}
   
   <header id="single_header" class="mt-5 max-w-prose">
     {{ if .Params.showBreadcrumbs | default (.Site.Params.article.showBreadcrumbs | default false) }}

layouts/partials/article-link/card.html

@@ -1,3 +1,4 @@
+{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }}
 {{ with .Params.externalUrl }}
 <a href="{{ . }}" target="_blank" rel="external" class="min-w-full">
   {{ else }}
@@ -13,8 +14,14 @@
       {{- $featured := $images.GetMatch "*feature*" -}}
       {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
       {{- with $featured -}}
-      {{ with .Fill "600x600" }}
-      <div class="w-full thumbnail_card nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+      {{ if $disableImageOptimization }}
+        {{ with . }}
+        <div class="w-full thumbnail_card nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
+      {{ else }}
+        {{ with .Fill "600x600"  }}
+        <div class="w-full thumbnail_card nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
       {{ end }}
       {{- else -}}
       {{- with $.Site.Params.images }}

layouts/partials/article-link/simple.html

@@ -1,3 +1,5 @@
+{{ $constrainItemsWidth := .Page.Site.Params.list.constrainItemsWidth | default false }}
+
 {{ $articleClasses := "flex flex-wrap article" }}
 {{ if .Site.Params.list.showCards }}
 {{ $articleClasses = delimit (slice $articleClasses "border border-neutral-200 dark:border-neutral-700 border-2 rounded-md backdrop-blur") " " }}
@@ -12,6 +14,8 @@
 {{ $articleImageClasses = delimit (slice $articleImageClasses "thumbnailshadow md:mr-7") " " }}
 {{ end }}
 
+{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }}
+
 {{ $articleInnerClasses := "" }}
 {{ if .Site.Params.list.showCards }}
 {{ $articleInnerClasses = delimit (slice $articleInnerClasses "p-4") " " }}
@@ -19,6 +23,11 @@
 {{ $articleInnerClasses = delimit (slice $articleInnerClasses "mt-3 md:mt-0") " " }}
 {{ end }}
 
+{{ if $constrainItemsWidth }}
+{{ $articleClasses = delimit (slice $articleClasses "max-w-prose") " " }}
+{{ end }}
+
+
 {{ with .Params.externalUrl }}
 <a class="{{ $articleClasses }}" href="{{ . }}" target="_blank" rel="external">
   {{ else }}
@@ -32,9 +41,15 @@
     {{- $featured := $images.GetMatch "*feature*" -}}
     {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
     {{- with $featured -}}
-    {{ with .Fill "600x400" }}
-    <div class="{{ $articleImageClasses }}" style="background-image:url({{ .RelPermalink }});"></div>
-    {{ end }}
+    {{ if $disableImageOptimization }}
+        {{ with . }}
+        <div class="{{ $articleImageClasses }}" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
+      {{ else }}
+        {{ with .Fill "600x400"  }}
+        <div class="{{ $articleImageClasses }}" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
+      {{ end }}
     {{- else -}}
     {{- with $.Site.Params.images }}
     <meta property="og:image" content="{{ index . 0 | absURL }}" />{{ end -}}
@@ -72,7 +87,7 @@
         {{ partial "article-meta/basic.html" . }}
       </div>
       {{ if .Params.showSummary | default (.Site.Params.list.showSummary | default false) }}
-      <div class="py-1 prose dark:prose-invert">
+      <div class="py-1 max-w-fit prose dark:prose-invert">
         {{ .Summary | emojify }}
       </div>
       {{ end }}

layouts/partials/header/basic.html

@@ -1,5 +1,5 @@
-<div style="padding-left:0;padding-right:0"
-    class="site-header flex items-center justify-between px-4 py-6 sm:px-6 md:justify-start space-x-3">
+<div style="padding-left:0;padding-right:0;padding-top:2px;padding-bottom:3px"
+    class="flex items-center justify-between px-4 py-6 sm:px-6 md:justify-start space-x-3">
     {{ if .Site.Params.Logo -}}
     {{ $logo := resources.Get .Site.Params.Logo }}
     {{ if $logo }}
@@ -91,12 +91,12 @@
             <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
                 {{ partial "icon.html" "bars" }}
             </div>
-            <div id="menu-wrapper" style="padding-top:25px;"
+            <div id="menu-wrapper" style="padding-top:5px;"
                 class="fixed inset-0 z-30 invisible w-screen h-screen 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 movedown flex-col w-full px-6 py-6 mx-auto overflow-visible list-none ltr:text-right rtl:text-left max-w-7xl sm:px-14 md:px-24 lg:px-32 sm:py-10 sm:pt-10">
                     <li class="mb-1">
-                        <span class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">{{ partial
+                        <span class="cursor-pointer inline-block align-text-bottom hover:text-primary-600 dark:hover:text-primary-400">{{ partial
                             "icon.html"
                             "xmark" }}</span>
                     </li>

layouts/partials/hero/background.html

@@ -1,3 +1,5 @@
+{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }}
+
 {{- $images := .Resources.ByType "image" -}}
 {{- $featured := $images.GetMatch "*background*" -}}
 {{- if not $featured }}{{ $featured = $images.GetMatch "*feature*" }}{{ end -}}
@@ -13,16 +15,25 @@
         (and ($.Site.Params.list.layoutBackgroundHeaderSpace | default true) ($isParentList))
     ) }}
 {{- with $featured -}}
-{{ with .Resize "1200x" }}
 {{ if $shouldAddHeaderSpace | default true}}
 <div id="hero" class="h-[150px] md:h-[200px]"></div>
 {{ end }}
-<div class="fixed inset-x-0 top-0 h-[800px] single_hero_background nozoom"
+{{ if $disableImageOptimization }}
+    {{ with . }}
+    <div class="fixed inset-x-0 top-0 h-[800px] single_hero_background nozoom"
     style="background-image:url({{ .RelPermalink }});">
+    {{ end }}
+{{ else }}
+    {{ with .Resize "1200x" }}
+    <div class="fixed inset-x-0 top-0 h-[800px] single_hero_background nozoom"
+    style="background-image:url({{ .RelPermalink }});">
+    {{ end }}
+{{ end }}
+
     <div class="absolute inset-0 bg-gradient-to-t from-neutral dark:from-neutral-800 to-transparent mix-blend-normal">
     </div>
     <div
-        class="absolute inset-0 opacity-30 dark:opacity-60 bg-gradient-to-t from-neutral dark:from-neutral-800 to-neutral dark:to-neutral-800 mix-blend-normal">
+        class="absolute inset-0 opacity-70 bg-gradient-to-t from-neutral dark:from-neutral-800 to-neutral dark:to-neutral-800 mix-blend-normal">
     </div>
 </div>
 {{ if $shouldBlur | default false }}
@@ -35,5 +46,4 @@
     });
 </script>
 {{ end }}
-{{ end }}
 {{- end -}}

layouts/partials/hero/basic.html

@@ -1,8 +1,16 @@
+{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }}
+
 {{- $images := .Resources.ByType "image" -}}
 {{- $featured := $images.GetMatch "*feature*" -}}
 {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
 {{- with $featured -}}
-    {{ with .Resize "1200x" }}
-        <div class="w-full h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+    {{ if $disableImageOptimization }}
+        {{ with . }}
+            <div class="w-full h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
+    {{ else }}
+        {{ with .Resize "1200x" }}
+            <div class="w-full h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
     {{ end }}
 {{- end -}}

layouts/partials/hero/big.html

@@ -1,8 +1,16 @@
+{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }}
+
 {{- $images := .Resources.ByType "image" -}}
 {{- $featured := $images.GetMatch "*feature*" -}}
 {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
 {{- with $featured -}}
-    {{ with .Resize "1200x" }}
+    {{ if $disableImageOptimization }}
+        {{ with . }}
         <img class="w-full rounded-lg single_hero_round nozoom" src="{{ .RelPermalink }}">
+        {{ end }}
+    {{ else }}
+        {{ with .Resize "1200x" }}
+        <img class="w-full rounded-lg single_hero_round nozoom" src="{{ .RelPermalink }}">
+        {{ end }}
     {{ end }}
 {{- end -}}

layouts/partials/hero/thumbAndBackground.html

@@ -1,3 +1,5 @@
+{{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }}
+
 {{- $images := .Resources.ByType "image" -}}
 {{- $background := $images.GetMatch "*background*" -}}
 {{- if not $background }}{{ with .Site.Params.defaultBackgroundImage }}{{ $background = resources.Get . }}{{ end }}{{ end -}}
@@ -14,12 +16,30 @@
     ) }}
 
 {{- with $featured -}}
+{{ if $disableImageOptimization }}
+{{ with . }}
+<div class="w-full rounded-md h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+{{ end }}
+{{ else }}
 {{ with .Resize "1200x" }}
 <div class="w-full rounded-md h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
 {{ end }}
+{{ end }}
 {{- end -}}
 
 {{- with $background -}}
+
+{{ if $disableImageOptimization }}
+{{ with . }}
+<div class="fixed inset-x-0 top-0 h-[800px] single_hero_background nozoom"
+    style="background-image:url({{ .RelPermalink }});">
+    <div class="absolute inset-0 bg-gradient-to-t from-neutral dark:from-neutral-800 to-transparent mix-blend-normal">
+    </div>
+    <div
+        class="absolute inset-0 opacity-30 dark:opacity-60 bg-gradient-to-t from-neutral dark:from-neutral-800 to-neutral dark:to-neutral-800 mix-blend-normal">
+    </div>
+</div>{{ end }}
+{{ else }}
 {{ with .Resize "1200x" }}
 <div class="fixed inset-x-0 top-0 h-[800px] single_hero_background nozoom"
     style="background-image:url({{ .RelPermalink }});">
@@ -28,8 +48,9 @@
     <div
         class="absolute inset-0 opacity-30 dark:opacity-60 bg-gradient-to-t from-neutral dark:from-neutral-800 to-neutral dark:to-neutral-800 mix-blend-normal">
     </div>
-</div>
+</div>{{ end }}
 {{ end }}
+
 {{- end -}}
 
 {{ if $shouldBlur | default false }}

layouts/partials/home/hero.html

@@ -44,7 +44,7 @@
                         </div>
                         {{ end }}
                     </div>
-                    <section class="prose text-neutral-200">{{ .Content | emojify }}</section>
+                    <section class="prose dark:prose-invert">{{ .Content | emojify }}</section>
                 </div>
             </div>
         </div>

layouts/partials/scroll-to-top.html

@@ -0,0 +1,7 @@
+<div class="pointer-events-none absolute top-[100vh] bottom-0 w-12 ltr:right-0 rtl:left-0">
+  <a href="#the-top"
+    class="pointer-events-auto sticky top-[calc(100vh-5.5rem)] flex h-12 w-12 mb-16 items-center justify-center rounded-full bg-neutral/50 text-xl text-neutral-700 backdrop-blur hover:text-primary-600 dark:bg-neutral-800/50 dark:text-neutral dark:hover:text-primary-400"
+    aria-label="{{ i18n "nav.scroll_to_top_title" }}" title="{{ i18n "nav.scroll_to_top_title" }}">
+    &uarr;
+  </a>
+</div>

layouts/partials/term-link/card.html

@@ -2,6 +2,8 @@
   <div
     class="border border-neutral-200 dark:border-neutral-700 border-2 rounded overflow-hidden shadow-2xl relative backdrop-blur">
 
+    {{ $disableImageOptimization := .Page.Site.Params.disableImageOptimization | default false }}
+
     {{- with site.Params.images -}}
     {{- range first 6 . }}
     <meta property="og:image" content="{{ . | absURL }}" />{{ end -}}
@@ -10,9 +12,15 @@
     {{- $featured := $images.GetMatch "*feature*" -}}
     {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
     {{- with $featured -}}
-    {{ with .Fill "600x600" }}
-    <div class="w-full thumbnail_card_term nozoom" style="background-image:url({{ .RelPermalink }});"></div>
-    {{ end }}
+    {{ if $disableImageOptimization }}
+        {{ with . }}
+        <div class="w-full thumbnail_card nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
+      {{ else }}
+        {{ with .Fill "600x600"  }}
+        <div class="w-full thumbnail_card nozoom" style="background-image:url({{ .RelPermalink }});"></div>
+        {{ end }}
+      {{ end }}
     {{- else -}}
     {{- with site.Params.images }}
     <meta property="og:image" content="{{ index . 0 | absURL }}" />{{ end -}}

layouts/partials/vendor.html

@@ -1,41 +1,45 @@
 {{/* Mermaid */}}
 {{ if .Page.HasShortcode "mermaid" }}
-  {{ $mermaidLib := resources.Get "lib/mermaid/mermaid.min.js" }}
-  {{ $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>
+{{ $mermaidLib := resources.Get "lib/mermaid/mermaid.min.js" }}
+{{ $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>
 {{ end }}
+
 {{/* Chart */}}
 {{ if .Page.HasShortcode "chart" }}
-  {{ $chartLib := resources.Get "lib/chart/chart.min.js" }}
-  {{ $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>
+{{ $chartLib := resources.Get "lib/chart/chart.min.js" }}
+{{ $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>
 {{ 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"
-    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>
-  {{ $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>
-  {{ $katexFonts := resources.Match "lib/katex/fonts/*" }}
-  {{ range $katexFonts }}
-    <!-- {{ .RelPermalink }} -->
-  {{ end }}
-  {{/* TypeIt */}}
-  {{ if .Page.HasShortcode "typeit" }}
-    {{ $typeitLib := resources.Get "lib/typeit/typeit.umd.js" }}
-    <script defer type="text/javascript" src="{{ $typeitLib.RelPermalink }}" integrity="{{ $typeitLib.Data.Integrity }}"></script>
-  {{ end }}
+{{ $katexCSS := resources.Get "lib/katex/katex.min.css" }}
+{{ $katexCSS := $katexCSS | resources.Fingerprint "sha512" }}
+<link 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>
+{{ $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>
+{{ $katexFonts := resources.Match "lib/katex/fonts/*" }}
+{{ range $katexFonts }}
+<!-- {{ .RelPermalink }} -->
 {{ end }}
+{{ end }}
+
+{{/* TypeIt */}}
+{{ if .Page.HasShortcode "typeit" }}
+{{ $typeitLib := resources.Get "lib/typeit/typeit.umd.js" }}
+<script defer src="{{ $typeitLib.RelPermalink }}" integrity="{{ $typeitLib.Data.Integrity }}"
+  onload="renderTypeItElements();"></script>
+{{ end }}

layouts/shortcodes/lead.html

@@ -1,3 +1,3 @@
-<div class="lead !mb-9 text-xl">
+<div class="lead text-neutral-500 dark:text-neutral-400 !mb-9 text-xl">
   {{ .Inner | markdownify }}
 </div>