Fix favicon (#225)

Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>
2025-07-24 13:53:50 +00:00 · 2023-08-27 00:26:51 +08:00
parent 17c59bedfe
commit 05e681f98f
9 changed files with 75 additions and 92 deletions
--- a/docSite/layouts/docs/baseof.html
+++ b/docSite/layouts/docs/baseof.html
@@ -1,44 +1,46 @@
 <!DOCTYPE html>
 {{ $.Scratch.Delete "social_list" }}
+{{ $.Scratch.Set "pathName" (printf "%s" (.Site.Params.docs.pathName | default "docs")) }}
 <!-- social_list -->
 <!-- change -->
 {{ $social_params := slice "github" "twitter" "instagram" "rss" "wechat" }}
 {{ range $social_params }}
-{{ if isset site.Params.social . }}
-{{ $.Scratch.Add "social_list" (slice .) }}
-{{ end }}
+    {{ if isset site.Params.social . }}
+        {{ $.Scratch.Add "social_list" (slice .) }}
+    {{ end }}
 {{ end }}
 <html lang="{{ site.LanguageCode }}">
-    {{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "head.html") . -}}
+    {{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "head.html") . -}}
 <body>
    <div class="content">
        <div class="page-wrapper toggled">
-            {{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "sidebar.html") . -}}
+            {{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "sidebar.html") . -}}
                <!-- Start Page Content -->
                <main class="page-content bg-transparent">
-                    {{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "top-header.html") . -}}
+                    {{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "top-header.html") . -}}
                        <div class="container-fluid">
                            <div class="layout-spacing">
                                {{ $currentPage := . -}}
                                {{ if site.Params.docs.breadcrumbs | default true }}
                                    <div class="d-md-flex justify-content-between align-items-center">
-                                        {{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "breadcrumbs.html") . -}}
+                                        {{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "breadcrumbs.html") . -}}
                                    </div>
                                {{ end }}
                                <div class="row flex-xl-nowrap">
                                    {{ if site.Params.docs.toc | default true }}
                                    <div class="docs-toc col-xl-3 {{ if .IsNode }}visually-hidden{{ else }}{{end}} {{ if and (ne .Params.toc false) (ne .TableOfContents "<nav id=\"TableOfContents\"></nav>") }}{{ else }}visually-hidden{{ end }} {{ if site.Params.docs.toc | default true }}{{ else }}visually-hidden{{ end }} d-xl-block">
-                                        {{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "toc.html") . -}}
+                                        {{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "toc.html") . -}}
                                    </div>
                                    {{ end }}
                                    {{ if site.Params.docs.tocMobile | default true }}
                                    <div class="docs-toc-mobile {{ if .IsNode }}visually-hidden{{ else }}{{end}} {{ if and (ne .Params.toc false) (ne .TableOfContents "<nav id=\"TableOfContents\"></nav>") }}{{ else }}visually-hidden{{ end }} {{ if site.Params.docs.tocMobile | default true }}{{ else }}visually-hidden{{ end }} d-print-none d-xl-none">
                                        <button id="toc-dropdown-btn" class="btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
-                                            Contents
+                                            Table of Contents
                                        </button>
-                                        {{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "toc-mobile.html") . -}}
+                                        {{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "toc-mobile.html") . -}}
                                    </div>
                                    {{ end -}}
+                                    <!-- change -->
                                    <div class="docs-content col-12 {{ if .IsNode }}{{ else }}{{ if site.Params.docs.toc | default true }}{{ if and (ne .Params.toc false) }}col-xl-9{{else}}{{end}}{{ else }}{{ end }}{{ end }} mt-0">
                                        <div class="mb-3">
                                            <h1 class="content-title mb-0">
@@ -60,13 +62,13 @@
                                            {{ block "main" . }}{{ end }}
                                        </div>
                                        <div>
-                                            {{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "doc-nav.html") . -}}
+                                            {{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "doc-nav.html") . -}}
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
-                        {{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "footer.html") . -}}
+                        {{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "footer.html") . -}}

                </main>
        </div>
@@ -74,30 +76,30 @@

    {{ if site.Params.docs.backToTop | default true }}
    <!-- Back to top -->
