diff options
| author | DSRKafuU | 2020-04-23 23:34:45 +0800 |
|---|---|---|
| committer | GitHub | 2020-04-23 23:34:45 +0800 |
| commit | 50900be20164758f1ae3ef1fb18d65424bc98743 (patch) | |
| tree | a01ec7f161f73deac667b4e51be4f374b9ea8f5b /layouts | |
| parent | aaa441e5f2e065ebcf1e645f7924e9ef28b8d242 (diff) | |
| parent | 29f2e593583861173b212c0495dec2e26206072b (diff) | |
| download | hugo-theme-fuji-50900be20164758f1ae3ef1fb18d65424bc98743.tar.gz hugo-theme-fuji-50900be20164758f1ae3ef1fb18d65424bc98743.tar.bz2 hugo-theme-fuji-50900be20164758f1ae3ef1fb18d65424bc98743.zip | |
Merge pull request #5 from amzrk2/dev
Merge v1.2.0 dev branch
Diffstat (limited to 'layouts')
25 files changed, 153 insertions, 129 deletions
diff --git a/layouts/404.html b/layouts/404.html index a4ab2b7..6dfd73f 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,14 +1,3 @@ {{ define "main" }} -<main> - <div class="container-lg clearfix"> - <!-- list --> - <div class="col-md-9 col-12 float-left" id="content"> - <span id="not-found">404 NOT FOUND</span> - </div> - <!-- sidebar --> - <div class="col-md-3 col-12 float-left" id="sidebar"> - {{ partial "sidebar.html" . }} - </div> - </div> -</main> +<span id="not-found">404 NOT FOUND</span> {{ end }}
\ No newline at end of file diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index a5cd49a..a1a40fd 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1 +1 @@ -<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>
\ No newline at end of file +<a href="{{ .Destination | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>
\ No newline at end of file diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index dab458f..e3ee3e5 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -23,12 +23,12 @@ <ul id="pagination"> {{ if ne $paginator.PageNumber 1 }} <li class="pag-first"> - <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a> + <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></a> </li> {{ end }} {{ if $paginator.HasPrev }} <li class="pag-previous"> - <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a> + <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a> </li> {{ end }} @@ -60,12 +60,12 @@ {{ if $paginator.HasNext }} <li class="pag-next"> - <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a> + <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a> </li> {{ end }} {{ if ne $paginator.PageNumber $paginator.TotalPages }} <li class="pag-last"> - <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a> + <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a> </li> {{ end }} </ul> diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a1eb732..6df6ad6 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -15,9 +15,14 @@ <div class="col-md-3 col-12 float-left" id="sidebar"> {{ partial "sidebar.html" . }} </div> - <div id="container-progress"> - <div id="progress"></div> + {{ if .Site.Params.playerURL }} + <div id="aplayer"></div> + {{ end }} + {{ if .Site.Params.scrollTop }} + <div id="scroll-top"> + <i class="fas fa-chevron-up"></i> </div> + {{ end }} </div> </main> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 567e577..a2d3b47 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -13,7 +13,7 @@ {{ .Summary }} </div> <div id="post-exlink"> - <a href="{{ .Permalink }}#">> READ MORE ...</a> + <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i> READ MORE <i class="fas fa-angle-left"></i></a> </div> </div> {{ end }} @@ -26,12 +26,12 @@ <ul id="pagination"> {{ if ne $paginator.PageNumber 1 }} <li class="pag-first"> - <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a> + <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></i></a> </li> {{ end }} {{ if $paginator.HasPrev }} <li class="pag-previous"> - <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a> + <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></i></a> </li> {{ end }} @@ -63,12 +63,12 @@ {{ if $paginator.HasNext }} <li class="pag-next"> - <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a> + <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a> </li> {{ end }} {{ if ne $paginator.PageNumber $paginator.TotalPages }} <li class="pag-last"> - <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a> + <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a> </li> {{ end }} </ul> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 04d016c..6056021 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,6 +6,9 @@ <div id="post-meta"> {{ partial "post-meta.html" . }} </div> + {{ with .Params.playerURL }} + <div id="post-aplayer"></div> + {{ end }} <div class="markdown-body" id="post-content"> {{ .Content }} </div> @@ -17,10 +20,6 @@ </blockquote> </div> {{ end }} -{{ if .Site.Params.utterancesComment }} {{ partial "comment-utterances.html" . }} -{{ end }} -{{ if .Site.Params.disqusComment }} {{ partial "comment-disqus.html" . }} -{{ end }} {{ end }}
\ No newline at end of file diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html index dd15f58..6a0d4d2 100644 --- a/layouts/_default/tag.html +++ b/layouts/_default/tag.html @@ -16,7 +16,7 @@ {{ .Summary }} </div> <div id="post-exlink"> - <a href="{{ .Permalink }}#">> READ MORE ...</a> + <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i> READ MORE <i class="fas fa-angle-left"></i></a> </div> </div> {{ end }} @@ -29,12 +29,12 @@ <ul id="pagination"> {{ if ne $paginator.PageNumber 1 }} <li class="pag-first"> - <a href="{{ $paginator.First.URL }}">{{ partial "fas/fa-angle-double-left" . }}</a> + <a href="{{ $paginator.First.URL }}"><i class="fas fa-angle-double-left"></a> </li> {{ end }} {{ if $paginator.HasPrev }} <li class="pag-previous"> - <a href="{{ $paginator.Prev.URL }}">{{ partial "fas/fa-angle-left" . }}</a> + <a href="{{ $paginator.Prev.URL }}"><i class="fas fa-angle-left"></a> </li> {{ end }} @@ -66,12 +66,12 @@ {{ if $paginator.HasNext }} <li class="pag-next"> - <a href="{{ $paginator.Next.URL }}">{{ partial "fas/fa-angle-right" . }}</a> + <a href="{{ $paginator.Next.URL }}"><i class="fas fa-angle-right"></i></a> </li> {{ end }} {{ if ne $paginator.PageNumber $paginator.TotalPages }} <li class="pag-last"> - <a href="{{ $paginator.Last.URL }}">{{ partial "fas/fa-angle-double-right" . }}</a> + <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a> </li> {{ end }} </ul> diff --git a/layouts/partials/comment-disqus.html b/layouts/partials/comment-disqus.html index 4477226..81c9c68 100644 --- a/layouts/partials/comment-disqus.html +++ b/layouts/partials/comment-disqus.html @@ -1,16 +1,18 @@ +{{ with .Site.Params.disqusShortname }} <div id="post-comment"> <div id="disqus_thread"></div> <script> var disqus_config = function () { - this.page.url = "{{ .Permalink }}"; - this.page.identifier = "{{ .RelPermalink }}"; + this.page.url = "{{ $.Permalink }}"; + this.page.identifier = "{{ $.RelPermalink }}"; }; (function () { var d = document, s = d.createElement('script'); - s.src = 'https://{{ .Site.Params.disqusShortname }}.disqus.com/embed.js'; + s.src = 'https://{{ . }}.disqus.com/embed.js'; s.setAttribute('data-timestamp', +new Date()); (d.head || d.body).appendChild(s); })(); </script> -</div>
\ No newline at end of file +</div> +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/comment-utterances.html b/layouts/partials/comment-utterances.html index f515a72..b3edfbd 100644 --- a/layouts/partials/comment-utterances.html +++ b/layouts/partials/comment-utterances.html @@ -1,10 +1,9 @@ +{{ with .Site.Params.utterancesRepo }} <div id="post-loading"> - <div id="container-loading-bar"> - <div id="loading-bar"></div> - </div> + <i class="fas fa-circle-notch fa-spin"></i> <p>{{ i18n "postCommentLoading" }}</p> </div> <div id="post-comment"> - <script src="{{ .Site.Params.cdnUtterancesJS }}" repo="{{ .Site.Params.utterancesRepo }}" issue-term="{{ .Site.Params.utterancesIssueTerm }}" theme="{{ .Site.Params.utterancesTheme }}" - crossorigin="anonymous" async></script> -</div>
\ No newline at end of file + <script src="https://utteranc.es/client.js" repo="{{ . }}" issue-term="{{ $.Site.Params.utterancesIssueTerm }}" theme="{{ $.Site.Params.utterancesTheme }}" crossorigin="anonymous" async></script> +</div> +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/fas/fa-angle-double-left.html b/layouts/partials/fas/fa-angle-double-left.html deleted file mode 100644 index 95887a1..0000000 --- a/layouts/partials/fas/fa-angle-double-left.html +++ /dev/null @@ -1 +0,0 @@ -<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="angle-double-left" class="svg-inline--fa fa-angle-double-left fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M223.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L319.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L393.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34zm-192 34l136 136c9.4 9.4 24.6 9.4 33.9 0l22.6-22.6c9.4-9.4 9.4-24.6 0-33.9L127.9 256l96.4-96.4c9.4-9.4 9.4-24.6 0-33.9L201.7 103c-9.4-9.4-24.6-9.4-33.9 0l-136 136c-9.5 9.4-9.5 24.6-.1 34z"></path></svg>
\ No newline at end of file diff --git a/layouts/partials/fas/fa-angle-double-right.html b/layouts/partials/fas/fa-angle-double-right.html deleted file mode 100644 index 998f859..0000000 --- a/layouts/partials/fas/fa-angle-double-right.html +++ /dev/null @@ -1 +0,0 @@ -<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="angle-double-right" class="svg-inline--fa fa-angle-double-right fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34zm192-34l-136-136c-9.4-9.4-24.6-9.4-33.9 0l-22.6 22.6c-9.4 9.4-9.4 24.6 0 33.9l96.4 96.4-96.4 96.4c-9.4 9.4-9.4 24.6 0 33.9l22.6 22.6c9.4 9.4 24.6 9.4 33.9 0l136-136c9.4-9.2 9.4-24.4 0-33.8z"></path></svg>
\ No newline at end of file diff --git a/layouts/partials/fas/fa-angle-left.html b/layouts/partials/fas/fa-angle-left.html deleted file mode 100644 index 39198fc..0000000 --- a/layouts/partials/fas/fa-angle-left.html +++ /dev/null @@ -1 +0,0 @@ -<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="angle-left" class="svg-inline--fa fa-angle-left fa-w-8" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512"><path fill="currentColor" d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"></path></svg>
\ No newline at end of file diff --git a/layouts/partials/fas/fa-angle-right.html b/layouts/partials/fas/fa-angle-right.html deleted file mode 100644 index 26cb61e..0000000 --- a/layouts/partials/fas/fa-angle-right.html +++ /dev/null @@ -1 +0,0 @@ -<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="angle-right" class="svg-inline--fa fa-angle-right fa-w-8" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512"><path fill="currentColor" d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"></path></svg>
\ No newline at end of file diff --git a/layouts/partials/fas/fa-angle-up.html b/layouts/partials/fas/fa-angle-up.html deleted file mode 100644 index 47ffb0b..0000000 --- a/layouts/partials/fas/fa-angle-up.html +++ /dev/null @@ -1 +0,0 @@ -<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="angle-up" class="svg-inline--fa fa-angle-up fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M177 159.7l136 136c9.4 9.4 9.4 24.6 0 33.9l-22.6 22.6c-9.4 9.4-24.6 9.4-33.9 0L160 255.9l-96.4 96.4c-9.4 9.4-24.6 9.4-33.9 0L7 329.7c-9.4-9.4-9.4-24.6 0-33.9l136-136c9.4-9.5 24.6-9.5 34-.1z"></path></svg>
\ No newline at end of file diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html index c152663..57afd18 100644 --- a/layouts/partials/favicon.html +++ b/layouts/partials/favicon.html @@ -1 +1 @@ -<link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/amzrk2/poal-jsdelivr/amzrk2/favicons/favicon.ico">
\ No newline at end of file +<link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/amzrk2/poal-jsdelivr/amzrk2/favicons/favicon.ico" />
\ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 241955d..be8f5bf 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,9 +1,5 @@ <footer> <div class="container-lg text-center"> - <p> - © {{ now.Format "2006" }} <a href="{{ .Site.BaseURL }}">{{ .Site.Params.author }}</a> | - {{ i18n "footerPoweredFront" }}<a href="https://github.com/amzrk2/hugo-theme-fuji/" target="_blank">Fuji</a> - & <a href="https://gohugo.io/" target="_blank">Hugo</a>{{ i18n "footerPoweredEnd" }} - </p> + <p>© {{ now.Format "2006" }} <a href="{{ .Site.BaseURL }}">{{ .Site.Params.author }}</a> | {{ i18n "footerPoweredFront" }}<a href="https://github.com/amzrk2/hugo-theme-fuji/" target="_blank">Fuji</a> & <a href="https://gohugo.io/" target="_blank">Hugo</a>{{ i18n "footerPoweredEnd" }}</p> </div> </footer>
\ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index c5331cc..9f4dda7 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,10 +1,11 @@ -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> +<meta charset="utf-8" /> +<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" /> <meta name="HandheldFriendly" content="True" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" /> -<meta http-equiv="Cache-Control" content="no-transform"> -<meta http-equiv="Cache-Control" content="no-siteapp"> +<meta http-equiv="Cache-Control" content="no-transform" /> +<meta http-equiv="Cache-Control" content="no-siteapp" /> {{ hugo.Generator }} + {{ partial "favicon.html" . }} {{ if .IsHome }} @@ -12,26 +13,55 @@ {{ else }} <title>{{ .Title }} - {{ .Site.Title }}</title> {{ end }} -<meta name="author" content="{{if .Params.author }}{{ .Params.author }}{{ else }}{{ .Site.Params.author }}{{ end }}"> -<meta name="description" content="{{if .Params.description }}{{ .Params.description }}{{ else }}{{ .Site.Params.description }}{{ end }}"> +<meta name="author" content="{{if .Params.author }}{{ .Params.author }}{{ else }}{{ .Site.Params.author }}{{ end }}" /> +<meta name="description" content="{{if .Params.description }}{{ .Params.description }}{{ else if .Summary }}{{ .Summary }}{{ else }}{{ .Site.Params.description }}{{ end }}" /> {{ if .Params.tags }} -<meta name="keywords" content="{{ delimit .Params.tags ", " }}"> +<meta name="keywords" content="{{ delimit .Params.tags ", " }}" /> {{ end }} - {{ template "_internal/opengraph.html" . }} {{ template "_internal/twitter_cards.html" . }} - {{ partial "analytic-google.html" . }} +<!-- global css --> {{ $options := (dict "targetPath" "css/main.min.css" "outputStyle" "compressed") }} {{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options }} -<link rel="stylesheet" href="{{ $style.Permalink }}"> -{{ with .Site.Params.cdnIntersectionObserverJS }} -<script src="{{ . }}"></script>{{ end }} -<script src="{{ .Site.Params.cdnVanillaLazyloadJS }}"></script> -<script src="{{ .Site.Params.cdnJQueryJS }}"></script> -<script src="{{ .Site.Params.cdnProgessJS }}"></script> -{{ if or .Params.math .Site.Params.math }} -{{ partial "math.html" . }} +<link rel="stylesheet" href="{{ $style.Permalink }}" /> + +{{ if .Site.Params.useCDN }} +<!-- global dependency --> +<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.0/dist/jquery.min.js" integrity="sha256-xNzN2a4ltkB44Mc/Jz3pT4iU1cmeR0FkXs4pru/JxaQ=" crossorigin="anonymous"></script> +<script src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.0/lazysizes.min.js" integrity="sha256-h2tMEmhemR2IN4wbbdNjj9LaDIjzwk2hralQwfJmBOE=" crossorigin="anonymous"></script> +<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/css/all.min.css" integrity="sha256-h20CPZ0QyXlBuAw7A+KluUYx/3pK+c7lYEpqLTlxjYQ=" crossorigin="anonymous" /> +{{ if or (.Site.Params.playerURL) (.Params.playerURL) }} +<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" integrity="sha256-uqQQGnDcmRKvhKwc5Vm4XT1GQ2oV6t1U0NR2N9tV+BQ=" crossorigin="anonymous" /> +<script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js" integrity="sha256-6Y7CJDaltoeNgk+ZftgCD9jLgmGv4xKUo8nQ0HgAwVo=" crossorigin="anonymous"></script> +{{ end }} +{{ else }} +<!-- global dependency --> +{{ $jquery := resources.Get "js/jquery.min.js" }} +<script src="{{ $jquery.Permalink }}"></script> +{{ $lazysizes := resources.Get "js/lazysizes.min.js" }} +<script src="{{ $lazysizes.Permalink }}"></script> +{{ $fontawesome := resources.Get "css/all.min.css" }} +<link rel="stylesheet" href="{{ $fontawesome.Permalink }}" /> +{{ if or (.Site.Params.playerURL) (.Params.playerURL) }} +{{ $aplayerCSS := resources.Get "css/APlayer.min.css" }} +<link rel="stylesheet" href="{{ $aplayerCSS.Permalink }}" /> +{{ $aplayerJS := resources.Get "js/APlayer.min.js" }} +<script src="{{ $aplayerJS.Permalink }}"></script> +{{ end }} +{{ end }} + +<!-- optional katex math --> +{{ if or (.Params.math) (.Site.Params.math) }} +<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css" integrity="sha384-zB1R0rpPzHqg7Kpt0Aljp8JPLqbXI3bhnPWROx27a9N0Ll6ZP/+DiW/UqRcLbRjq" crossorigin="anonymous" /> +<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js" integrity="sha384-y23I5Q6l+B6vatafAwxRu/0oK/79VlbSz7Q9aiSZUvyWYIYsd+qj+o24G5ZU2zJz" crossorigin="anonymous"></script> +<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script> +{{ end }} + +<!-- dev use --> +{{ if .Site.Params.webpChecker }} +{{ $webp := resources.Get "js/modernizr-webp.min.js" }} +<script src="{{ $webp.Permalink }}"></script> {{ end }}
\ No newline at end of file diff --git a/layouts/partials/math.html b/layouts/partials/math.html deleted file mode 100644 index 621a2c8..0000000 --- a/layouts/partials/math.html +++ /dev/null @@ -1,5 +0,0 @@ -<!-- https://katex.org/docs/autorender.html --> -<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.css" integrity="sha384-zB1R0rpPzHqg7Kpt0Aljp8JPLqbXI3bhnPWROx27a9N0Ll6ZP/+DiW/UqRcLbRjq" crossorigin="anonymous"> -<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/katex.min.js" integrity="sha384-y23I5Q6l+B6vatafAwxRu/0oK/79VlbSz7Q9aiSZUvyWYIYsd+qj+o24G5ZU2zJz" crossorigin="anonymous"></script> -<script defer src="https://cdn.jsdelivr.net/npm/katex@0.11.1/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" - crossorigin="anonymous" onload="renderMathInElement(document.body);"></script>
\ No newline at end of file diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html index 3e90686..7e5b47b 100644 --- a/layouts/partials/post-meta.html +++ b/layouts/partials/post-meta.html @@ -1,7 +1,10 @@ -<span class="post-meta-item post-meta-date"> - <time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }} | </time> +<span> + <time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }}</time> | </span> -<span class="post-meta-item post-meta-tags"> +<span> + <span>{{ .WordCount }}{{ i18n "postMetaWordCount" }}</span> | +</span> +<span> {{ if .Params.tags }} {{ range .Params.tags }} <a href="{{ $.Site.BaseURL }}/tags/{{ . | urlize }}/">{{ . }}</a> diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html index e807e36..2f83c91 100644 --- a/layouts/partials/scripts.html +++ b/layouts/partials/scripts.html @@ -1,18 +1,7 @@ -<!-- Comment loading indicator --> -{{ if and (.IsPage) (.Site.Params.utterancesComment) }} +{{ if and (.IsPage) (.Site.Params.utterancesRepo) }} +<!-- comment loading indicator --> <script> $(function () { - var loadingBar = new ProgressBar.Circle('#loading-bar', { - color: '#8AA2D3', - strokeWidth: 15, - trailColor: '#E5E2E4', - trailWidth: 15, - fill: '#E5E2E4' - }); - loadingBar.animate(1.0, { - duration: 10000 - }); - var commentStatus; var commentLoadingTime = 0; var commentCheckInterval = self.setInterval(checkUtterances, 500); @@ -25,61 +14,71 @@ clearInterval(commentCheckInterval); $('#post-comment').hide(); $('#post-loading p').text('{{ i18n "postCommentLoadingFailed" }}'); + $('#post-loading i').attr("class", "far fa-times-circle"); } return; } else { clearInterval(commentCheckInterval); - loadingBar.animate(1.0, { - duration: 500 - }, function () { - $('#post-loading').hide(); - }); + $('#post-loading').hide(); } } }); </script> {{ end }} -<!-- Scroll to top button --> -{{ if .Site.Params.scrollTop }} +{{ with .Params.playerURL }} <script> $(function () { - var bar = new ProgressBar.Circle('#progress', { - color: '#8AA2D3', - strokeWidth: 12, - trailColor: '#E5E2E4', - trailWidth: 12, - text: { - value: '{{ partial "fas/fa-angle-up" . }}', - autoStyleContainer: false, - style: null - }, - fill: '#E5E2E4' + const postAPlayer = new APlayer({ + container: document.getElementById("post-aplayer"), + theme: "#8F82BC", + volume: 0.25, + audio: [{ + name: "{{ $.Params.playerName }}", + artist: "{{ $.Params.playerArtist }}", + url: "{{ . }}", + cover: "{{ $.Params.playerCover }}" + }] }); - var scrolled = ($(window).scrollTop() / ($(document).height() - $(window).height() - 1)); - bar.animate(scrolled); - $(window).scroll(function () { - scrolled = ($(window).scrollTop() / ($(document).height() - $(window).height() - 1)); - if (scrolled < 0.0005) { - scrolled = 0; - } else if (scrolled > 1) { - scrolled = 1; - } - bar.set(scrolled); + }); +</script> +{{ end }} +{{ with .Site.Params.playerURL }} +<script> + $(function () { + const siteAPlayer = new APlayer({ + container: document.getElementById("aplayer"), + fixed: true, + theme: "#8F82BC", + volume: 0.25, + audio: [{ + name: "{{ $.Site.Params.playerName }}", + artist: "{{ $.Site.Params.playerArtist }}", + url: "{{ . }}", + cover: "{{ $.Site.Params.playerCover }}" + }] }); }); - $('#container-progress').click(function () { - $('html, body').animate({ +</script> +{{ end }} +{{ if .Site.Params.scrollTop }} +<!-- scroll to top button --> +<script> + $("#scroll-top").click(function () { + $("html, body").animate({ scrollTop: 0 - }, 'slow'); - return false; + }); }); </script> {{ end }} -<!-- Vanilla LazyLoad --> +{{ if .Site.Params.webpChecker }} +<!-- webp checker --> <script> $(function () { - var lazyLoadInstance = new LazyLoad({ - elements_selector: ".lazy" + Modernizr.on("webp", function (result) { + if (!result) { + $('<blockquote><p>{{ i18n "webpCheckerFront" }}<a href="https://caniuse.com/#feat=webp" target="_blank">WebP</a>{{ i18n "webpCheckerEnd" }}</p></blockquote>').replaceAll("#content img"); + } }); }); -</script>
\ No newline at end of file +</script> +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 61f2868..3b782c6 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,3 +1,9 @@ +{{ if in .Site.Params.mainSections .Type }} +<div id="widget-toc"> + <h5>{{ i18n "sidebarToc" }}</h5> + {{.TableOfContents}} +</div> +{{ end }} <div id="widget-pages"> <h5>{{ i18n "sidebarPages" }}</h5> <ul> @@ -32,6 +38,6 @@ {{ with .Site.Params.bgmImageChart }} <div id="widget-bgm"> <h5>{{ i18n "sidebarBangumiChart" }}</h5> - <img class="lazy" src="{{ $.Site.Params.cdnLazyloadSRC }}" data-src="https://bgm.tv/chart/img/{{ . }}" /> + <img class="lazyload" src="{{ $.Site.Params.cdnLazyPlaceholder }}" data-src="https://bgm.tv/chart/img/{{ . }}" /> </div> {{ end }}
\ No newline at end of file diff --git a/layouts/robots.txt b/layouts/robots.txt new file mode 100644 index 0000000..4c807e2 --- /dev/null +++ b/layouts/robots.txt @@ -0,0 +1,3 @@ +User-agent: * + +Sitemap: {{ .Site.BaseURL }}/sitemap.xml diff --git a/layouts/shortcodes/lazyimg-col.html b/layouts/shortcodes/lazyimg-col.html new file mode 100644 index 0000000..c973e67 --- /dev/null +++ b/layouts/shortcodes/lazyimg-col.html @@ -0,0 +1 @@ +<p><img class="lazyload" src="{{ .Site.Params.lazyPlaceholderCol }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file diff --git a/layouts/shortcodes/lazyimg-row.html b/layouts/shortcodes/lazyimg-row.html new file mode 100644 index 0000000..83c604e --- /dev/null +++ b/layouts/shortcodes/lazyimg-row.html @@ -0,0 +1 @@ +<p><img class="lazyload" src="{{ .Site.Params.lazyPlaceholderRow }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file diff --git a/layouts/shortcodes/lazyimg.html b/layouts/shortcodes/lazyimg.html new file mode 100644 index 0000000..f9c6959 --- /dev/null +++ b/layouts/shortcodes/lazyimg.html @@ -0,0 +1 @@ +<p><img class="lazyload" src="{{ .Site.Params.lazyPlaceholder }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file |