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