From 772d7335d3fb01cfd95a886e6a535f7f7e7ed979 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 20 Apr 2020 16:29:46 +0800
Subject: Add webp checker for dev use

---
 layouts/partials/head.html    | 14 ++++++++++--
 layouts/partials/scripts.html | 50 +++++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 21 deletions(-)

(limited to 'layouts')

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index c5331cc..658030e 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -5,6 +5,7 @@
 <meta http-equiv="Cache-Control" content="no-transform">
 <meta http-equiv="Cache-Control" content="no-siteapp">
 {{ hugo.Generator }}
+
 {{ partial "favicon.html" . }}
 
 {{ if .IsHome }}
@@ -18,20 +19,29 @@
 <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 }}">
+
+<!-- global js -->
+{{ if .Site.Params.webpChecker }}
+{{ $webp := resources.Get "js/modernizr-webp.min.js" }}
+<script src="{{ $webp.Permalink }}"></script>
+{{ end }}
 {{ with .Site.Params.cdnIntersectionObserverJS }}
-<script src="{{ . }}"></script>{{ end }}
+<script src="{{ . }}"></script>
+{{ end }}
 <script src="{{ .Site.Params.cdnVanillaLazyloadJS }}"></script>
 <script src="{{ .Site.Params.cdnJQueryJS }}"></script>
 <script src="{{ .Site.Params.cdnProgessJS }}"></script>
