Optional CDN assets

4 files changed, 97 insertions, 28 deletions

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