-    <button onclick="topFunction()" id="back-to-top" class="back-to-top fs-5"><svg width="24" height="24"><path d="M12,10.224l-6.3,6.3L4.32,15.152,12,7.472l7.68,7.68L18.3,16.528Z" style="fill:#fff"/></svg></button>
+    <button onclick="topFunction()" id="back-to-top" aria-label="Back to Top Button" class="back-to-top fs-5"><svg width="24" height="24"><path d="M12,10.224l-6.3,6.3L4.32,15.152,12,7.472l7.68,7.68L18.3,16.528Z" style="fill:#fff"/></svg></button>
    <!-- Back to top -->
    {{ end }}

    <!-- Dark Mode Switch JS -->
    {{ if eq .Site.Params.docs.darkMode true -}}
-        {{ $darkModeSwitch := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/darkmode-switch.js") | js.Build | minify }}
+        {{ $darkModeSwitch := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/darkmode-switch.js") | js.Build | minify }}
        <script>{{ $darkModeSwitch.Content | safeJS }}</script>
    {{ end -}}

-    {{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "footer/footer-scripts.html") . -}}
+    {{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "footer/footer-scripts.html") . -}}

    <!-- DocSearch Config -->
    {{ if and (.Site.Params.docsearch.appID) (.Site.Params.docsearch.apiKey) -}}
-        {{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "footer/docsearch.html") . -}}
+        {{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "footer/docsearch.html") . -}}
    {{ end }}

    <!-- FlexSearch Config -->
    {{ if or (not (isset .Site.Params.flexsearch "enabled")) (eq .Site.Params.flexsearch.enabled true) -}}
        {{ if and (.Site.Params.docsearch.appID) (.Site.Params.docsearch.apiKey) -}}
        {{ else }}
-            {{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "footer/flexsearch.html") . -}}
+            {{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "footer/flexsearch.html") . -}}
        {{ end }}
    {{ end }}
 </body>
-{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "modals.html") . -}}
+{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "modals.html") . -}}
 </html>
--- a/docSite/layouts/partials/docs/footer/footer-scripts.html
+++ b/docSite/layouts/partials/docs/footer/footer-scripts.html
@@ -1,3 +1,4 @@
+<!-- change -->
 <style>
    .medium-zoom-overlay,
    .medium-zoom-image--opened {
@@ -5,43 +6,43 @@
    }
 </style>

