Merge branch 'master' into drop-non-extended

assets/icons/date.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-calendar-time" width="56" height="56" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z"/>
+  <path d="M11.795 21h-6.795a2 2 0 0 1 -2 -2v-12a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v4" />
+  <circle cx="18" cy="18" r="4" />
+  <path d="M15 3v4" />
+  <path d="M7 3v4" />
+  <path d="M3 11h16" />
+  <path d="M18 16.496v1.504l1 1" />
+</svg>

assets/scss/partials/article.scss

@@ -95,7 +95,9 @@
     display: flex;
     align-items: center;
     color: var(--card-text-color-tertiary);
+    gap: 15px;
     margin-top: 10px;
+    flex-wrap: wrap;
 
     svg {
         vertical-align: middle;
@@ -108,6 +110,11 @@
     time {
         font-size: 1.4rem;
     }
+
+    & > div {
+        display: inline-flex;
+        align-items: center;
+    }
 }
 
 .article-category,

assets/scss/partials/layout/article.scss

@@ -70,6 +70,12 @@
                 flex-wrap: wrap;
                 text-transform: unset;
             }
+
+            .article-copyright {
+                a {
+                    color: var(--body-text-color);
+                }
+            }
         }
     }
 }
@@ -185,32 +191,40 @@
     display: flex;
     flex-direction: column;
     color: var(--card-text-color-main);
+    overflow: hidden;
 
     #TableOfContents {