+
+<!-- optional katex math cdnjs -->
 {{ if or .Params.math .Site.Params.math }}
 {{ partial "math.html" . }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index e807e36..d734202 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,13 +1,13 @@
-<!-- Comment loading indicator -->
 {{ if and (.IsPage) (.Site.Params.utterancesComment) }}
+<!-- comment loading indicator -->
 <script>
     $(function () {
-        var loadingBar = new ProgressBar.Circle('#loading-bar', {
-            color: '#8AA2D3',
+        var loadingBar = new ProgressBar.Circle("#loading-bar", {
+            color: "#8AA2D3",
             strokeWidth: 15,
-            trailColor: '#E5E2E4',
+            trailColor: "#E5E2E4",
             trailWidth: 15,
-            fill: '#E5E2E4'
+            fill: "#E5E2E4"
         });
         loadingBar.animate(1.0, {
             duration: 10000
@@ -18,13 +18,13 @@
         var commentCheckInterval = self.setInterval(checkUtterances, 500);
 
         function checkUtterances() {
-            commentStatus = $('#post-comment .utterances').attr('style');
+            commentStatus = $("#post-comment .utterances").attr("style");
             if (commentStatus === undefined) {
                 commentLoadingTime += 1;
                 if (commentLoadingTime > 20) {
                     clearInterval(commentCheckInterval);
-                    $('#post-comment').hide();
-                    $('#post-loading p').text('{{ i18n "postCommentLoadingFailed" }}');
+                    $("#post-comment").hide();
+                    $("#post-loading p").text('{{ i18n "postCommentLoadingFailed" }}');
                 }
                 return;
             } else {
@@ -32,28 +32,28 @@
                 loadingBar.animate(1.0, {
                     duration: 500
                 }, function () {
-                    $('#post-loading').hide();
+                    $("#post-loading").hide();
                 });
             }
         }
     });
 </script>
 {{ end }}
-<!-- Scroll to top button -->
 {{ if .Site.Params.scrollTop }}
+<!-- scroll to top button -->
 <script>
     $(function () {
-        var bar = new ProgressBar.Circle('#progress', {
-            color: '#8AA2D3',
+        var bar = new ProgressBar.Circle("#progress", {
+            color: "#8AA2D3",
             strokeWidth: 12,
-            trailColor: '#E5E2E4',
+            trailColor: "#E5E2E4",
             trailWidth: 12,
             text: {
                 value: '{{ partial "fas/fa-angle-up" . }}',
                 autoStyleContainer: false,
                 style: null
             },
-            fill: '#E5E2E4'
+            fill: "#E5E2E4"
         });
         var scrolled = ($(window).scrollTop() / ($(document).height() - $(window).height() - 1));
         bar.animate(scrolled);
@@ -67,15 +67,27 @@
             bar.set(scrolled);
         });
     });
-    $('#container-progress').click(function () {
-        $('html, body').animate({
+    $("#container-progress").click(function () {
+        $("html, body").animate({
             scrollTop: 0
-        }, 'slow');
-        return false;
+        }, "slow");
     });
 </script>
 {{ end }}
-<!-- Vanilla LazyLoad -->
+{{ if .Site.Params.webpChecker }}
+<!-- webp checker -->
+<script>
+    $(function () {
+        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>
+{{ end }}
+<!-- vanilla lazyload -->
 <script>
     $(function () {
         var lazyLoadInstance = new LazyLoad({
-- 
cgit v1.2.3


From ab5bb96c27dae05d187a566d56d2ff4adafada51 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 20 Apr 2020 17:19:48 +0800
Subject: Apply lazyload to images in markdown content

---
 layouts/_default/_markup/render-image.html | 1 +
 layouts/_default/_markup/render-link.html  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 layouts/_default/_markup/render-image.html

(limited to 'layouts')

diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
new file mode 100644
index 0000000..5242d97
--- /dev/null
+++ b/layouts/_default/_markup/render-image.html
@@ -0,0 +1 @@
+<p><img class="lazy" src="https://cdn.jsdelivr.net/gh/amzrk2/poal-jsdelivr@1.0.0/lazyload/dsr_loading.svg" data-src="{{ .Destination | safeURL }}" alt="{{ .Text }}" {{ with .Title }} title="{{ . }}"{{ end }} /></p>
\ 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
-- 
cgit v1.2.3


From 5ac03bbcf2b31fbc279a26eb7889668cb07c8298 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 20 Apr 2020 17:25:15 +0800
Subject: Enable robots.txt by default

---
 layouts/robots.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 layouts/robots.txt

(limited to 'layouts')

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
-- 
cgit v1.2.3


From 71ae6d1e825fdb782328653f121651dc515b29e9 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 20 Apr 2020 19:08:56 +0800
Subject: Optional lazy image instead of global set

---
 layouts/_default/_markup/render-image.html | 1 -
 layouts/partials/sidebar.html              | 2 +-
 layouts/shortcodes/lazyimg-col.html        | 1 +
 layouts/shortcodes/lazyimg-row.html        | 1 +
 layouts/shortcodes/lazyimg.html            | 1 +
 5 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 layouts/_default/_markup/render-image.html
 create mode 100644 layouts/shortcodes/lazyimg-col.html
 create mode 100644 layouts/shortcodes/lazyimg-row.html
 create mode 100644 layouts/shortcodes/lazyimg.html

(limited to 'layouts')

diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
deleted file mode 100644
index 5242d97..0000000
--- a/layouts/_default/_markup/render-image.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><img class="lazy" src="https://cdn.jsdelivr.net/gh/amzrk2/poal-jsdelivr@1.0.0/lazyload/dsr_loading.svg" data-src="{{ .Destination | safeURL }}" alt="{{ .Text }}" {{ with .Title }} title="{{ . }}"{{ end }} /></p>
\ No newline at end of file
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 61f2868..8b84596 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -32,6 +32,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="lazy" src="{{ $.Site.Params.cdnLazyPlaceholder }}" data-src="https://bgm.tv/chart/img/{{ . }}" />
 </div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/shortcodes/lazyimg-col.html b/layouts/shortcodes/lazyimg-col.html
new file mode 100644
index 0000000..0192ba5
--- /dev/null
+++ b/layouts/shortcodes/lazyimg-col.html
@@ -0,0 +1 @@
+<p><img class="lazy" src="{{ .Site.Params.cdnLazyPlaceholderCol }}" 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..dd07f93
--- /dev/null
+++ b/layouts/shortcodes/lazyimg-row.html
@@ -0,0 +1 @@
+<p><img class="lazy" src="{{ .Site.Params.cdnLazyPlaceholderRow }}" 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..a23a15e
--- /dev/null
+++ b/layouts/shortcodes/lazyimg.html
@@ -0,0 +1 @@
+<p><img class="lazy" src="{{ .Site.Params.cdnLazyPlaceholder }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
-- 
cgit v1.2.3


From ad5b896b798b792cd0cbc4ed6c1ec02a76620e95 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Mon, 20 Apr 2020 19:09:39 +0800
Subject: Fix 404 page

---
 layouts/404.html | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'layouts')

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
-- 
cgit v1.2.3


From d7fb3a9065eab673024c1ef5d0e6fd18b8a5d933 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 21 Apr 2020 10:09:31 +0800
Subject: Add word counter

---
 layouts/partials/post-meta.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'layouts')

diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html
index 3e90686..193b2fc 100644
--- a/layouts/partials/post-meta.html
+++ b/layouts/partials/post-meta.html
@@ -1,6 +1,9 @@
 <span class="post-meta-item post-meta-date">
     <time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }} | </time>
 </span>
+<span class="post-meta-item post-meta-count">
+    <span>{{ .WordCount }}{{ i18n "postMetaWordCount" }} | </span>
+</span>
 <span class="post-meta-item post-meta-tags">
     {{ if .Params.tags }}
     {{ range .Params.tags }}
-- 
cgit v1.2.3


From 94193538e3f10063bb31590108ea497d1a28084b Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Tue, 21 Apr 2020 10:44:00 +0800
Subject: Add TOC in post pages

---
 layouts/partials/sidebar.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'layouts')

diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 8b84596..0c3770d 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>
-- 
cgit v1.2.3


From 2c15f4495668f953709489133073ab2e7fa2efa8 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Wed, 22 Apr 2020 00:30:29 +0800
Subject: Change lazyload js

---
 layouts/partials/head.html          |  9 +++------
 layouts/partials/scripts.html       | 10 +---------
 layouts/shortcodes/lazyimg-col.html |  2 +-
 layouts/shortcodes/lazyimg-row.html |  2 +-
 layouts/shortcodes/lazyimg.html     |  2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'layouts')

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 658030e..f34ea88 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -30,16 +30,13 @@
 <link rel="stylesheet" href="{{ $style.Permalink }}">
 
 <!-- global js -->
+<script src="{{ .Site.Params.cdnJQueryJS }}"></script>
+<script src="{{ .Site.Params.cdnProgessJS }}"></script>
+<script src="{{ .Site.Params.cdnLazysizesAsyncJS }}" async></script>
 {{ if .Site.Params.webpChecker }}
 {{ $webp := resources.Get "js/modernizr-webp.min.js" }}
 <script src="{{ $webp.Permalink }}"></script>
 {{ end }}
-{{ 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>
 
 <!-- optional katex math cdnjs -->
 {{ if or .Params.math .Site.Params.math }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index d734202..79befb5 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -86,12 +86,4 @@
         });
     });
 </script>
-{{ end }}
-<!-- vanilla lazyload -->
-<script>
-    $(function () {
-        var lazyLoadInstance = new LazyLoad({
-            elements_selector: ".lazy"
-        });
-    });
-</script>
\ No newline at end of file
+{{ end }}
\ No newline at end of file
diff --git a/layouts/shortcodes/lazyimg-col.html b/layouts/shortcodes/lazyimg-col.html
index 0192ba5..0067762 100644
--- a/layouts/shortcodes/lazyimg-col.html
+++ b/layouts/shortcodes/lazyimg-col.html
@@ -1 +1 @@
-<p><img class="lazy" src="{{ .Site.Params.cdnLazyPlaceholderCol }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
+<p><img class="lazyload" src="{{ .Site.Params.cdnLazyPlaceholderCol }}" 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
index dd07f93..1e76de0 100644
--- a/layouts/shortcodes/lazyimg-row.html
+++ b/layouts/shortcodes/lazyimg-row.html
@@ -1 +1 @@
-<p><img class="lazy" src="{{ .Site.Params.cdnLazyPlaceholderRow }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
+<p><img class="lazyload" src="{{ .Site.Params.cdnLazyPlaceholderRow }}" 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
index a23a15e..468a901 100644
--- a/layouts/shortcodes/lazyimg.html
+++ b/layouts/shortcodes/lazyimg.html
@@ -1 +1 @@
-<p><img class="lazy" src="{{ .Site.Params.cdnLazyPlaceholder }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
+<p><img class="lazyload" src="{{ .Site.Params.cdnLazyPlaceholder }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
-- 
cgit v1.2.3


From f2b712d0b0922d3b0fd116611589dc25719e2bf8 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Wed, 22 Apr 2020 19:12:46 +0800
Subject: Adjust progressbar style

---
 layouts/partials/scripts.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'layouts')

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 79befb5..c47a474 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -45,12 +45,11 @@
     $(function () {
         var bar = new ProgressBar.Circle("#progress", {
             color: "#8AA2D3",
-            strokeWidth: 12,
+            strokeWidth: 10,
             trailColor: "#E5E2E4",
-            trailWidth: 12,
+            trailWidth: 10,
             text: {
                 value: '{{ partial "fas/fa-angle-up" . }}',
-                autoStyleContainer: false,
                 style: null
             },
             fill: "#E5E2E4"
-- 
cgit v1.2.3


From 49e162721ef7c83eb8859af8a83d6d1e95e5a79b Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Wed, 22 Apr 2020 19:22:13 +0800
Subject: Fix sidebar lazyload class

---
 layouts/partials/sidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts')

diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 0c3770d..3b782c6 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -38,6 +38,6 @@
 {{ with .Site.Params.bgmImageChart }}
 <div id="widget-bgm">
     <h5>{{ i18n "sidebarBangumiChart" }}</h5>
-    <img class="lazy" src="{{ $.Site.Params.cdnLazyPlaceholder }}" 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
-- 
cgit v1.2.3


From 7376c7f9e511b59638271861600305dd821c559a Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 10:51:20 +0800
Subject: Optional CDN assets

---
 layouts/partials/comment-utterances.html | 59 ++++++++++++++++++++++++++++++--
 layouts/partials/favicon.html            |  2 +-
 layouts/partials/head.html               | 59 ++++++++++++++++++++++----------
 layouts/partials/math.html               |  5 ---
 4 files changed, 97 insertions(+), 28 deletions(-)
 delete mode 100644 layouts/partials/math.html

(limited to 'layouts')

diff --git a/layouts/partials/comment-utterances.html b/layouts/partials/comment-utterances.html
index f515a72..9411ee5 100644
--- a/layouts/partials/comment-utterances.html
+++ b/layouts/partials/comment-utterances.html
@@ -1,10 +1,63 @@
 <div id="post-loading">
-    <div id="container-loading-bar">
-        <div id="loading-bar"></div>
+    <div class="loadingio-spinner-rolling-cfxk9ra3y9n">
+        <div class="loading-rolling">
+            <div></div>
+        </div>
     </div>
+    <style type="text/css">
+        @keyframes loading-rolling {
+            0% {
+                transform: translate(-50%, -50%) rotate(0deg);
+            }
+
+            100% {
+                transform: translate(-50%, -50%) rotate(360deg);
+            }
+        }
+
+        .loading-rolling div {
+            position: absolute;
+            width: 60px;
+            height: 60px;
+            border: 10px solid #8aa2d3;
+            border-top-color: transparent;
+            border-radius: 50%;
+        }
+
+        .loading-rolling div {
+            animation: loading-rolling 1s linear infinite;
+            top: 50px;
+            left: 50px
+        }
+
+        .loadingio-spinner-rolling-cfxk9ra3y9n {
+            width: 100px;
+            height: 100px;
+            display: inline-block;
+            overflow: hidden;
+            background: none;
+        }
+
+        .loading-rolling {
+            width: 100%;
+            height: 100%;
+            position: relative;
+            transform: translateZ(0) scale(1);
+            backface-visibility: hidden;
+            transform-origin: 0 0;
+            /* see note above */
+        }
+
+        .loading-rolling div {
+            box-sizing: content-box;
+        }
+
+        /* generated by https://loading.io/ */
+    </style>
     <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 }}"
+    <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
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/head.html b/layouts/partials/head.html
index f34ea88..9f3ef76 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,9 +1,9 @@
-<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" . }}
@@ -13,32 +13,53 @@
 {{ 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 }}{{ .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 }}">
+{{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options | resources.Fingerprint }}
+<link rel="stylesheet" href="{{ $style.Permalink }}" integrity="{{ $style.Data.Integrity }}" crossorigin="anonymous" />
 
-<!-- global js -->
-<script src="{{ .Site.Params.cdnJQueryJS }}"></script>
-<script src="{{ .Site.Params.cdnProgessJS }}"></script>
-<script src="{{ .Site.Params.cdnLazysizesAsyncJS }}" async></script>
+{{ 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>
+<script src="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/js/fontawesome.min.js" integrity="sha256-NP9NujdEzS5m4ZxvNqkcbxyHB0dTRy9hG13RwTVBGwo=" crossorigin="anonymous"></script>
+<!-- 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 }}
+{{ else }}
+<!-- global dependency -->
+{{ $jquery := resources.Get "js/jquery.min.js" | resources.Fingerprint }}
+<script src="{{ $jquery.Permalink }}" integrity="{{ $jquery.Data.Integrity }}" crossorigin="anonymous"></script>
+{{ $lazysizes := resources.Get "js/lazysizes.min.js" | resources.Fingerprint }}
+<script src="{{ $lazysizes.Permalink }}" integrity="{{ $lazysizes.Data.Integrity }}" crossorigin="anonymous"></script>
+{{ $fontawesome := resources.Get "js/fontawesome.min.js" | resources.Fingerprint }}
+<script src="{{ $fontawesome.Permalink }}" integrity="{{ $fontawesome.Data.Integrity }}" crossorigin="anonymous"></script>
+<!-- optional katex math -->
+{{ if or .Params.math .Site.Params.math }}
+{{ $katexCSS := resources.Get "css/katex.min.css" | resources.Fingerprint }}
+<link rel="stylesheet" href="{{ $katexCSS.Permalink }}" integrity="{{ $katexCSS.Data.Integrity }}" crossorigin="anonymous" />
+{{ $katexJS := resources.Get "js/katex.min.js" | resources.Fingerprint }}
+<script defer src="{{ $katexJS.Permalink }}" integrity="{{ $katexJS.Data.Integrity }}" crossorigin="anonymous"></script>
+{{ $katexRender := resources.Get "js/auto-render.min.js" | resources.Fingerprint }}
+<script defer src="{{ $katexRender.Permalink }}" integrity="{{ $katexRender.Data.Integrity }}" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script>
+{{ end }}
+{{ end }}
+
+<!-- dev use -->
 {{ if .Site.Params.webpChecker }}
 {{ $webp := resources.Get "js/modernizr-webp.min.js" }}
 <script src="{{ $webp.Permalink }}"></script>
-{{ end }}
-
-<!-- optional katex math cdnjs -->
-{{ if or .Params.math .Site.Params.math }}
-{{ partial "math.html" . }}
 {{ 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
-- 
cgit v1.2.3


From 77ec19755260ec2e65ef284a63d28129c42d70dc Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 11:50:45 +0800
Subject: Switch progressbar.js to fa

---
 layouts/_default/baseof.html                    |  4 +-
 layouts/partials/comment-utterances.html        | 56 +------------------------
 layouts/partials/fas/fa-angle-double-left.html  |  1 -
 layouts/partials/fas/fa-angle-double-right.html |  1 -
 layouts/partials/fas/fa-angle-left.html         |  1 -
 layouts/partials/fas/fa-angle-right.html        |  1 -
 layouts/partials/fas/fa-angle-up.html           |  1 -
 layouts/partials/head.html                      | 30 ++++++-------
 layouts/partials/scripts.html                   | 50 +++-------------------
 layouts/shortcodes/lazyimg-col.html             |  2 +-
 layouts/shortcodes/lazyimg-row.html             |  2 +-
 layouts/shortcodes/lazyimg.html                 |  2 +-
 12 files changed, 27 insertions(+), 124 deletions(-)
 delete mode 100644 layouts/partials/fas/fa-angle-double-left.html
 delete mode 100644 layouts/partials/fas/fa-angle-double-right.html
 delete mode 100644 layouts/partials/fas/fa-angle-left.html
 delete mode 100644 layouts/partials/fas/fa-angle-right.html
 delete mode 100644 layouts/partials/fas/fa-angle-up.html

(limited to 'layouts')

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a1eb732..d6e53f4 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -15,8 +15,8 @@
             <div class="col-md-3 col-12 float-left" id="sidebar">
                 {{ partial "sidebar.html" . }}
             </div>
-            <div id="container-progress">
-                <div id="progress"></div>
+            <div id="scroll-top">
+                <i class="fas fa-chevron-up"></i>
             </div>
         </div>
     </main>
diff --git a/layouts/partials/comment-utterances.html b/layouts/partials/comment-utterances.html
index 9411ee5..d217238 100644
--- a/layouts/partials/comment-utterances.html
+++ b/layouts/partials/comment-utterances.html
@@ -1,59 +1,5 @@
 <div id="post-loading">
-    <div class="loadingio-spinner-rolling-cfxk9ra3y9n">
-        <div class="loading-rolling">
-            <div></div>
-        </div>
-    </div>
-    <style type="text/css">
-        @keyframes loading-rolling {
-            0% {
-                transform: translate(-50%, -50%) rotate(0deg);
-            }
-
-            100% {
-                transform: translate(-50%, -50%) rotate(360deg);
-            }
-        }
-
-        .loading-rolling div {
-            position: absolute;
-            width: 60px;
-            height: 60px;
-            border: 10px solid #8aa2d3;
-            border-top-color: transparent;
-            border-radius: 50%;
-        }
-
-        .loading-rolling div {
-            animation: loading-rolling 1s linear infinite;
-            top: 50px;
-            left: 50px
-        }
-
-        .loadingio-spinner-rolling-cfxk9ra3y9n {
-            width: 100px;
-            height: 100px;
-            display: inline-block;
-            overflow: hidden;
-            background: none;
-        }
-
-        .loading-rolling {
-            width: 100%;
-            height: 100%;
-            position: relative;
-            transform: translateZ(0) scale(1);
-            backface-visibility: hidden;
-            transform-origin: 0 0;
-            /* see note above */
-        }
-
-        .loading-rolling div {
-            box-sizing: content-box;
-        }
-
-        /* generated by https://loading.io/ */
-    </style>
+    <i class="fas fa-circle-notch fa-spin"></i>
     <p>{{ i18n "postCommentLoading" }}</p>
 </div>
 <div id="post-comment">
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/head.html b/layouts/partials/head.html
index 9f3ef76..05670e5 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -25,14 +25,14 @@
 
 <!-- global css -->
 {{ $options := (dict "targetPath" "css/main.min.css" "outputStyle" "compressed") }}
-{{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options | resources.Fingerprint }}
-<link rel="stylesheet" href="{{ $style.Permalink }}" integrity="{{ $style.Data.Integrity }}" crossorigin="anonymous" />
+{{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options }}
+<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>
-<script src="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.13.0/js/fontawesome.min.js" integrity="sha256-NP9NujdEzS5m4ZxvNqkcbxyHB0dTRy9hG13RwTVBGwo=" 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">
 <!-- 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" />
@@ -41,20 +41,20 @@
 {{ end }}
 {{ else }}
 <!-- global dependency -->
-{{ $jquery := resources.Get "js/jquery.min.js" | resources.Fingerprint }}
-<script src="{{ $jquery.Permalink }}" integrity="{{ $jquery.Data.Integrity }}" crossorigin="anonymous"></script>
-{{ $lazysizes := resources.Get "js/lazysizes.min.js" | resources.Fingerprint }}
-<script src="{{ $lazysizes.Permalink }}" integrity="{{ $lazysizes.Data.Integrity }}" crossorigin="anonymous"></script>
-{{ $fontawesome := resources.Get "js/fontawesome.min.js" | resources.Fingerprint }}
-<script src="{{ $fontawesome.Permalink }}" integrity="{{ $fontawesome.Data.Integrity }}" crossorigin="anonymous"></script>
+{{ $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 }}" />
 <!-- optional katex math -->
 {{ if or .Params.math .Site.Params.math }}
-{{ $katexCSS := resources.Get "css/katex.min.css" | resources.Fingerprint }}
-<link rel="stylesheet" href="{{ $katexCSS.Permalink }}" integrity="{{ $katexCSS.Data.Integrity }}" crossorigin="anonymous" />
-{{ $katexJS := resources.Get "js/katex.min.js" | resources.Fingerprint }}
-<script defer src="{{ $katexJS.Permalink }}" integrity="{{ $katexJS.Data.Integrity }}" crossorigin="anonymous"></script>
-{{ $katexRender := resources.Get "js/auto-render.min.js" | resources.Fingerprint }}
-<script defer src="{{ $katexRender.Permalink }}" integrity="{{ $katexRender.Data.Integrity }}" crossorigin="anonymous" onload="renderMathInElement(document.body);"></script>
+{{ $katexCSS := resources.Get "css/katex.min.css" }}
+<link rel="stylesheet" href="{{ $katexCSS.Permalink }}" />
+{{ $katexJS := resources.Get "js/katex.min.js" }}
+<script defer src="{{ $katexJS.Permalink }}"></script>
+{{ $katexRender := resources.Get "js/auto-render.min.js" }}
+<script defer src="{{ $katexRender.Permalink }}" onload="renderMathInElement(document.body);"></script>
 {{ end }}
 {{ end }}
 
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index c47a474..8294611 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -2,38 +2,24 @@
 <!-- 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);
 
         function checkUtterances() {
-            commentStatus = $("#post-comment .utterances").attr("style");
+            commentStatus = $('#post-comment .utterances').attr('style');
             if (commentStatus === undefined) {
                 commentLoadingTime += 1;
                 if (commentLoadingTime > 20) {
                     clearInterval(commentCheckInterval);
-                    $("#post-comment").hide();
-                    $("#post-loading p").text('{{ i18n "postCommentLoadingFailed" }}');
+                    $('#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();
             }
         }
     });
@@ -42,31 +28,7 @@
 {{ if .Site.Params.scrollTop }}
 <!-- scroll to top button -->
 <script>
-    $(function () {
-        var bar = new ProgressBar.Circle("#progress", {
-            color: "#8AA2D3",
-            strokeWidth: 10,
-            trailColor: "#E5E2E4",
-            trailWidth: 10,
-            text: {
-                value: '{{ partial "fas/fa-angle-up" . }}',
-                style: null
-            },
-            fill: "#E5E2E4"
-        });
-        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);
-        });
-    });
-    $("#container-progress").click(function () {
+    $("#scroll-top").click(function () {
         $("html, body").animate({
             scrollTop: 0
         }, "slow");
diff --git a/layouts/shortcodes/lazyimg-col.html b/layouts/shortcodes/lazyimg-col.html
index 0067762..c973e67 100644
--- a/layouts/shortcodes/lazyimg-col.html
+++ b/layouts/shortcodes/lazyimg-col.html
@@ -1 +1 @@
-<p><img class="lazyload" src="{{ .Site.Params.cdnLazyPlaceholderCol }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
+<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
index 1e76de0..83c604e 100644
--- a/layouts/shortcodes/lazyimg-row.html
+++ b/layouts/shortcodes/lazyimg-row.html
@@ -1 +1 @@
-<p><img class="lazyload" src="{{ .Site.Params.cdnLazyPlaceholderRow }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
+<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
index 468a901..f9c6959 100644
--- a/layouts/shortcodes/lazyimg.html
+++ b/layouts/shortcodes/lazyimg.html
@@ -1 +1 @@
-<p><img class="lazyload" src="{{ .Site.Params.cdnLazyPlaceholder }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
+<p><img class="lazyload" src="{{ .Site.Params.lazyPlaceholder }}" data-src="{{ index .Params 1 }}" alt="{{ index .Params 0 }}" /></p>
\ No newline at end of file
-- 
cgit v1.2.3


From e70742788897138cfb971f78618641a4190707f4 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 13:23:34 +0800
Subject: Pagination adjustment

---
 layouts/_default/archives.html           |  8 ++++----
 layouts/_default/list.html               | 10 +++++-----
 layouts/_default/tag.html                | 10 +++++-----
 layouts/partials/comment-utterances.html |  4 +---
 layouts/partials/footer.html             |  6 +-----
 layouts/partials/head.html               | 18 +++++-------------
 layouts/partials/post-meta.html          |  4 ++--
 layouts/partials/scripts.html            |  3 +--
 8 files changed, 24 insertions(+), 39 deletions(-)

(limited to 'layouts')

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/list.html b/layouts/_default/list.html
index 567e577..a4cdf89 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -13,7 +13,7 @@
         {{ .Summary }}
     </div>
     <div id="post-exlink">
-        <a href="{{ .Permalink }}#">&gt; 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/tag.html b/layouts/_default/tag.html
index dd15f58..026af4c 100644
--- a/layouts/_default/tag.html
+++ b/layouts/_default/tag.html
@@ -16,7 +16,7 @@
         {{ .Summary }}
     </div>
     <div id="post-exlink">
-        <a href="{{ .Permalink }}#">&gt; READ MORE ...</a>
+        <a href="{{ .Permalink }}"><i class="fas fa-chevron-right"></i> READ MORE ...</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="{{ .Permalink }}"><i class="fas fa-angle-right"></i> READ MORE <i class="fas fa-angle-left"></i></a>
     </li>
     {{ end }}
 </ul>
diff --git a/layouts/partials/comment-utterances.html b/layouts/partials/comment-utterances.html
index d217238..b41aef4 100644
--- a/layouts/partials/comment-utterances.html
+++ b/layouts/partials/comment-utterances.html
@@ -3,7 +3,5 @@
     <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>
+    <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
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>
-            &copy; {{ 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>&copy; {{ 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 05670e5..305106d 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -33,12 +33,6 @@
 <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">
-<!-- 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 }}
 {{ else }}
 <!-- global dependency -->
 {{ $jquery := resources.Get "js/jquery.min.js" }}
@@ -47,15 +41,13 @@
 <script src="{{ $lazysizes.Permalink }}"></script>
 {{ $fontawesome := resources.Get "css/all.min.css" }}
 <link rel="stylesheet" href="{{ $fontawesome.Permalink }}" />
+{{ end }}
+
 <!-- optional katex math -->
 {{ if or .Params.math .Site.Params.math }}
-{{ $katexCSS := resources.Get "css/katex.min.css" }}
-<link rel="stylesheet" href="{{ $katexCSS.Permalink }}" />
-{{ $katexJS := resources.Get "js/katex.min.js" }}
-<script defer src="{{ $katexJS.Permalink }}"></script>
-{{ $katexRender := resources.Get "js/auto-render.min.js" }}
-<script defer src="{{ $katexRender.Permalink }}" onload="renderMathInElement(document.body);"></script>
-{{ end }}
+<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 -->
diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html
index 193b2fc..0164619 100644
--- a/layouts/partials/post-meta.html
+++ b/layouts/partials/post-meta.html
@@ -1,8 +1,8 @@
 <span class="post-meta-item post-meta-date">
-    <time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }} | </time>
+    <time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }}</time> |
 </span>
 <span class="post-meta-item post-meta-count">
-    <span>{{ .WordCount }}{{ i18n "postMetaWordCount" }} | </span>
+    <span>{{ .WordCount }}{{ i18n "postMetaWordCount" }}</span> |
 </span>
 <span class="post-meta-item post-meta-tags">
     {{ if .Params.tags }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 8294611..a6dc367 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -41,8 +41,7 @@
     $(function () {
         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");
+                $('<blockquote><p>{{ i18n "webpCheckerFront" }}<a href="https://caniuse.com/#feat=webp" target="_blank">WebP</a>{{ i18n "webpCheckerEnd" }}</p></blockquote>').replaceAll("#content img");
             }
         });
     });
-- 
cgit v1.2.3


From 14dececfd2ac91e1be402d3ebfff61974b3d76a1 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 14:14:13 +0800
Subject: Update font stack & resources

---
 layouts/partials/scripts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts')

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index a6dc367..48a056e 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -31,7 +31,7 @@
     $("#scroll-top").click(function () {
         $("html, body").animate({
             scrollTop: 0
-        }, "slow");
+        });
     });
 </script>
 {{ end }}
-- 
cgit v1.2.3


From d30f92f438636baf9ba364a30b87a182713696c5 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 14:33:14 +0800
Subject: Fix a space minify issue

---
 layouts/_default/list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts')

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index a4cdf89..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 }}"><i class="fas fa-angle-right"></i> READ MORE <i class="fas fa-angle-left"></i></a>
+        <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a>
     </div>
 </div>
 {{ end }}
-- 
cgit v1.2.3


From 79d5fe67c9e96e5de250cd74412d3ce7993ad862 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 14:37:43 +0800
Subject: Fix tags page pagination navbar

---
 layouts/_default/tag.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'layouts')

diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
index 026af4c..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 }}"><i class="fas fa-chevron-right"></i> READ MORE ...</a>
+        <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i>&nbsp;READ MORE&nbsp;<i class="fas fa-angle-left"></i></a>
     </div>
 </div>
 {{ end }}
@@ -71,7 +71,7 @@
     {{ end }}
     {{ if ne $paginator.PageNumber $paginator.TotalPages }}
     <li class="pag-last">
-        <a href="{{ .Permalink }}"><i class="fas fa-angle-right"></i> READ MORE <i class="fas fa-angle-left"></i></a>
+        <a href="{{ $paginator.Last.URL }}"><i class="fas fa-angle-double-right"></i></a>
     </li>
     {{ end }}
 </ul>
-- 
cgit v1.2.3


From 39d85cc63387f940dcfd6cef1a6d43d2cc4ebdf1 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 19:36:26 +0800
Subject: Support in-post or global APlayer

---
 layouts/_default/baseof.html    |  5 +++++
 layouts/_default/single.html    |  3 +++
 layouts/partials/head.html      | 12 +++++++++++-
 layouts/partials/post-meta.html |  6 +++---
 layouts/partials/scripts.html   | 35 +++++++++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 4 deletions(-)

(limited to 'layouts')

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index d6e53f4..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>
+            {{ 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/single.html b/layouts/_default/single.html
index 04d016c..7bd92e8 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>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 305106d..5b6de37 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -33,6 +33,10 @@
 <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" }}
@@ -41,10 +45,16 @@
 <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 }}
