Merge branch 'master' into canary

layouts/_default/baseof.html

@@ -18,10 +18,10 @@
             {{- block "left-sidebar" . -}}
                 {{ partial "sidebar/left.html" . }}
             {{- end -}}
+            {{- block "right-sidebar" . -}}{{ end }}
             <main class="main full-width">
                 {{- block "main" . }}{{- end }}
             </main>
-            {{- block "right-sidebar" . -}}{{ end }}
         </div>
         {{ partial "footer/include.html" . }}
     </body>

layouts/partials/article/components/details.html

@@ -23,9 +23,12 @@
         {{ end }}
     </div>
 
-    {{ if or (not .Date.IsZero) (.Site.Params.article.readingTime) }}
+    {{ $showReadingTime := .Params.readingTime | default (.Site.Params.article.readingTime) }}
+    {{ $showDate := not .Date.IsZero }}
+    {{ $showFooter := or $showDate $showReadingTime }}
+    {{ if $showFooter }}
     <footer class="article-time">
-        {{ if not .Date.IsZero }}
+        {{ if $showDate }}
             <div>
                 {{ partial "helper/icon" "date" }}
                 <time class="article-time--published">
@@ -34,7 +37,7 @@
             </div>
         {{ end }}
 
-        {{ if .Site.Params.article.readingTime }}
+        {{ if $showReadingTime }}
             <div>
                 {{ partial "helper/icon" "clock" }}
                 <time class="article-time--reading">
@@ -55,4 +58,4 @@
             </div>
         </footer>
     {{ end }}
-</div>
+</div>

layouts/partials/comments/provider/giscus.html

@@ -6,8 +6,10 @@
     data-category="{{- .category -}}"
     data-category-id="{{- .categoryID -}}"
     data-mapping="{{- default `title` .mapping -}}"
+    data-strict="{{- default 0 .strict -}}"
     data-reactions-enabled="{{- default 1 .reactionsEnabled -}}"
     data-emit-metadata="{{- default 0 .emitMetadata -}}"
+    data-input-position="{{- default `top` .inputPosition -}}"
     data-theme="{{- default `light` .lightTheme -}}"
     data-lang="{{- default `en` .lang -}}"
     crossorigin="anonymous"

layouts/partials/comments/provider/remark42.html

@@ -2,10 +2,10 @@
 <div id="remark42"></div>
 <script>
     var remark_config = {
-        host: "{{ .host }}",
+        host: '{{ .host }}',
         site_id: '{{ .site }}',
         components: ['embed'],
-        url: "{{ $.Permalink }}",
+        url: '{{ $.Permalink }}',
         max_shown_comments: {{ default 15 .max_shown_comments }},
         theme: document.documentElement.dataset.scheme,
         page_title: '{{ $.Title }}',
@@ -13,14 +13,14 @@
         show_email_subscription: {{ default true .show_email_subscription }}
     };
 
-    (function (c) {
-        for (var i = 0; i < c.length; i++) {
-            var d = document, s = d.createElement('script');
-            s.src = remark_config.host + '/web/' + c[i] + '.js';
-            s.defer = true;
-            (d.head || d.body).appendChild(s);
+    function(e, n) {
+        for (var o = 0; o < e.length; o++) {
+            var r = n.createElement('script'),
+            c = '.js',
+            d = n.head || n.body;
+            'noModule' in r ? (r.type = 'module', c = '.mjs') : r.async = !0, r.defer = !0, r.src = remark_config.host + '/web/' + e[o] + c, d.appendChild(r)
         }
-    })(remark_config.components || ['embed']);
+    }(remark_config.components || ['embed'], document);
 
     window.addEventListener('onColorSchemeChange', (e) => {
         window.REMARK42.changeTheme(e.detail);

layouts/partials/data/description.html

@@ -1,6 +1,11 @@
 <!-- Use site subtitle by default -->
 {{ $description := .Site.Params.sidebar.subtitle }}
 
+<!-- Seprate description exists -->
+{{ if .Site.Params.description }}
+    {{ $description = .Site.Params.description }}
+{{ end }}
+
 {{ if .Description }}
     <!-- Page description exists -->
     {{ $description = .Description }}

layouts/partials/head/head.html

@@ -3,6 +3,7 @@
 
 {{- $description := partialCached "data/description" . .RelPermalink -}}
 <meta name='description' content='{{ $description }}'>
+{{ with .Params.Keywords }}<meta name="keywords" content="{{ delimit . ", " }}">{{ end }}
 
 {{- $title := partialCached "data/title" . .RelPermalink -}}
 <title>{{ $title }}</title>

layouts/partials/sidebar/left.html

@@ -45,6 +45,7 @@
                         href='{{ .URL }}'
                         {{ if eq (default true .Params.newTab) true }}target="_blank"{{ end }}
                         {{ with .Name }}title="{{ . }}"{{ end }}
+                        rel="me"
                     >
                         {{ $icon := default "link" .Params.Icon }}
                         {{ with $icon }}