-        ol {
+        overflow-x: auto;
-            counter-reset: item;
+        max-height: 75vh;
-            list-style-type: none;
+
-            padding: 0;
+        ol,
+        ul {
             margin: 0;
+            padding: 0;
         }
 
-        & > li {
+        ol {
-            padding: 0;
+            list-style-type: none;
-            margin: 0;
+            counter-reset: item;
+
+            li:before {
+                counter-increment: item;
+                content: counters(item, ".") ". ";
+                font-weight: bold;
+                margin-right: 5px;
+            }
+        }
+
+        & > ul {
+            padding: 0 1em;
         }
 
         li {
             margin: 15px 20px;
             padding: 5px;
 
-            &::before {
+            & > ol,
-                counter-increment: item;
+            & > ul {
-                content: counters(item, ".") ". ";
-                font-weight: bold;
-                margin-right: 5px;
-            }
-
-            & > ol {
                 margin-top: 10px;
                 padding-left: 10px;
                 margin-bottom: -5px;
@@ -379,7 +393,8 @@
         padding-bottom: 56.25%;
         overflow: hidden;
 
-        & > iframe {
+        & > iframe,
+        & > video {
             position: absolute;
             width: 100%;
             height: 100%;

data/external.yaml

@@ -23,16 +23,16 @@ PhotoSwipe:
       type: style
 
 KaTeX:
-    - src: https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.css
+    - src: https://cdn.jsdelivr.net/npm/katex@0.13.13/dist/katex.min.css
-      integrity: sha384-AfEj0r4/OFrOo5t7NnNe46zW/tFgW6x/bCJG8FqQCEo3+Aro6EYUG4+cU+KJWu/X
+      integrity: sha384-RZU/ijkSsFbcmivfdRBQDtwuwVqK7GMOw6IMvKyeWL2K5UAlyp6WonmB8m7Jd0Hn
       type: style
 
-    - src: https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.js
+    - src: https://cdn.jsdelivr.net/npm/katex@0.13.13/dist/katex.min.js
-      integrity: sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4
+      integrity: sha384-pK1WpvzWVBQiP0/GjnvRxV4mOb0oxFuyRxJlk6vVw146n3egcN5C925NCP7a7BY8
       type: script
       defer: true
 
-    - src: https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/contrib/auto-render.min.js
+    - src: https://cdn.jsdelivr.net/npm/katex@0.13.13/dist/contrib/auto-render.min.js
-      integrity: sha384-mll67QQFJfxn0IYznZYonOWZ644AWYC+Pt2cHqMaRhXVrursRwvLnLaebdGIlYNa
+      integrity: sha384-vZTG03m+2yp6N6BNi5iM4rW4oIwk5DfcNdFfxkk9ZWpDriOkXX8voJBFrAO7MpVl
       type: script
       defer: true

exampleSite/config.yaml

@@ -11,7 +11,7 @@ disqusShortname: hugo-theme-stack
 googleAnalytics:
 
 # Theme i18n support
-# Available values: en, fr, id, ja, ko, pt-br, zh-cn, es, de, nl
+# Available values: en, fr, id, ja, ko, pt-br, zh-cn, es, de, nl, it
 DefaultContentLanguage: en
 
 permalinks:
@@ -37,12 +37,14 @@ params:
         emoji: 🍥
         subtitle: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
         avatar:
+            enabled: true
             local: true
             src: img/avatar.png
 
     article:
         math: false
         toc: true
+        readingTime: true
         license:
             enabled: true
             default: Licensed under CC BY-NC-SA 4.0
@@ -85,6 +87,12 @@ params:
             locale:
                 admin: Admin
 
+        twikoo:
+            envId:
+            region:
+            path:
+            lang:
+
     widgets:
         enabled:
             - search

i18n/en.yaml

@@ -29,6 +29,11 @@ article:
     lastUpdatedOn:
         other: Last updated on
 
+    readingTime:
+        one: "{{ .Count }} min read"
+        ### Seems that there's no need to add 's' even if it's plural in English
+        other: "{{ .Count }} min read"
+
 notFound:
     title:
         other: Not Found

i18n/id.yaml

@@ -1,24 +1,52 @@
 toggleMenu:
     other: Tampilkan Menu
 
+darkMode:
+    other: Mode Gelap
+
+list:
+    page:
+        one: "{{ .Count }} halaman"
+        other: "{{ .Count }} halaman"
+
+    section:
+        other: Bagian
+
+    subsection:
+        one: Subbagian
+        other: Subbagian
+
 article:
+    back:
+        other: Kembali
+
+    tableOfContents:
+        other: Daftar Isi
+
     relatedContents:
         other: Konten terkait
+
     lastUpdatedOn:
         other: Terakhir diperbarui pada
 
+    readingTime:
+        one: "Waktu Membaca: {{ .Count }} menit"
+        other: "Waktu Membaca: {{ .Count }} menit"
+
 notFound:
     title:
-        other: Not Found
+        other: Tidak ditemukan
     subtitle:
-        other: Halaman ini tidak ada.
+        other: Halaman yang Anda akses tidak ditemukan.
 
 widget:
     archives:
         title:
             other: Arsip
+
         more:
             other: Lebih
+
     tagCloud:
         title:
             other: Tag
@@ -26,13 +54,16 @@ widget:
 search:
     title:
         other: Cari
+
     placeholder:
         other: Ketik sesuatu...
+
     resultTitle:
         other: "#PAGES_COUNT halaman (#TIME_SECONDS detik)"
 
 footer:
     builtWith:
         other: Dibangun dengan {{ .Generator }}
+
     designedBy:
         other: Tema {{ .Theme }} dirancang oleh {{ .DesignedBy }}

i18n/it.yaml

@@ -0,0 +1,69 @@
+toggleMenu:
+    other: Toggle Menu
+
+darkMode:
+    other: Dark Mode
+
+list:
+    page:
+        one: "{{ .Count }} pagina"
+        other: "{{ .Count }} pagine"
+
+    section:
+        other: Sezione
+
+    subsection:
+        one: Sottosezione
+        other: Sottosezioni
+
+article:
+    back:
+        other: Indietro
+
+    tableOfContents:
+        other: Indice
+
+    relatedContents:
+        other: Contenuti correlati
+
+    lastUpdatedOn:
+        other: Aggiornato il
+
+    readingTime:
+        one: "{{ .Count }} min per leggere"
+        other: "{{ .Count }} min per leggere"
+
+notFound:
+    title:
+        other: Non trovato
+    subtitle:
+        other: Questa pagina non esiste.
+
+widget:
+    archives:
+        title:
+            other: Archivi
+
+        more:
+            other: Di più
+
+    tagCloud:
+        title:
+            other: Tags
+
+search:
+    title:
+        other: Cerca
+
+    placeholder:
+        other: Scrivi qualcosa...
+
+    resultTitle:
+        other: "#PAGES_COUNT pagine (#TIME_SECONDS secondi)"
+
+footer:
+    builtWith:
+        other: Realizzato con {{ .Generator }}
+
+    designedBy:
+        other: Tema {{ .Theme }} realizzato da {{ .DesignedBy }}

i18n/ja.yaml

@@ -17,6 +17,9 @@ article:
     lastUpdatedOn:
         other: 最終更新
 
+    readingTime:
+        other: "読了時間: {{ .Count }}分"
+
 notFound:
     title:
         other: 404 Not Found

i18n/ru.yaml

@@ -21,10 +21,14 @@ list:
         other: Подразделы
 
 article:
+    back:
+        other: Назад
     relatedContents:
         other: Также рекомендуем
     lastUpdatedOn:
         other: Обновлено
+    tableOfContents: 
+        other: Содержание
 
 notFound:
     title:

i18n/zh-CN.yaml

@@ -17,6 +17,9 @@ article:
     lastUpdatedOn:
         other: 最后更新于
 
+    readingTime:
+        other: "阅读时长: {{ .Count }} 分钟"
+
 notFound:
     title:
         other: 404 错误

layouts/partials/article/components/details.html

@@ -21,12 +21,25 @@
     </h3>
     {{ end }}
 
-    {{- if not .Date.IsZero -}}
+    {{ if or (not .Date.IsZero) (.Site.Params.article.readingTime) }}
     <footer class="article-time">
-        {{ partial "helper/icon" "clock" }}
+        {{ if not .Date.IsZero }}
+            <div>
+                {{ partial "helper/icon" "date" }}
                 <time class="article-time--published">
                     {{- .Date.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") -}}
                 </time>
-    </footer>
+            </div>
-    {{- end -}}
+        {{ end }}
+
+        {{ if .Site.Params.article.readingTime }}
+            <div>
+                {{ partial "helper/icon" "clock" }}
+                <time class="article-time--reading">
+                    {{ T "article.readingTime" .ReadingTime }}
+                </time>
+            </div>
+        {{ end }}
+    </footer>
+    {{ end }}
 </div>

layouts/partials/article/components/footer.html

@@ -4,7 +4,7 @@
     {{ if and (.Site.Params.article.license.enabled) (not (eq .Params.license false)) }}
     <section class="article-copyright">
         {{ partial "helper/icon" "copyright" }}
-        <span>{{ default .Site.Params.article.license.default .Params.license }}</span>
+        <span>{{ default .Site.Params.article.license.default .Params.license | markdownify }}</span>
     </section>
     {{ end }}
 

layouts/partials/comments/provider/twikoo.html

@@ -0,0 +1,49 @@
+<script src="//cdn.jsdelivr.net/npm/twikoo@1.4.3/dist/twikoo.all.min.js"></script>
+<div id="tcomment"></div>
+<style>
+    .twikoo {
+        background-color: var(--card-background);
+        border-radius: var(--card-border-radius);
+        box-shadow: var(--shadow-l1);
+        padding: var(--card-padding);
+    }
+    :root[data-scheme="dark"] {
+        --twikoo-body-text-color-main: rgba(255, 255, 255, 0.9);
+        --twikoo-body-text-color: rgba(255, 255, 255, 0.7);
+    }
+    .twikoo .el-input-group__prepend,
+    .twikoo .tk-action-icon,
+    .twikoo .tk-time,
+    .twikoo .tk-comments-count {
+        color: var(--twikoo-body-text-color);
+    }
+    .twikoo .el-input__inner,
+    .twikoo .el-textarea__inner,
+    .twikoo .tk-preview-container,
+    .twikoo .tk-content,
+    .twikoo .tk-nick,
+    .twikoo .tk-send {
+        color: var(--twikoo-body-text-color-main);
+    }
+    .twikoo .el-button{
+        color: var(--twikoo-body-text-color)!important;
+    }
+</style>
+
+{{- with .Site.Params.comments.twikoo -}}
+<script>
+    twikoo.init({
+        envId: '{{- .envId -}}',
+        el: '#tcomment',
+        {{- with .region -}}
+        region: '{{- . -}}',
+        {{- end -}}
+        {{- with .path -}}
+        path: '{{- . -}}',
+        {{- end -}}
+        {{- with .lang -}}
+        lang: '{{- . -}}',
+        {{- end -}}
+    })
+</script>
+{{- end -}}

layouts/partials/sidebar/left.html

@@ -7,6 +7,7 @@
 
     <header class="site-info">
         {{ with .Site.Params.sidebar.avatar }}
+            {{ if (default true .enabled) }}
             <figure class="site-avatar">
                 {{ if not .local }}
                     <img src="{{ .src }}" width="300" height="300" class="site-logo" loading="lazy" alt="Avatar">
@@ -27,6 +28,7 @@
                 {{ end }}
             </figure>
             {{ end }}
+        {{ end }}
         <h1 class="site-name"><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1>
         <h2 class="site-description">{{ .Site.Params.sidebar.subtitle }}</h2>
     </header>

layouts/shortcodes/video.html

@@ -0,0 +1,13 @@
+<div class="video-wrapper">
+    <video
+    controls
+    {{ with .Get "poster" }}poster="{{- . -}}"{{ end }}
+    {{ with .Get "src" }}src="{{- . -}}"{{ end }}
+    {{ with .Get "autoplay" }}autoplay{{ end }}
+    >
+        <p>
+            Your browser doesn't support HTML5 video. Here is a
+            <a href="{{ with .Get "src" }}{{- . -}}{{ end }}">link to the video</a> instead.
+        </p>
+    </video>
+</div>