Skip to content

Commit 05e681f

Browse files
yangchuanshengyangchuansheng
authored
Fix favicon (#225)
Signed-off-by: Carson Yang <yangchuansheng33@gmail.com>
1 parent 17c59be commit 05e681f

9 files changed

+75
-92
lines changed

‎docSite/assets/jsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"baseUrl": ".",
44
"paths": {
55
"*": [
6-
"../../../../../.cache/hugo_cache/modules/filecache/modules/pkg/mod/github.com/gohugoio/hugo-mod-jslibs-dist/popperjs/v2@v2.21100.20000/package/dist/cjs/popper.js/*",
7-
"../../../../../.cache/hugo_cache/modules/filecache/modules/pkg/mod/github.com/twbs/bootstrap@v5.3.0+incompatible/js/*"
6+
"../../../../../Library/Caches/hugo_cache/modules/filecache/modules/pkg/mod/github.com/gohugoio/hugo-mod-jslibs-dist/popperjs/v2@v2.21100.20000/package/dist/cjs/popper.js/*",
7+
"../../../../../Library/Caches/hugo_cache/modules/filecache/modules/pkg/mod/github.com/twbs/bootstrap@v5.3.0+incompatible/js/*"
88
]
99
}
1010
}

‎docSite/layouts/docs/baseof.html‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
<!DOCTYPE html>
22
{{ $.Scratch.Delete "social_list" }}
3+
{{ $.Scratch.Set "pathName" (printf "%s" (.Site.Params.docs.pathName | default "docs")) }}
34
<!-- social_list -->
45
<!-- change -->
56
{{ $social_params := slice "github" "twitter" "instagram" "rss" "wechat" }}
67
{{ range $social_params }}
7-
{{ if isset site.Params.social . }}
8-
{{ $.Scratch.Add "social_list" (slice .) }}
9-
{{ end }}
8+
{{ if isset site.Params.social . }}
9+
{{ $.Scratch.Add "social_list" (slice .) }}
10+
{{ end }}
1011
{{ end }}
1112
<html lang="{{ site.LanguageCode }}">
12-
{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "head.html") . -}}
13+
{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "head.html") . -}}
1314
<body>
1415
<div class="content">
1516
<div class="page-wrapper toggled">
16-
{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "sidebar.html") . -}}
17+
{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "sidebar.html") . -}}
1718
<!-- Start Page Content -->
1819
<main class="page-content bg-transparent">
19-
{{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "top-header.html") . -}}
20+
{{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "top-header.html") . -}}
2021
<div class="container-fluid">
2122
<div class="layout-spacing">
2223
{{ $currentPage := . -}}
2324
{{ if site.Params.docs.breadcrumbs | default true }}
2425
<div class="d-md-flex justify-content-between align-items-center">
25-
{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "breadcrumbs.html") . -}}
26+
{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "breadcrumbs.html") . -}}
2627
</div>
2728
{{ end }}
2829
<div class="row flex-xl-nowrap">
2930
{{ if site.Params.docs.toc | default true }}
3031
<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">
31-
{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "toc.html") . -}}
32+
{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "toc.html") . -}}
3233
</div>
3334
{{ end }}
3435
{{ if site.Params.docs.tocMobile | default true }}
3536
<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">
3637
<button id="toc-dropdown-btn" class="btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" data-bs-offset="0,0" aria-expanded="false">
37-
Contents
38+
Table of Contents
3839
</button>
39-
{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "toc-mobile.html") . -}}
40+
{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "toc-mobile.html") . -}}
4041
</div>
4142
{{ end -}}
43+
<!-- change -->
4244
<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">
4345
<div class="mb-3">
4446
<h1 class="content-title mb-0">
@@ -60,44 +62,44 @@ <h1 class="content-title mb-0">
6062
{{ block "main" . }}{{ end }}
6163
</div>
6264
<div>
63-
{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "doc-nav.html") . -}}
65+
{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "doc-nav.html") . -}}
6466
</div>
6567
</div>
6668
</div>
6769
</div>
6870
</div>
69-
{{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "footer.html") . -}}
71+
{{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "footer.html") . -}}
7072

7173
</main>
7274
</div>
7375
</div>
7476

7577
{{ if site.Params.docs.backToTop | default true }}
7678
<!-- Back to top -->
77-
<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>
79+
<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>
7880
<!-- Back to top -->
7981
{{ end }}
8082

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

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

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

9496
<!-- FlexSearch Config -->
9597
{{ if or (not (isset .Site.Params.flexsearch "enabled")) (eq .Site.Params.flexsearch.enabled true) -}}
9698
{{ if and (.Site.Params.docsearch.appID) (.Site.Params.docsearch.apiKey) -}}
9799
{{ else }}
98-
{{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "footer/flexsearch.html") . -}}
100+
{{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "footer/flexsearch.html") . -}}
99101
{{ end }}
100102
{{ end }}
101103
</body>
102-
{{- partial (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "modals.html") . -}}
104+
{{- partial (printf "%s/%s" ($.Scratch.Get "pathName") "modals.html") . -}}
103105
</html>

