Merge branch 'master' into patch-1

2025-04-29 03:53:30 +08:00 · 2023-08-27 13:47:28 +02:00 · 2023-08-27 13:47:28 +02:00 · 4820925035
commit 4820925035
parent 348e0a6fcf c6d1d73dd2
16 changed files with 86 additions and 42 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,17 +1,15 @@
 name: Bug Report
 description: File a bug report
-title: "[Bug]: "
-labels: ["bug"]
 body:
  - type: markdown
    attributes:
      value: |
-        Thanks for taking the time to fill out this bug report! Please provide as much information as possible and make sure you have checked the [documentation](https://docs.stack.jimmycai.com/).
+        Thanks for taking the time to fill out this bug report! Please provide as much information as possible and make sure you have checked the [documentation](https://stack.jimmycai.com/).
  - type: textarea
    id: what-happened
    attributes:
      label: What happened?
-      description: Also tell us, what did you expect to happen? Please be as detailed as possible, include screenshots and any other information that might help us reproduce the problem.
+      description: Also tell us, what did you expect to happen? Please be as detailed as possible, including screenshots and any other information that might help us reproduce the problem.
      placeholder: Tell us what you see!
    validations:
      required: true
@ -55,21 +53,13 @@ body:
      label: Relevant log output
      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
      render: shell
-  - type: markdown
-    attributes:
-      value: |
-        If the issue is not present on the [demo site](https://demo.stack.jimmycai.com), in order to better understand the problem, please provide the link to the source code of your website (not the generated HTML). 
-        Or link to a minimal reproduction of the problem if there are sensible data.
  - type: input
-    id: bug-url
+    id: minimal-reproduction-url
    attributes:
-      label: Link to the page with bug
-      placeholder: https://demo.stack.jimmycai.com
-      value: https://demo.stack.jimmycai.com
+      label: Link to Minimal Reproducible Example
+      description: | 
+        Use [CaiJimmy/hugo-theme-stack-starter](https://github.com/CaiJimmy/hugo-theme-stack-starter) to create a minimal reproduction of the problem. 
+        A minimal reproduction is required so that others can help debug your issue. If a report is vague (e.g. just a generic error message) and has no reproduction, it may be auto-closed. 
+      placeholder: https://github.com/username/your-repository
    validations:
      required: true
-  - type: input
-    id: source-repo
-    attributes:
-      label: Link to the source repository
-      placeholder: https://github.com/CaiJimmy/hugo-theme-stack
--- a/assets/scss/partials/article.scss
+++ b/assets/scss/partials/article.scss
@ -92,16 +92,15 @@
 .article-time,
 .article-translations {
    display: flex;
-    align-items: center;
    color: var(--card-text-color-tertiary);
    gap: 15px;
-    flex-wrap: wrap;

    svg {
        vertical-align: middle;
        width: 20px;
        height: 20px;
        stroke-width: 1.33;
+        flex-shrink: 0;
    }

    time,
@ -117,6 +116,16 @@
    }
 }

+.article-time {
+    flex-wrap: wrap;
+}
+
+.article-translations {
+    & > div {
+        flex-wrap: wrap;
+    }
+}
+
 .article-category,
 .article-tags {
    display: flex;
--- a/assets/scss/partials/layout/article.scss
+++ b/assets/scss/partials/layout/article.scss
@ -264,6 +264,11 @@
        font-family: var(--code-font-family);
    }

+    a,
+    code {
+        word-break: break-word;
+    }
+
    .gallery {
        position: relative;
        display: flex;
@ -418,4 +423,14 @@
        overflow-x: auto;
        overflow-y: hidden;
    }
+
+    kbd {
+        border: 1px solid var(--kbd-border-color);
+        font-weight: bold;
+        font-size: 0.9em;
+        line-height: 1;
+        padding: 2px 4px;
+        border-radius: 4px;
+        display: inline-block;
+    }
 }
--- a/assets/scss/partials/sidebar.scss
+++ b/assets/scss/partials/sidebar.scss
@ -79,6 +79,7 @@

    @include respond(lg) {
        padding-top: var(--main-top-padding);
+        padding-bottom: var(--main-top-padding);
    }
 }

--- a/assets/scss/variables.scss
+++ b/assets/scss/variables.scss
@ -16,7 +16,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
    --accent-color: #34495e;
    --accent-color-darker: #2c3e50;
    --accent-color-text: #fff;
-    --body-text-color: #bababa;
+    --body-text-color: #707070;

    --tag-border-radius: 4px;

@ -56,7 +56,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;

    --card-text-color-main: #000;
    --card-text-color-secondary: #747474;
-    --card-text-color-tertiary: #bababa;
+    --card-text-color-tertiary: #767676;
    --card-separator-color: rgba(218, 218, 218, 0.5);

    --card-border-radius: 10px;
@ -123,6 +123,8 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff;
    --table-border-color: #dadada;
    --tr-even-background-color: #efefee;

+    --kbd-border-color: #dadada;
+
    &[data-scheme="dark"] {
        --code-background-color: #272822;
        --code-text-color: rgba(255, 255, 255, 0.9);
--- a/assets/ts/search.tsx
+++ b/assets/ts/search.tsx
@ -227,6 +227,7 @@ class Search {
            Search.updateQueryString(keywords, true);

            if (keywords === '') {
+                lastSearch = '';
                return this.clear();
            }

--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@ -3,24 +3,28 @@ languageCode: en-us
 theme: hugo-theme-stack
 paginate: 5
 title: Example Site
+copyright: Example Person

 languages:
    en:
        languageName: English
        title: Example Site
-        description: Example description
        weight: 1
+        params:
+            description: Example description
    zh-cn:
        languageName: 中文
        title: 演示站点
-        description: 演示说明
        weight: 2
+        params:
+            description: 演示说明
    ar:
        languageName: عربي
        languagedirection: rtl
        title: موقع تجريبي
-        description: وصف تجريبي
        weight: 3
+        params:
+            description: وصف تجريبي

 # Change it to your Disqus shortname before using
 disqusShortname: hugo-theme-stack
@ -224,7 +228,7 @@ markup:
    goldmark:
        renderer:
            ## Set to true if you have HTML content inside Markdown
-            unsafe: false
+            unsafe: true
    tableOfContents:
        endLevel: 4
        ordered: true
--- a/exampleSite/content/post/markdown-syntax/index.md
+++ b/exampleSite/content/post/markdown-syntax/index.md
@ -159,7 +159,7 @@ H<sub>2</sub>O

 X<sup>n</sup> + Y<sup>n</sup> = Z<sup>n</sup>

-Press <kbd><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>Delete</kbd></kbd> to end the session.
+Press <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>Delete</kbd> to end the session.

 Most <mark>salamanders</mark> are nocturnal, and hunt for insects, worms, and other small creatures.

--- a/exampleSite/content/post/math-typesetting/index.md
+++ b/exampleSite/content/post/math-typesetting/index.md
@ -37,11 +37,7 @@ In this example we will be using [KaTeX](https://katex.org/)

 ### Examples

-{{< math.inline >}}
-<p>
-Inline math: \(\varphi = \dfrac{1+\sqrt5}{2}= 1.6180339887…\)
-</p>
-{{</ math.inline >}}
+Inline math: $\varphi = \dfrac{1+\sqrt5}{2}= 1.6180339887…$

 Block math:
 $$
--- a/i18n/pl.yaml
+++ b/i18n/pl.yaml
@ -7,6 +7,8 @@ darkMode:
 list:
    page:
        one: "{{ .Count }} strona"
+        few: "{{ .Count }} strony"
+        many: "{{ .Count }} stron"
        other: "{{ .Count }} stron"

    section:
@ -14,7 +16,9 @@ list:

    subsection:
        one: Podsekcja
-        other: Podsekcje
+        few: Podsekcje
+        many: Podsekcji
+        other: Podsekcji

 article:
    back:
@ -31,6 +35,8 @@ article:

    readingTime:
        one: "Przeczytasz w {{ .Count }} minutę"
+        few: "Przeczytasz w {{ .Count }} minuty"
+        many: "Przeczytasz w {{ .Count }} minut"
        other: "Przeczytasz w {{ .Count }} minut"

 notFound:
@ -63,6 +69,9 @@ search:
        other: Wpisz coś...

    resultTitle:
+        one: "#PAGES_COUNT strona (#TIME_SECONDS sekund)"
+        few: "#PAGES_COUNT strony (#TIME_SECONDS sekund)"
+        many: "#PAGES_COUNT stron (#TIME_SECONDS sekund)"
        other: "#PAGES_COUNT stron (#TIME_SECONDS sekund)"

 footer:
--- a/i18n/zh-tw.yaml
+++ b/i18n/zh-tw.yaml
@ -4,6 +4,18 @@ toggleMenu:
 darkMode:
    other: 夜晚模式

+list:
+    page:
+        one: "第 {{ .Count }} 頁"
+        other: "第 {{ .Count }} 頁"
+
+    section:
+        other: 段落
+
+    subsection:
+        one: 小節
+        other: 小節
+
 article:
    back:
        other: 返回
@ -18,11 +30,13 @@ article:
        other: 最後更新

    readingTime:
+        one: "閱讀時間: {{ .Count }} 分鐘"
        other: "閱讀時間: {{ .Count }} 分鐘"

 notFound:
    title:
        other: 404 錯誤
+
    subtitle:
        other: 頁面不存在

@ -37,6 +51,9 @@ widget:
    tagCloud:
        title:
            other: 標籤雲
+    categoriesCloud:
+        title:
+            other: 分類

 search:
    title:
--- a/layouts/page/search.html
+++ b/layouts/page/search.html
@ -1,11 +1,11 @@
 {{ define "body-class" }}template-search{{ end }}
 {{ define "head" }}
    {{- with .OutputFormats.Get "json" -}} 
-        <link rel="preload" href="{{ .Permalink }}" as="fetch" crossorigin="anonymous">
+        <link rel="preload" href="{{ .RelPermalink }}" as="fetch" crossorigin="anonymous">
    {{- end -}}
 {{ end }}
 {{ define "main" }}
-<form action="{{ .Permalink }}" class="search-form"{{ with .OutputFormats.Get "json" -}} data-json="{{ .Permalink }}"{{- end }}>
+<form action="{{ .RelPermalink }}" class="search-form"{{ with .OutputFormats.Get "json" -}} data-json="{{ .RelPermalink }}"{{- end }}>
    <p>
        <label>{{ T "search.title" }}</label>
        <input name="keyword" placeholder="{{ T `search.placeholder` }}" />
--- a/layouts/partials/comments/provider/remark42.html
+++ b/layouts/partials/comments/provider/remark42.html
@ -13,7 +13,7 @@
        show_email_subscription: {{ default true .show_email_subscription }}
    };

-    function(e, n) {
+    !function(e, n) {
        for (var o = 0; o < e.length; o++) {
            var r = n.createElement('script'),
            c = '.js',
--- a/layouts/partials/comments/provider/twikoo.html
+++ b/layouts/partials/comments/provider/twikoo.html
@ -1,4 +1,4 @@
-<script src="//cdn.jsdelivr.net/npm/twikoo@1.5.11/dist/twikoo.all.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/twikoo@1.6.11/dist/twikoo.all.min.js"></script>
 <div id="tcomment"></div>
 <style>
    .twikoo {
--- a/layouts/partials/footer/footer.html
+++ b/layouts/partials/footer/footer.html
@ -1,11 +1,11 @@
-{{- $ThemeVersion := "3.16.0" -}}
+{{- $ThemeVersion := "3.18.0" -}}
 <footer class="site-footer">
    <section class="copyright">
        &copy; 
        {{ if and (.Site.Params.footer.since) (ne .Site.Params.footer.since (int (now.Format "2006"))) }}
            {{ .Site.Params.footer.since }} - 
        {{ end }}
-        {{ now.Format "2006" }} {{ .Site.Title }}
+        {{ now.Format "2006" }} {{ default .Site.Title .Site.Copyright }}
    </section>
    
    <section class="powerby">
--- a/netlify.toml
+++ b/netlify.toml
@ -2,7 +2,7 @@
    publish = "exampleSite/public"

 [build.environment]
-    HUGO_VERSION = "0.100.2"
+    HUGO_VERSION = "0.117.0"
    HUGO_THEME = "repo"

 [context.production]