Merge 27a70e4c12 into e83c11f31a

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

@@ -25,11 +25,6 @@ This is the third step.
 
 ## Usage
 
-{{< callout emoji="ℹ️" >}}
-  Please note that this shortcode is intended **only for Markdown content**.
-  If you put HTML content or other shortcodes as step content, it may not render as expected.
-{{< /callout >}}
-
 Put Markdown h3 header within `steps` shortcode.
 
 ```

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 }}
-  <link rel="preconnect" href="https://www.googletagmanager.com" crossorigin />
-  {{ partial "google-analytics.html" . }}
-{{- end }}
+  <!-- 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 }}
+
 
   <script>
     /* Initialize light/dark mode */

layouts/shortcodes/tab.html

@@ -4,9 +4,8 @@
   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 */ -}}

layouts/shortcodes/tabs.html

@@ -13,9 +13,9 @@
         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 -}}
+        {{ 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>
@@ -23,6 +23,5 @@
   </div>
 </div>
 <div>
-  {{- .Inner -}}
+  {{ .Inner }}
 </div>
-{{- /* Drop trailing newlines */ -}}

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"