Merge 2fb6f63b41 into e3b582676e

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
   "features": {
     "ghcr.io/devcontainers/features/hugo:1": {
       "extended": true,
-      "version": "0.131.0"
+      "version": "0.124.1"
     },
     "ghcr.io/devcontainers/features/node:1": {}
   },

.github/workflows/pages.yml

@@ -31,7 +31,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      HUGO_VERSION: 0.131.0
+      HUGO_VERSION: 0.126.1
     steps:
       - name: Checkout
         uses: actions/checkout@v4

assets/css/compiled/main.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.9 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com
 *//*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
 2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
@@ -596,6 +596,10 @@ video {
   margin-left: auto;
   margin-right: auto;
 }
+.hx-my-1 {
+  margin-top: 0.25rem;
+  margin-bottom: 0.25rem;
+}
 .hx-my-1\.5 {
   margin-top: 0.375rem;
   margin-bottom: 0.375rem;
@@ -604,6 +608,9 @@ video {
   margin-top: 0.5rem;
   margin-bottom: 0.5rem;
 }
+.-hx-mb-0 {
+  margin-bottom: -0px;
+}
 .-hx-mb-0\.5 {
   margin-bottom: -0.125rem;
 }
@@ -712,6 +719,9 @@ video {
 .hx-h-2 {
   height: 0.5rem;
 }
+.hx-h-3 {
+  height: 0.75rem;
+}
 .hx-h-3\.5 {
   height: 0.875rem;
 }
@@ -748,6 +758,9 @@ video {
 .hx-w-2 {
   width: 0.5rem;
 }
+.hx-w-3 {
+  width: 0.75rem;
+}
 .hx-w-3\.5 {
   width: 0.875rem;
 }
@@ -875,6 +888,10 @@ video {
 .hx-gap-4 {
   gap: 1rem;
 }
+.hx-gap-x-1 {
+  -moz-column-gap: 0.25rem;
+       column-gap: 0.25rem;
+}
 .hx-gap-x-1\.5 {
   -moz-column-gap: 0.375rem;
        column-gap: 0.375rem;
@@ -1049,6 +1066,9 @@ video {
   -webkit-background-clip: text;
           background-clip: text;
 }
+.hx-p-0 {
+  padding: 0px;
+}
 .hx-p-0\.5 {
   padding: 0.125rem;
 }
@@ -1067,6 +1087,10 @@ video {
 .hx-p-6 {
   padding: 1.5rem;
 }
+.hx-px-1 {
+  padding-left: 0.25rem;
+  padding-right: 0.25rem;
+}
 .hx-px-1\.5 {
   padding-left: 0.375rem;
   padding-right: 0.375rem;
@@ -1075,10 +1099,6 @@ video {
   padding-left: 0.5rem;
   padding-right: 0.5rem;
 }
-.hx-px-2\.5 {
-  padding-left: 0.625rem;
-  padding-right: 0.625rem;
-}
 .hx-px-3 {
   padding-left: 0.75rem;
   padding-right: 0.75rem;
@@ -2105,7 +2125,7 @@ article details > summary::before {
 /* GenericDeleted */
 .dark .highlight .chroma .gd { color: #ffa198; background-color: #490202 }
 /* GenericEmph */
-.dark .highlight .chroma .ge { color: inherit; font-style: italic }
+.dark .highlight .chroma .ge { font-style: italic }
 /* GenericError */
 .dark .highlight .chroma .gr { color: #ffa198 }
 /* GenericHeading */
@@ -2238,9 +2258,6 @@ article details > summary::before {
 .hextra-cards {
   grid-template-columns: repeat(auto-fill, minmax(max(250px, calc((100% - 1rem * 2) / var(--hextra-cards-grid-cols))), 1fr));
 }
-.hextra-card {
-  position: relative;
-}
 .hextra-card img {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -2256,7 +2273,6 @@ article details > summary::before {
 }
 .hextra-card p {
   margin-top: 0.5rem;
-  position: relative;
 }
 .dark .hextra-card svg {
   color: #ffffff66;
@@ -2264,13 +2280,6 @@ article details > summary::before {
 .dark .hextra-card:hover svg {
   color: currentColor;
 }
-.hextra-card-tag {
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  z-index: 10;
-  font-size: .65rem;
-}
 .steps h3 {
   counter-increment: step;
 }
@@ -2795,27 +2804,27 @@ body:is(html[class~="dark"] *) {
 .hx-group\/copybtn.copied .group-\[\.copied\]\/copybtn\:hx-hidden {
   display: none;
 }
-.data-\[state\=selected\]\:hx-block[data-state="selected"] {
+.data-\[state\=selected\]\:hx-block[data-state=selected] {
   display: block;
 }
-.data-\[state\=closed\]\:hx-hidden[data-state="closed"] {
+.data-\[state\=closed\]\:hx-hidden[data-state=closed] {
   display: none;
 }
-.data-\[state\=open\]\:hx-hidden[data-state="open"] {
+.data-\[state\=open\]\:hx-hidden[data-state=open] {
   display: none;
 }
-.data-\[state\=selected\]\:hx-border-primary-500[data-state="selected"] {
+.data-\[state\=selected\]\:hx-border-primary-500[data-state=selected] {
   --tw-border-opacity: 1;
   border-color: hsl(var(--primary-hue) var(--primary-saturation) 50% / var(--tw-border-opacity));
 }
-.data-\[state\=selected\]\:hx-text-primary-600[data-state="selected"] {
+.data-\[state\=selected\]\:hx-text-primary-600[data-state=selected] {
   --tw-text-opacity: 1;
   color: hsl(var(--primary-hue) var(--primary-saturation) 45% / var(--tw-text-opacity));
 }
-.hx-group[data-theme="dark"] .group-data-\[theme\=dark\]\:hx-hidden {
+.hx-group[data-theme=dark] .group-data-\[theme\=dark\]\:hx-hidden {
   display: none;
 }
-.hx-group[data-theme="light"] .group-data-\[theme\=light\]\:hx-hidden {
+.hx-group[data-theme=light] .group-data-\[theme\=light\]\:hx-hidden {
   display: none;
 }
 @media (prefers-contrast: more) {
@@ -3360,6 +3369,9 @@ body:is(html[class~="dark"] *) {
     display: block;
   }
 }
+.ltr\:hx-right-1:where([dir="ltr"], [dir="ltr"] *) {
+  right: 0.25rem;
+}
 .ltr\:hx-right-1\.5:where([dir="ltr"], [dir="ltr"] *) {
   right: 0.375rem;
 }
@@ -3434,6 +3446,9 @@ body:is(html[class~="dark"] *) {
     left: auto;
   }
 }
+.rtl\:hx-left-1:where([dir="rtl"], [dir="rtl"] *) {
+  left: 0.25rem;
+}
 .rtl\:hx-left-1\.5:where([dir="rtl"], [dir="rtl"] *) {
   left: 0.375rem;
 }

assets/css/components/cards.css

@@ -2,10 +2,6 @@
   grid-template-columns: repeat(auto-fill, minmax(max(250px, calc((100% - 1rem * 2) / var(--hextra-cards-grid-cols))), 1fr));
 }
 
-.hextra-card {
-  position: relative;
-}
-
 .hextra-card img {
   user-select: none;
 }
@@ -22,7 +18,6 @@
 
 .hextra-card p {
   margin-top: 0.5rem;
-  position: relative;
 }
 
 .dark .hextra-card svg {
@@ -32,11 +27,3 @@
 .dark .hextra-card:hover svg {
   color: currentColor;
 }
-
-.hextra-card-tag {
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  z-index: 10;
-  font-size: .65rem;
-}

exampleSite/content/docs/guide/organize-files.zh-cn.md

@@ -6,7 +6,7 @@ prev: /docs/guide
 
 ## 目录结构
 
-默认情况下，Hugo 在 `content` 目录中搜索 Markdown 文件，目录的结构决定了网站的最终输出结构。
+默认情况下，Hugo 在 `context` 目录中搜索 Markdown 文件，目录的结构决定了网站的最终输出结构。
 以示例网站为例：
 
 <!--more-->

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

@@ -7,12 +7,11 @@ linkTitle: Cards
 
 {{< cards >}}
   {{< card link="../callout" title="Callout" icon="warning" >}}
-  {{< card link="../callout" title="Card with tag" icon="tag" tag="custom tag">}}
   {{< card link="/" title="No Icon" >}}
 {{< /cards >}}
 
 {{< cards >}}
-  {{< card link="/" title="Image Card" image="https://github.com/user-attachments/assets/71b7e3ec-1a8d-4582-b600-5425c6cc0407" subtitle="Internet Image" >}}
+  {{< card link="/" title="Image Card" image="https://source.unsplash.com/featured/800x600?landscape" subtitle="Unsplash Landscape" >}}
   {{< card link="/" title="Local Image" image="/images/card-image-unprocessed.jpg" subtitle="Raw image under static directory." >}}
   {{< card link="/" title="Local Image" image="images/space.jpg" subtitle="Image under assets directory, processed by Hugo." method="Resize" options="600x q80 webp" >}}
 {{< /cards >}}
@@ -22,7 +21,6 @@ linkTitle: Cards
 ```
 {{</* cards */>}}
   {{</* card link="../callout" title="Callout" icon="warning" */>}}
-  {{</* card link="../callout" title="Card with tag" icon="warning" tag= "A custom tag" */>}}
   {{</* card link="/" title="No Icon" */>}}
 {{</* /cards */>}}
 ```
@@ -38,13 +36,11 @@ linkTitle: Cards
 ## Card Parameters
 
 | Parameter  | Description                           |
-|----------- |-----------------------------------------------------------------|
+|----------- |---------------------------------------|
 | `link`     | URL (internal or external).           |
 | `title`    | Title heading for the card.           |
 | `subtitle` | Subtitle heading (supports Markdown). |
 | `icon`     | Name of the icon.                     |
-| `tag`      | Text in tag.                                                    |
-| `tagColor` | Color of the tag: `gray` (default), `yellow`, `red` and `blue`. |
 
 ## Image Card
 
@@ -66,24 +62,3 @@ Hextra auto-detects if image processing is needed during build and applies the `
 It currently supports these `method`: `Resize`, `Fit`, `Fill` and `Crop`.
 
 For more on Hugo's built in image processing commands, methods, and options see their [Image Processing Documentation](https://gohugo.io/content-management/image-processing/).
-
-## Tags
-
-Card supports adding tags which could be useful to show extra status information.
-
-{{< cards >}}
-  {{< card link="../callout" title="Card with default tag" tag="tag text" >}}
-  {{< card link="../callout" title="Card with error tag" tag="tag text" tagType="error" >}}
-  {{< card link="../callout" title="Card with info tag" tag="tag text" tagType="info" >}}
-  {{< card link="../callout" title="Card with warning tag" tag="tag text" tagType="warning" >}}
-  {{< card link="/" title="Image Card" image="https://github.com/user-attachments/assets/71b7e3ec-1a8d-4582-b600-5425c6cc0407" subtitle="Internet Image" tag="tag text" tagType="error" >}}
-{{< /cards >}}
-
-```
-{{</* cards */>}}
-  {{</* card link="../callout" title="Card with default tag color" tag="tag text" */>}}
-  {{</* card link="../callout" title="Card with default red tag" tag="tag text" tagType="error" */>}}
-  {{</* card link="../callout" title="Card with blue tag" tag="tag text" tagType="info" */>}}
-  {{</* card link="../callout" title="Card with yellow tag" tag="tag text" tagType="warning" */>}}
-{{</* /cards */>}}
-```

exampleSite/hugo_stats.json

@@ -211,7 +211,6 @@
       "hextra-card-icon",
       "hextra-card-image",
       "hextra-card-subtitle",
-      "hextra-card-tag",
       "hextra-cards",
       "hextra-code-block",
       "hextra-code-copy-btn",
@@ -419,7 +418,6 @@
       "hx-pt-8",
       "hx-px-1.5",
       "hx-px-2",
-      "hx-px-2.5",
       "hx-px-3",
       "hx-px-4",
       "hx-px-6",
@@ -482,7 +480,6 @@
       "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/google-analytics.html

@@ -1,4 +1,10 @@
-{{- with site.Config.Services.GoogleAnalytics.ID }}
+{{/* site.GoogleAnalytics is deprecated in Hugo v0.120.0 */}}
+{{/* it will be removed in a future version */}}
+{{- $gtagID := "" -}}
+{{- with site.GoogleAnalytics -}}{{ $gtagID = . }}{{- end -}}
+{{- with site.Config.Services.GoogleAnalytics.ID -}}{{ $gtagID = . }}{{- end -}}
+
+{{- with $gtagID }}
   <!-- Global site tag (gtag.js) - Google Analytics -->
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
   <script>

layouts/partials/head.html

@@ -30,11 +30,12 @@
   {{ partialCached "head-css.html" . }}
 
 
-<!-- Google Analytics -->
-{{- if and (eq hugo.Environment "production") .Site.Config.Services.GoogleAnalytics.ID }}
+  <!-- Google Analytics -->
+  {{- if and (eq hugo.Environment "production") (or .Site.GoogleAnalytics .Site.Config.Services.GoogleAnalytics.ID) }}
     <link rel="preconnect" href="https://www.googletagmanager.com" crossorigin />
     {{ partial "google-analytics.html" . }}
-{{- end }}
+  {{- end }}
+
 
   <script>
     /* Initialize light/dark mode */

layouts/partials/shortcodes/card.html

@@ -7,8 +7,6 @@
 {{- $width := .width -}}
 {{- $height := .height -}}
 {{- $imageStyle := .imageStyle -}}
-{{- $tag := .tag -}}
-{{- $tagType := .tagType -}}
 
 {{ $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 -}}
@@ -52,17 +50,5 @@
   {{- with $subtitle -}}
     <div class="hextra-card-subtitle 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 -}}
-
-  {{- if $tag }}
-    {{ $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/card.html

@@ -7,8 +7,6 @@
 {{- $width := 0 -}}
 {{- $height := 0 -}}
 {{- $imageStyle := .Get "imageStyle" -}}
-{{- $tag := .Get "tag" -}}
-{{- $tagType := .Get "tagType" -}}
 
 {{/* Image processing options */}}
 {{- $method := .Get "method" | default "Resize" | humanize -}}
@@ -50,7 +48,5 @@
   "width"       $width
   "height"      $height
   "imageStyle"  $imageStyle
-  "tag"         $tag
-  "tagType"     $tagType
   )
 -}}

netlify.toml

@@ -7,6 +7,6 @@ command = "cd exampleSite && hugo --gc --minify --themesDir ../.. -b ${DEPLOY_PR
 ignore = "false"
 
 [build.environment]
-HUGO_VERSION = "0.132.2"
+HUGO_VERSION = "0.126.1"
 GO_VERSION = "1.22.3"
 NODE_VERSION = "22.2.0"