Merge remote-tracking branch 'origin/main' into jupyter

2025-07-16 03:51:43 -04:00 · 2024-09-03 21:53:35 +01:00
parent 4d03e35bf2 c6de4b5b6b
commit e094e30384
85 changed files with 3616 additions and 1291 deletions
--- a/layouts/shortcodes/callout.html
+++ b/layouts/shortcodes/callout.html
@ -31,7 +31,7 @@

  <div class="hx-w-full hx-min-w-0 hx-leading-7">
    <div class="hx-mt-6 hx-leading-7 first:hx-mt-0">
-      {{ .Inner | markdownify }}
+      {{ .InnerDeindent | markdownify }}
    </div>
  </div>
 </div>
--- a/layouts/shortcodes/card.html
+++ b/layouts/shortcodes/card.html
@ -7,6 +7,8 @@
 {{- $width := 0 -}}
 {{- $height := 0 -}}
 {{- $imageStyle := .Get "imageStyle" -}}
+{{- $tag := .Get "tag" -}}
+{{- $tagType := .Get "tagType" -}}

 {{/* Image processing options */}}
 {{- $method := .Get "method" | default "Resize" | humanize -}}
@ -38,45 +40,17 @@
  {{- end -}}
 {{- end -}}

-{{ $linkClass := "hover:hx-border-gray-300 hx-bg-transparent hx-shadow-sm dark:hx-border-neutral-800 hover:hx-bg-slate-50 hover:hx-shadow-md dark:hover:hx-border-neutral-700 dark:hover:hx-bg-neutral-900" }}
-{{- with $image -}}
-  {{ $linkClass = "hover:hx-border-gray-300 hx-bg-gray-100 hx-shadow dark:hx-border-neutral-700 dark:hx-bg-neutral-800 dark:hx-text-gray-50 hover:hx-shadow-lg dark:hover:hx-border-neutral-500 dark:hover:hx-bg-neutral-700" }}
-{{- end -}}
-
-{{- $external := strings.HasPrefix $link "http" -}}
-{{- $href := cond (strings.HasPrefix $link "/") ($link | relURL) $link -}}
-
-
-<a
-  class="hextra-card hx-group hx-flex hx-flex-col hx-justify-start hx-overflow-hidden hx-rounded-lg hx-border hx-border-gray-200 hx-text-current hx-no-underline dark:hx-shadow-none hover:hx-shadow-gray-100 dark:hover:hx-shadow-none hx-shadow-gray-100 active:hx-shadow-sm active:hx-shadow-gray-200 hx-transition-all hx-duration-200 {{ $linkClass }}"
-  {{- if $link -}}
-    href="{{ $href }}" {{ with $external }}target="_blank" rel="noreferrer"{{ end -}}
-  {{- end -}}
->
-  {{- with $image -}}
-    <img
-      alt="{{ $title }}"
-      loading="lazy"
-      decoding="async"
-      src="{{ $image | safeURL }}"
-      {{ with $width }}width="{{ . }}"{{ end }}
-      {{ with $height }}height="{{ . }}"{{ end }}
-      {{ with $imageStyle }}style="{{ . | safeCSS }}"{{ end }}
-    />
-  {{- end -}}
-
-  {{- $padding := "hx-p-4" -}}
-  {{- with $subtitle -}}
-    {{- $padding = "hx-pt-4 hx-px-4" -}}
-  {{- end -}}
-
-
-  <span class="hx-flex hx-font-semibold hx-items-start hx-gap-2 {{ $padding }} hx-text-gray-700 hover:hx-text-gray-900 dark:hx-text-neutral-200 dark:hover:hx-text-neutral-50">
-    {{- with $icon }}{{ partial "utils/icon.html" (dict "name" $icon) -}}{{- end -}}
-    {{- $title -}}
-  </span>
-  {{- with $subtitle -}}
-    <div class="hx-line-clamp-3 hx-text-sm hx-font-normal hx-text-gray-500 dark:hx-text-gray-400 hx-px-4 hx-mb-4 hx-mt-2">{{- $subtitle | markdownify -}}</div>
-  {{- end -}}
-</a>
-{{- /* Strip trailing newline. */ -}}
+{{- partial "shortcodes/card" (dict
+  "page"        .Page
+  "link"        $link
+  "title"       $title
+  "icon"        $icon
+  "subtitle"    $subtitle
+  "image"       $image
+  "width"       $width
+  "height"      $height
+  "imageStyle"  $imageStyle
+  "tag"         $tag
+  "tagType"     $tagType
+  )
+-}}
--- a/layouts/shortcodes/cards.html
+++ b/layouts/shortcodes/cards.html
@ -1,5 +1,5 @@
-{{ $rows := .Get "rows" | default "3" }}
+{{- $cols := .Get "cols" | default 3 -}}