+{{ 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>
diff --git a/layouts/partials/post-meta.html b/layouts/partials/post-meta.html
index 0164619..7e5b47b 100644
--- a/layouts/partials/post-meta.html
+++ b/layouts/partials/post-meta.html
@@ -1,10 +1,10 @@
-<span class="post-meta-item post-meta-date">
+<span>
     <time datetime="{{ .Date }}">{{ .Date.Format "2006-01-02" }}</time> |
 </span>
-<span class="post-meta-item post-meta-count">
+<span>
     <span>{{ .WordCount }}{{ i18n "postMetaWordCount" }}</span> |
 </span>
-<span class="post-meta-item post-meta-tags">
+<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 48a056e..cd47e6f 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -25,6 +25,41 @@
     });
 </script>
 {{ end }}
+{{ with .Params.playerURL }}
+<script>
+    $(function () {
+        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 }}"
+            }]
+        });
+    });
+</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 }}"
+            }]
+        });
+    });
+</script>
+{{ end }}
 {{ if .Site.Params.scrollTop }}
 <!-- scroll to top button -->
 <script>
-- 
cgit v1.2.3


From 0ed932121cd278fa1678e518728e7bb728bd1a9a Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 19:42:06 +0800
Subject: Adjust comments settings

---
 layouts/_default/single.html             |  4 ----
 layouts/partials/comment-disqus.html     | 10 ++++++----
 layouts/partials/comment-utterances.html |  6 ++++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'layouts')

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 7bd92e8..6056021 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -20,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/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 b41aef4..b3edfbd 100644
--- a/layouts/partials/comment-utterances.html
+++ b/layouts/partials/comment-utterances.html
@@ -1,7 +1,9 @@
+{{ with .Site.Params.utterancesRepo }}
 <div id="post-loading">
     <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
