Merge 368c20e935 into de9f9b312e

assets/css/compiled/main.css

@@ -1176,9 +1176,6 @@ video {
 .hx-text-4xl {
   font-size: 2.25rem;
 }
-.hx-text-\[\.65rem\] {
-  font-size: .65rem;
-}
 .hx-text-\[10px\] {
   font-size: 10px;
 }
@@ -2272,6 +2269,7 @@ article details > summary::before {
   top: 5px;
   right: 5px;
   z-index: 10;
+  font-size: .65rem;
 }
 .steps h3 {
   counter-increment: step;
@@ -2596,10 +2594,6 @@ nav .search-wrapper {
   overflow: auto;
   font-size: .75rem;
 }
-.hextra-badge {
-  display: inline-flex;
-  align-items: center;
-}
 html {
   font-size: 1rem;
   -webkit-font-smoothing: antialiased;

assets/css/components/badge.css

@@ -1,3 +0,0 @@
-.hextra-badge {
-  @apply hx-inline-flex hx-items-center;
-}

assets/css/components/cards.css

@@ -38,4 +38,5 @@
   top: 5px;
   right: 5px;
   z-index: 10;
+  font-size: .65rem;
 }

assets/css/styles.css

@@ -11,7 +11,6 @@
 @import "components/code-copy.css";
 @import "components/hextra/feature-grid.css";
 @import "components/jupyter.css";
-@import "components/badge.css";
 
 html {
   @apply hx-text-base hx-antialiased;

exampleSite/content/docs/guide/configuration.md

@@ -186,10 +186,10 @@ To customize the [favicon](https://en.wikipedia.org/wiki/Favicon) for your site,
   {{< /filetree/folder >}}
 {{< /filetree/container >}}
 
-Include `favicon.ico`, `favicon.svg` and `favicon-dark.svg` files in your project to ensure your site's favicons display correctly.
+Include both `favicon.ico` and `favicon.svg` files in your project to ensure your site's favicons display correctly.
 
-While `favicon.ico` is generally for older browsers, `favicon.svg` and `favicon-dark.svg` are supported by modern browsers.
-Use tools like [favicon.io](https://favicon.io/) or [favycon](https://github.com/ruisaraiva19/favycon) to generate such icons.
+While `favicon.ico` is generally for older browsers, `favicon.svg` is supported by modern ones. The optional `favicon-dark.svg` can be included for a tailored experience in dark mode.
+Feel free to use tools like [favicon.io](https://favicon.io/) or [favycon](https://github.com/ruisaraiva19/favycon) to generate these icons.
 
 ### Theme Configuration
 

exampleSite/content/docs/guide/shortcodes/cards.md

@@ -22,7 +22,7 @@ linkTitle: Cards
 ```
 {{</* cards */>}}
   {{</* card link="../callout" title="Callout" icon="warning" */>}}
-  {{</* card link="../callout" title="Card with tag" icon="tag" tag= "A custom tag" */>}}
+  {{</* card link="../callout" title="Card with tag" icon="warning" tag= "A custom tag" */>}}
   {{</* card link="/" title="No Icon" */>}}
 {{</* /cards */>}}
 ```

exampleSite/content/docs/guide/shortcodes/others.md

@@ -10,41 +10,6 @@ sidebar:
   These shortcodes are considered less stable and may be changed anytime.
 {{< /callout >}}
 
-## Badge
-
-```
-{{</* badge "Badge" */>}}
-```
-
-Result:
-
-{{< badge "Badge" >}}
-
-Variants:
-
-```
-{{</* badge content="info" type="info" */>}}
-{{</* badge content="warning" type="warning" */>}}
-{{</* badge content="error" type="error" */>}}
-```
-
-Result:
-
-{{< badge content="info" type="info" >}} &nbsp;
-{{< badge content="warning" type="warning" >}} &nbsp;
-{{< badge content="error" type="error" >}}
-
-With link:
-
-```
-{{</* badge content="Releases" link="https://github.com/imfing/hextra/releases" */>}}
-```
-
-Result:
-
-{{< badge content="Releases" link="https://github.com/imfing/hextra/releases" >}}
-
-
 ## YouTube
 
 Embed a YouTube video.

exampleSite/hugo_stats.json

@@ -209,7 +209,6 @@
       "group-hover:hx-underline",
       "group-open:before:hx-rotate-90",
       "hamburger-menu",
-      "hextra-badge",
       "hextra-card",
       "hextra-card-icon",
       "hextra-card-image",
@@ -465,7 +464,6 @@
       "hx-sticky",
       "hx-text-2xl",
       "hx-text-4xl",
-      "hx-text-[.65rem]",
       "hx-text-[10px]",
       "hx-text-[color:hsl(var(--primary-hue),100%,50%)]",
       "hx-text-base",
@@ -490,6 +488,7 @@
       "hx-text-white",
       "hx-text-xl",
       "hx-text-xs",
+      "hx-text-xxs",
       "hx-text-yellow-900",
       "hx-to-gray-600",
       "hx-top-0",

layouts/partials/head-css.html

@@ -1,6 +1,6 @@
 {{- if and (not hugo.IsProduction) (eq hugo.Environment "theme") }}
   {{- $styles := resources.Get "css/styles.css" }}
-  {{- $styles = $styles | postCSS (dict "inlineImports" true) }}
+  {{- $styles = $styles | resources.PostCSS (dict "inlineImports" true) }}
   <link href="{{ $styles.RelPermalink }}" rel="stylesheet" />
 {{- else }}
   {{- $styles := resources.Get "css/compiled/main.css" -}}

layouts/partials/shortcodes/badge.html

@@ -1,16 +0,0 @@
-{{- $content := .content -}}
-{{- $type := .type -}}
-{{- $class := .class | default "" -}}
-{{- $border := .border | default false -}}
-
-{{- $defaultClass := "hx-text-gray-600 hx-bg-gray-100 dark:hx-bg-neutral-800 dark:hx-text-neutral-200 hx-border-gray-200 dark:hx-border-neutral-700" -}}
-{{- $warningClass := "hx-border-yellow-100 hx-bg-yellow-50 hx-text-yellow-900 dark:hx-border-yellow-200/30 dark:hx-bg-yellow-700/30 dark:hx-text-yellow-200" -}}
-{{- $infoClass := "hx-border-blue-200 hx-bg-blue-100 hx-text-blue-900 dark:hx-border-blue-200/30 dark:hx-bg-blue-900/30 dark:hx-text-blue-200" -}}
-{{- $errorClass := "hx-border-red-200 hx-bg-red-100 hx-text-red-900 dark:hx-border-red-200/30 dark:hx-bg-red-900/30 dark:hx-text-red-200" -}}
-
-{{- $borderClass := cond (eq $border true) "hx-border" "" -}}
-{{- $badgeClass := cond (eq $type "info") $infoClass (cond (eq $type "warning") $warningClass (cond (eq $type "error") $errorClass $defaultClass)) -}}
-<div class="hextra-badge {{ $class }}">
-  <div class="hx-inline-flex hx-items-center hx-rounded-full hx-px-2.5 hx-leading-6 hx-text-[.65rem] {{ $borderClass }} {{ $badgeClass }}">{{- $content -}}</div>
-</div>
-{{- /* Strip trailing newline. */ -}}

layouts/partials/shortcodes/card.html

@@ -54,13 +54,15 @@
   {{- end -}}
 
   {{- if $tag }}
-    {{- partial "shortcodes/badge.html" (dict
-      "content" $tag
-      "type" $tagType
-      "class" "hextra-card-tag"
-      "border" true
-      )
-    -}}
+    {{ $defaultClass := "hx-text-gray-600 hx-text-xxs hx-bg-gray-100 dark:hx-bg-neutral-800 dark:hx-text-neutral-200" }}
+    {{ $warningClass := "hx-border-yellow-100 hx-bg-yellow-50 hx-text-yellow-900 dark:hx-border-yellow-200/30 dark:hx-bg-yellow-700/30 dark:hx-text-yellow-200" }}
+    {{ $infoClass := "hx-border-blue-200 hx-bg-blue-100 hx-text-blue-900 dark:hx-border-blue-200/30 dark:hx-bg-blue-900/30 dark:hx-text-blue-200" }}
+    {{ $errorClass := "hx-border-red-200 hx-bg-red-100 hx-text-red-900 dark:hx-border-red-200/30 dark:hx-bg-red-900/30 dark:hx-text-red-200" }}
+
+    {{ $tagClass := cond (eq $tagType "info") $infoClass (cond (eq $tagType "warning") $warningClass (cond (eq $tagType "error") $errorClass $defaultClass)) }}
+    <div class="hextra-card-tag">
+      <span class="hx-inline-block hx-rounded-full hx-px-2.5 hx-leading-6 {{ $tagClass }}">{{ $tag }}</span>
+    </div>
   {{- end -}}
 </a>
 {{- /* Strip trailing newline. */ -}}

layouts/shortcodes/badge.html

@@ -1,33 +0,0 @@
-{{- if .IsNamedParams -}}
-  {{- $content := .Get "content" -}}
-  {{- $type := .Get "type" | default "" -}}
-  {{- $class := .Get "class" | default "" -}}
-  {{- $link := .Get "link" | default "" -}}
-
-  {{- if $link -}}
-    <a href="{{ $link }}" title="{{ $content | plainify }}" target="_blank">
-      {{- partial "shortcodes/badge.html" (dict
-        "content" $content 
-        "type" $type
-        "class" $class
-        "border" true
-        )
-      -}}
-    </a>
-  {{- else -}}
-    {{- partial "shortcodes/badge.html" (dict
-      "content" $content 
-      "type" $type
-      "class" $class
-      "border" true
-      )
-    -}}
-  {{- end -}}
-{{- else -}}
-  {{- $content := .Get 0 -}}
-  {{- partial "shortcodes/badge.html" (dict
-    "content" $content 
-    "border" true
-    )
-  -}}
-{{- end -}}

layouts/shortcodes/hextra/hero-section.html

@@ -0,0 +1,10 @@
+{{- $style := .Get "style" -}}
+{{- $header := int (strings.TrimPrefix "h" (.Get "header" | default "h2")) -}}
+{{- $size := cond (ge $header 4) "xl" (cond (eq $header 3) "2xl" "4xl") -}}
+
+<h{{ $header }}
+  class="not-prose hx-text-{{ $size }} hx-font-bold hx-leading-none hx-tracking-tighter md:hx-text-3xl hx-py-2 hx-bg-clip-text hx-text-transparent hx-bg-gradient-to-r hx-from-gray-900 hx-to-gray-600 dark:hx-from-gray-100 dark:hx-to-gray-400"
+  {{ with $style }}style="{{ . | safeCSS }}"{{ end }}
+>
+  {{ .Inner | markdownify }}
+</h{{ $header }}>