-<div class="hextra-cards hx-mt-4 hx-gap-4 hx-grid not-prose" style="--rows: {{ $rows }};">
+<div class="hextra-cards hx-mt-4 hx-gap-4 hx-grid not-prose" style="--hextra-cards-grid-cols: {{ $cols }};">
  {{- .Inner -}}
 </div>
--- a/layouts/shortcodes/hextra/feature-grid.html
+++ b/layouts/shortcodes/hextra/feature-grid.html
@ -1,9 +1,12 @@
-{{- $style := .Get "style" -}}
+{{- $cols := .Get "cols" | default 3 -}}
+{{- $style := .Get "style" | default "" -}}
+
+{{- $css := printf "--hextra-feature-grid-cols: %v; %s" $cols $style -}}


 <div
-  class="hx-grid sm:hx-grid-cols-2 lg:hx-grid-cols-3 hx-grid-cols-1 hx-gap-4 hx-w-full not-prose"
-  {{ with $style }}style="{{ . | safeCSS }}"{{ end }}
+  class="hextra-feature-grid hx-grid sm:max-lg:hx-grid-cols-2 max-sm:hx-grid-cols-1 hx-gap-4 hx-w-full not-prose"
+  {{ with $css }}style="{{ . | safeCSS }}"{{ end }}
 >
  {{ .Inner }}
 </div>
--- a/layouts/shortcodes/hextra/hero-container.html
+++ b/layouts/shortcodes/hextra/hero-container.html
@ -0,0 +1,38 @@
+{{- $class := .Get "class" -}}
+{{- $cols := .Get "cols" | default 2 -}}
+{{- $image := .Get "image" -}}
+{{- $imageCard := .Get "imageCard" | default false -}}
+{{- $imageClass := .Get "imageClass" -}}
+{{- $imageLink := .Get "imageLink" -}}
+{{- $imageLinkExternal := hasPrefix $imageLink "http" -}}
+{{- $imageStyle := .Get "imageStyle" -}}
+{{- $imageTitle := .Get "imageTitle" -}}
+{{- $imageWidth := .Get "imageWidth" | default 350 -}}
+{{- $imageHeight := .Get "imageHeight" | default 350 -}}
+{{- $style := .Get "style" -}}
+
+{{- $css := printf "--hextra-feature-grid-cols: %v; %s" $cols $style -}}
+{{- $href := cond (hasPrefix $imageLink "/") ($imageLink | relURL) $imageLink -}}
+{{- if hasPrefix $image "/" -}}
+  {{- $image = relURL (strings.TrimPrefix "/" $image) -}}
+{{- end -}}
+
+<div
+  class="{{ $class }} hextra-feature-grid hx-grid sm:max-lg:hx-grid-cols-2 max-sm:hx-grid-cols-1 hx-gap-4 hx-w-full not-prose"
+  {{ with $css }}style="{{ . | safeCSS }}"{{ end }}
+>
+  <div class="hx-w-full">
+    {{ .Inner }}
+  </div>
+  {{- with $image }}
+  <div class="hx-mx-auto">
+    <a
+      {{ with $imageLink }}href="{{ $href }}" {{ with $imageLinkExternal }} target="_blank" rel="noreferrer"{{ end }}{{ end }}
+      {{ with $imageStyle }}style="{{ . | safeCSS }}"{{ end }}
+      class="{{ $imageClass }} {{ if $imageCard }}hextra-feature-card not-prose hx-block hx-relative hx-p-6 hx-overflow-hidden hx-rounded-3xl hx-border hx-border-gray-200 hover:hx-border-gray-300 dark:hx-border-neutral-800 dark:hover:hx-border-neutral-700 before:hx-pointer-events-none before:hx-absolute before:hx-inset-0 before:hx-bg-glass-gradient{{ end }}"
+    >
+      <img src="{{ $image }}" width="{{ $imageWidth }}" height="{{ $imageHeight }}" {{ with $imageTitle }}alt="{{ $imageTitle }}"{{ end }}/>
+    </a>
+  </div>
+  {{ end -}}
+</div>
--- a/layouts/shortcodes/pdf.html
+++ b/layouts/shortcodes/pdf.html
@ -0,0 +1,9 @@
+{{/* Shortcode to include a PDF file in a page. */}}
+
+{{- $path := .Get 0 -}}
+{{- $url := partial "utils/file-path" (dict "page" .Page "path" $path) -}}
+
+
+<div class="hextra-pdf">
+  <iframe src="{{ $url | safeURL }}" width="100%" style="min-height: 32rem;" frameborder="0"></iframe>
+</div>
--- a/layouts/shortcodes/tab.html
+++ b/layouts/shortcodes/tab.html
@ -1,11 +1,12 @@
 {{- $defaultIndex := int ((.Parent.Get "defaultIndex") | default "0") -}}

 <div