-{{ $dayjs := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/dayjs.min.js") }}
-{{ $relativeTime := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/relativeTime.min.js") }}
-{{ $app := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/app.js") -}}
+{{ $dayjs := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/dayjs.min.js") }}
+{{ $relativeTime := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/relativeTime.min.js") }}
+{{ $app := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/app.js") -}}

 {{ $slice := slice $dayjs $relativeTime $app -}}

 {{ if and (.Site.Params.docsearch.appID) (.Site.Params.docsearch.apiKey) -}}
-    {{ $docsearch := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/docsearch.min.js") }}
+    {{ $docsearch := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/docsearch.min.js") }}
    {{ $slice = $slice | append $docsearch -}}
 {{ end }}

 {{ if site.Params.docs.toc | default true }}
    {{ if eq .Site.Params.docs.scrollSpy true -}}
-        {{ $simplescrollspy := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/simple-scrollspy.min.js") }}
+        {{ $simplescrollspy := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/simple-scrollspy.min.js") }}
        {{ $slice = $slice | append $simplescrollspy -}}
    {{ end -}}

    {{ if eq .Site.Params.docs.scrollSpy true -}}
-        {{ $scrollspyScript := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/scrollspy-script.js") }}
+        {{ $scrollspyScript := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/scrollspy-script.js") }}
        {{ $scrollspyScript := $scrollspyScript | js.Build -}}
        {{ $slice = $slice | append $scrollspyScript -}}
    {{ end -}}
 {{ end -}}

 {{ if site.Params.docs.tocMobile | default true }}
-    {{ $tocmobilescrollspy := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/toc-mobile-scrollspy.js") }}
+    {{ $tocmobilescrollspy := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/toc-mobile-scrollspy.js") }}
    {{ $slice = $slice | append $tocmobilescrollspy -}}
 {{ end -}}

 {{ if eq .Site.Params.docs.prism true -}}
-    {{ $prism := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/prism.js") }}
+    {{ $prism := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/prism.js") }}
    {{ $prism := $prism | js.Build -}}
    {{ $slice = $slice | append $prism -}}
 {{ end -}}

 <!-- Bootstrap JS -->
-{{ $js := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/bootstrap.js") }}
+{{ $js := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/bootstrap.js") }}
 {{ $params := dict }}
 {{ $sourceMap := cond hugo.IsProduction "" "inline" }}
 {{ $opts := dict "sourceMap" $sourceMap "minify" hugo.IsProduction "target" "es2018" "params" $params }}
@@ -51,7 +52,7 @@
 {{ end }}
    <script src="{{ $js.RelPermalink }}" {{ if hugo.IsProduction }}integrity="{{ $js.Data.Integrity }}"{{ end -}} defer></script>

-{{ $js := $slice | resources.Concat (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/bundle.js") -}}
+{{ $js := $slice | resources.Concat (printf "/%s/%s" ($.Scratch.Get "pathName") "js/bundle.js") -}}

 {{- if not .Site.IsServer }}
    {{- $js := $js | minify | fingerprint "sha384" }}
@@ -60,6 +61,7 @@
    <script type="text/javascript" src="{{ $js.Permalink }}" defer></script>
 {{- end }}

+<!-- change -->
 <script
  src="https://cdn.jsdelivr.us/npm/medium-zoom/dist/medium-zoom.min.js"
  crossorigin="anonymous"
--- a/docSite/layouts/partials/docs/head.html
+++ b/docSite/layouts/partials/docs/head.html
@@ -27,17 +27,17 @@
    <meta name="website" content="https://lotusdocs.dev" />
    <meta name="Version" content="v0.1.0" />
    <!-- favicon -->
-    {{ block "favicon" . }}{{ partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "head/favicon.html") . }}{{ end }}
+    {{ block "favicon" . }}{{ partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "head/favicon.html") . }}{{ end }}
    <!-- Dark Mode -->
    {{ if eq .Site.Params.docs.darkMode true -}}
-        {{ $darkModeInit := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/darkmode-init.js") | js.Build | minify -}}
+        {{ $darkModeInit := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/darkmode-init.js") | js.Build | minify -}}
        <script>{{ $darkModeInit.Content | safeJS }}</script>
    {{ end -}}
    <!-- FlexSearch -->
    {{ if or (not (isset .Site.Params.flexsearch "enabled")) (eq .Site.Params.flexsearch.enabled true) -}}
        {{ if and (.Site.Params.docsearch.appID) (.Site.Params.docsearch.apiKey) -}}
        {{ else }}
-            {{ $flexSearch := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/flexsearch.bundle.js") }}
+            {{ $flexSearch := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/flexsearch.bundle.js") }}
            {{- if not .Site.IsServer }}
                {{ $flexSearch := $flexSearch | minify | fingerprint "sha384" }}
                <script type="text/javascript" src="{{ $flexSearch.Permalink }}" integrity="{{ $flexSearch.Data.Integrity }}" crossorigin="anonymous"></script>
@@ -53,8 +53,8 @@
    {{- if hugo.IsProduction}}
        {{- $options := dict "enableSourceMap" false "outputStyle" "compressed" }}
    {{- end }}
-    {{- $style := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "scss/style.scss") }}
-    {{- $style = $style | resources.ExecuteAsTemplate (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "scss/style.scss") . | resources.ToCSS $options }}
+    {{- $style := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "scss/style.scss") }}
+    {{- $style = $style | resources.ExecuteAsTemplate (printf "/%s/%s" ($.Scratch.Get "pathName") "scss/style.scss") . | resources.ToCSS $options }}
    {{- if hugo.IsProduction }}
        {{- $style = $style | minify | fingerprint "sha384" }}
    {{- end -}}
@@ -62,7 +62,7 @@
    <!-- Plausible Analytics Config -->
    {{- if not .Site.IsServer }}
    {{ if and (.Site.Params.plausible.scriptURL | default "https://plausible.io") (.Site.Params.plausible.dataDomain) -}}
-        {{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "head/plausible") . }}
+        {{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "head/plausible") . }}
    {{- end -}}
    {{- end -}}
    <!-- Google Analytics v4 Config -->