-- 
cgit v1.2.3


From 47e7b0846e68cd0713d8ff00763351c81486c725 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 19:43:29 +0800
Subject: Fix comment loading indicator

---
 layouts/partials/scripts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts')

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index cd47e6f..2f83c91 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,4 +1,4 @@
-{{ if and (.IsPage) (.Site.Params.utterancesComment) }}
+{{ if and (.IsPage) (.Site.Params.utterancesRepo) }}
 <!-- comment loading indicator -->
 <script>
     $(function () {
-- 
cgit v1.2.3


From fc1e94bba67b0ac4523d67963a2ffa227abb0da1 Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 19:49:06 +0800
Subject: SEO optimization fix

---
 layouts/partials/head.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'layouts')

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 5b6de37..78e5aab 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -14,7 +14,7 @@
 <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="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 ", " }}" />
 {{ end }}
-- 
cgit v1.2.3


From 29f2e593583861173b212c0495dec2e26206072b Mon Sep 17 00:00:00 2001
From: amzrk2
Date: Thu, 23 Apr 2020 20:15:48 +0800
Subject: Update metadata

---
 layouts/partials/head.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'layouts')

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 78e5aab..9f4dda7 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -32,9 +32,9 @@
 <!-- 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">
+<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">
+<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 }}
-- 
cgit v1.2.3