diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 1e2594e5..364f5e56 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -20,7 +20,7 @@ body: I made sure I checked 我确认我已经检查过了 options: - - label: I am using Keep version `4.1.2` or later. （使用 Keep `4.1.2` 或更高版本） + - label: I am using Keep version `4.1.3` or later. （使用 Keep `4.1.3` 或更高版本） required: true - label: I have already read the [Troubleshooting page of Hexo](https://hexo.io/docs/troubleshooting) and [Keep documents](https://keep-docs.xpoet.cn). （已阅读 [Hexo 故障处理页面](https://hexo.io/docs/troubleshooting) 和 [Keep 文档](https://keep-docs.xpoet.cn)） required: true diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index 3f29665e..82893cf0 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -20,7 +20,7 @@ body: I made sure I checked 我确认我已经检查过了 options: - - label: I am using Keep version `4.1.2` or later. （使用 Keep `4.1.2` 或更高版本） + - label: I am using Keep version `4.1.3` or later. （使用 Keep `4.1.3` 或更高版本） required: true - label: I have already read the [Troubleshooting page of Hexo](https://hexo.io/docs/troubleshooting) and [Keep documents](https://keep-docs.xpoet.cn). （已阅读 [Hexo 故障处理页面](https://hexo.io/docs/troubleshooting) 和 [Keep 文档](https://keep-docs.xpoet.cn)） required: true diff --git a/.github/ISSUE_TEMPLATE/other.yml b/.github/ISSUE_TEMPLATE/other.yml index 09aa35d1..4757ace6 100644 --- a/.github/ISSUE_TEMPLATE/other.yml +++ b/.github/ISSUE_TEMPLATE/other.yml @@ -20,7 +20,7 @@ body: I made sure I checked 我确认我已经检查过了 options: - - label: I am using Keep version `4.1.2` or later. （使用 Keep `4.1.2` 或更高版本） + - label: I am using Keep version `4.1.3` or later. （使用 Keep `4.1.3` 或更高版本） required: true - label: I have already read the [Troubleshooting page of Hexo](https://hexo.io/docs/troubleshooting) and [Keep documents](https://keep-docs.xpoet.cn). （已阅读 [Hexo 故障处理页面](https://hexo.io/docs/troubleshooting) 和 [Keep 文档](https://keep-docs.xpoet.cn)） required: true diff --git a/_config.yml b/_config.yml index c3fda5b6..fd40a092 100644 --- a/_config.yml +++ b/_config.yml @@ -241,15 +241,15 @@ comment: twikoo: env_id: # Environment ID region: # Environment region, Can be null - version: 1.6.21 # Twikoo version, default use 1.6.21 + version: 1.6.36 # Twikoo version, default use v1.6.36 # Waline # See: https://github.com/walinejs/waline # https://waline.js.org/guide/get-started.html waline: - server_url: # Server URL - reaction: false # Post reactions, Option values: true | false - version: 3 # Waline version, default use v3 + server_url: # Server URL + reaction: false # Post reactions, option values: true | false + version: 3.2.1 # Waline version, default use v3.2.1 # Giscus # See: https://github.com/giscus/giscus diff --git a/layout/_page/post.ejs b/layout/_page/post.ejs index 11de0f7e..83a549a6 100644 --- a/layout/_page/post.ejs +++ b/layout/_page/post.ejs @@ -1,6 +1,7 @@ <% const post_author = page?.author || theme?.base_info?.author || config?.author const post_avatar = page?.avatar || theme?.base_info?.avatar +const is_code_block_unshrink = page?.code_block_shrink === false %>
@@ -50,7 +51,7 @@ const post_avatar = page?.avatar || theme?.base_info?.avatar
<% } %> -
+
<% if (page?.aging === true) { %>
<% postItem.postList.forEach(post => { %>
  • + <%= date(post.date, 'MM-DD') %> diff --git a/layout/_partial/comment/plugins/waline.ejs b/layout/_partial/comment/plugins/waline.ejs index 41704721..2cbaf6c1 100644 --- a/layout/_partial/comment/plugins/waline.ejs +++ b/layout/_partial/comment/plugins/waline.ejs @@ -32,6 +32,15 @@ if (t_cdn_enable === true) { cdn_css_meta = `//unpkg.com/@waline/client@v${waline_version}/dist/waline-meta.css` cdn_js = `//unpkg.com/@waline/client@v${waline_version}/dist/waline.js` break + + case 'cdnjs': + if (!(/^(\d+)\.(\d+)\.(\d+)$/.test(waline_version))) { + waline_version = '3.2.1' + } + cdn_css = `https://cdnjs.cloudflare.com/ajax/libs/waline/${waline_version}/waline.css` + cdn_css_meta = `https://cdnjs.cloudflare.com/ajax/libs/waline/${waline_version}/waline-meta.css` + cdn_js = `https://cdnjs.cloudflare.com/ajax/libs/waline/${waline_version}/waline.js` + break } } %> diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs index 580b4990..407efee7 100644 --- a/layout/_partial/footer.ejs +++ b/layout/_partial/footer.ejs @@ -2,12 +2,26 @@ const { since: f_since, record: f_record, - site_deploy: f_site_deploy + site_deploy: f_site_deploy, + word_count: f_word_count } = theme?.footer || {} const { author: bi_author } = theme?.base_info || {} const { author: hexo_author } = config const { site_uv: bsz_site_uv, site_pv: bsz_site_pv, enable: bsz_enable } = theme?.website_count?.busuanzi_count || {} const web_master = bi_author || hexo_author + +const show_pv = bsz_enable === true && bsz_site_pv === true +const show_uv = bsz_enable === true && bsz_site_uv === true + +let f_temp_total_word = 0 +try { + f_temp_total_word = totalcount(site) +} catch { + f_temp_total_word = 0 +} +const show_word_count = f_word_count === true && f_temp_total_word !== 0 + +const has_count_info = show_pv || show_uv || show_word_count %>