-  class="tabs-panel hx-rounded hx-pt-6 hx-hidden data-[state=selected]:hx-block"
+  class="hextra-tabs-panel hx-rounded hx-pt-6 hx-hidden data-[state=selected]:hx-block"
  id="tabs-panel-{{ .Ordinal }}"
  role="tabpanel"
-  {{ if eq .Ordinal $defaultIndex }}tabindex="0"{{ end }}
-  {{ if eq .Ordinal $defaultIndex }}data-state="selected"{{ end }}
+  {{- if eq .Ordinal $defaultIndex }} tabindex="0" {{ end -}}
+  {{- if eq .Ordinal $defaultIndex }} data-state="selected" {{ end -}}
 >
-  {{ .InnerDeindent | markdownify }}
+  {{- .InnerDeindent | markdownify -}}
 </div>
+{{- /* Drop trailing newlines */ -}}
--- a/layouts/shortcodes/tabs.html
+++ b/layouts/shortcodes/tabs.html
@ -5,22 +5,24 @@
  {{ errorf "no items provided" }}
 {{- end -}}

-
-<div class="hx-mt-4 hx-flex hx-w-max hx-min-w-full hx-border-b hx-border-gray-200 hx-pb-px dark:hx-border-neutral-800">
-  {{- range $i, $item := $items -}}
-    <button
-      class="tabs-toggle data-[state=selected]:hx-border-primary-500 data-[state=selected]:hx-text-primary-600 hx-mr-2 hx-rounded-t hx-p-2 hx-font-medium hx-leading-5 hx-transition-colors -hx-mb-0.5 hx-select-none hx-border-b-2 hx-border-transparent hx-text-gray-600 hover:hx-border-gray-200 hover:hx-text-black dark:hx-text-gray-200 dark:hover:hx-border-neutral-800 dark:hover:hx-text-white"
-      role="tab"
-      type="button"
-      aria-controls="tabs-panel-{{ $i }}"
-      {{ if eq $i $defaultIndex }}aria-selected="true"{{ end }}
-      {{ if eq $i $defaultIndex }}tabindex="0"{{ end }}
-      {{ if eq $i $defaultIndex }}data-state="selected"{{ end }}
-    >
-      {{- $item -}}
-    </button>
-  {{- end -}}
+<div class="hextra-scrollbar hx-overflow-x-auto hx-overflow-y-hidden hx-overscroll-x-contain">
+  <div class="hx-mt-4 hx-flex hx-w-max hx-min-w-full hx-border-b hx-border-gray-200 hx-pb-px dark:hx-border-neutral-800">
+    {{- range $i, $item := $items -}}
+      <button
+        class="hextra-tabs-toggle data-[state=selected]:hx-border-primary-500 data-[state=selected]:hx-text-primary-600 hx-mr-2 hx-rounded-t hx-p-2 hx-font-medium hx-leading-5 hx-transition-colors -hx-mb-0.5 hx-select-none hx-border-b-2 hx-border-transparent hx-text-gray-600 hover:hx-border-gray-200 hover:hx-text-black dark:hx-text-gray-200 dark:hover:hx-border-neutral-800 dark:hover:hx-text-white"
+        role="tab"
+        type="button"
+        aria-controls="tabs-panel-{{ $i }}"
+        {{- if eq $i $defaultIndex }} aria-selected="true" {{ end -}}
+        {{- if eq $i $defaultIndex }} tabindex="0" {{ end -}}
+        {{- if eq $i $defaultIndex }} data-state="selected"{{ end -}}
+      >
+        {{- $item -}}
+      </button>
+    {{- end -}}
+  </div>
 </div>
 <div>
-  {{ .Inner }}
+  {{- .Inner -}}
 </div>
+{{- /* Drop trailing newlines */ -}}