‎docSite/layouts/partials/docs/footer/footer-scripts.html‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
1+
<!-- change -->
12
<style>
23
.medium-zoom-overlay,
34
.medium-zoom-image--opened {
45
z-index: 1999;
56
}
67
</style>
78

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

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

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

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

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

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

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

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

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

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

64+
<!-- change -->
6365
<script
6466
src="https://cdn.jsdelivr.us/npm/medium-zoom/dist/medium-zoom.min.js"
6567
crossorigin="anonymous"

‎docSite/layouts/partials/docs/head.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
<meta name="website" content="https://lotusdocs.dev" />
2828
<meta name="Version" content="v0.1.0" />
2929
<!-- favicon -->
30-
{{ block "favicon" . }}{{ partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "head/favicon.html") . }}{{ end }}
30+
{{ block "favicon" . }}{{ partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "head/favicon.html") . }}{{ end }}
3131
<!-- Dark Mode -->
3232
{{ if eq .Site.Params.docs.darkMode true -}}
33-
{{ $darkModeInit := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/darkmode-init.js") | js.Build | minify -}}
33+
{{ $darkModeInit := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/darkmode-init.js") | js.Build | minify -}}
3434
<script>{{ $darkModeInit.Content | safeJS }}</script>
3535
{{ end -}}
3636
<!-- FlexSearch -->
3737
{{ if or (not (isset .Site.Params.flexsearch "enabled")) (eq .Site.Params.flexsearch.enabled true) -}}
3838
{{ if and (.Site.Params.docsearch.appID) (.Site.Params.docsearch.apiKey) -}}
3939
{{ else }}
40-
{{ $flexSearch := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "js/flexsearch.bundle.js") }}
40+
{{ $flexSearch := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "js/flexsearch.bundle.js") }}
4141
{{- if not .Site.IsServer }}
4242
{{ $flexSearch := $flexSearch | minify | fingerprint "sha384" }}
4343
<script type="text/javascript" src="{{ $flexSearch.Permalink }}" integrity="{{ $flexSearch.Data.Integrity }}" crossorigin="anonymous"></script>
@@ -53,16 +53,16 @@
5353
{{- if hugo.IsProduction}}
5454
{{- $options := dict "enableSourceMap" false "outputStyle" "compressed" }}
5555
{{- end }}
56-
{{- $style := resources.Get (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "scss/style.scss") }}
57-
{{- $style = $style | resources.ExecuteAsTemplate (printf "/%s/%s" (.Site.Params.docs.pathName | default "docs") "scss/style.scss") . | resources.ToCSS $options }}
56+
{{- $style := resources.Get (printf "/%s/%s" ($.Scratch.Get "pathName") "scss/style.scss") }}
57+
{{- $style = $style | resources.ExecuteAsTemplate (printf "/%s/%s" ($.Scratch.Get "pathName") "scss/style.scss") . | resources.ToCSS $options }}
5858
{{- if hugo.IsProduction }}
5959
{{- $style = $style | minify | fingerprint "sha384" }}
6060
{{- end -}}
6161
<link rel="stylesheet" href="{{ $style.RelPermalink }}" {{ if hugo.IsProduction }}integrity="{{ $style.Data.Integrity }}"{{ end -}} crossorigin="anonymous">
6262
<!-- Plausible Analytics Config -->
6363
{{- if not .Site.IsServer }}
6464
{{ if and (.Site.Params.plausible.scriptURL | default "https://plausible.io") (.Site.Params.plausible.dataDomain) -}}
65-
{{- partialCached (printf "%s/%s" (.Site.Params.docs.pathName | default "docs") "head/plausible") . }}
65+
{{- partialCached (printf "%s/%s" ($.Scratch.Get "pathName") "head/plausible") . }}
6666
{{- end -}}
6767
{{- end -}}
6868
<!-- Google Analytics v4 Config -->

‎docSite/resources/_gen/assets/scss/docs/scss/style.scss_38911198a4b6e5419260ce513414dbb7.content‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docSite/resources/_gen/assets/scss/docs/scss/style.scss_38911198a4b6e5419260ce513414dbb7.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"Target":"docs/scss/style.min.42fafeafea4b9a26eac18c5664437b88442be7755acffbad0d38d25197ed8edc50a753a2e4d31e985effeb9bbcd8d24c.css","MediaType":"text/css","Data":{"Integrity":"sha384-Qvr+r+pLmibqwYxWZEN7iEQr53Vaz/utDTjSUZftjtxQp1Oi5NMemF7/65u82NJM"}}
1+
{"Target":"docs/scss/style.min.026ae092033ab78c35aa93b3849e74e3f20b34b3d852cf1f99085be776a0b91ecbb96098659f897a5cd2fb6c70e89b61.css","MediaType":"text/css","Data":{"Integrity":"sha384-AmrgkgM6t4w1qpOzhJ504/ILNLPYUs8fmQhb53aguR7LuWCYZZ+JelzS+2xw6Jth"}}

0 commit comments

Comments
 (0)