Merge pull request #288 from XPoet/dev

Release new version
XPoet · Dec 1, 2023 · 6f39330 · 6f39330
2 parents fb0b1e6 + 2347d0b
commit 6f39330
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 19 deletions.
diff --git 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.0.3` or later. （使用 Keep `4.0.3` 或更高版本）
+        - label: I am using Keep version `4.0.5` or later. （使用 Keep `4.0.5` 或更高版本）
           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
@@ -20,7 +20,7 @@ body:
         I made sure I checked
         我确认我已经检查过了
       options:
-        - label: I am using Keep version `4.0.3` or later. （使用 Keep `4.0.3` 或更高版本）
+        - label: I am using Keep version `4.0.5` or later. （使用 Keep `4.0.5` 或更高版本）
           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
@@ -20,7 +20,7 @@ body:
         I made sure I checked
         我确认我已经检查过了
       options:
-        - label: I am using Keep version `4.0.3` or later. （使用 Keep `4.0.3` 或更高版本）
+        - label: I am using Keep version `4.0.5` or later. （使用 Keep `4.0.5` 或更高版本）
           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/languages/en.yml b/languages/en.yml
@@ -99,4 +99,6 @@ comment:
   reload: Click to reload
   loading: Loading comment plugin
   config_error: "Please fill in the required configuration items for %s comment plugin"
-page_not_found: Page Not Found
+404:
+  page_not_found: Page Not Found
+  go_home: Take me home
diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml
@@ -99,4 +99,6 @@ comment:
   reload: 点击重新加载
   loading: 正在加载评论插件
   config_error: "请完整填写 %s 评论插件必需的配置项"
-page_not_found: 页面找不到
+404:
+  page_not_found: 页面找不到
+  go_home: 前往首页
diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml
@@ -99,4 +99,6 @@ comment:
   reload: 點擊重新加載
   loading: 正在加載評論插件
   config_error: "請完整填寫 %s 評論外掛程式必需的設定項"
-page_not_found: 頁面缺失
+404:
+  page_not_found: 頁面缺失
+  go_home: 前往首頁
diff --git a/layout/404.ejs b/layout/404.ejs
@@ -2,7 +2,10 @@
     <div class="error-404-container border-box">
         <div class="text-1 border-box flex-center">404</div>
         <div class="text-2 border-box flex-center">
-            <%- __('page_not_found') %>
+            <%- __('404.page_not_found') %>
+        </div>
+        <div class="text-3 border-box flex-center">
+            <a class="go-home" href="<%- url_for('/') %>"><%- __('404.go_home') %></a>
         </div>
     </div>
 </div>
diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
@@ -21,7 +21,7 @@ const web_master = bi_author || hexo_author
                     <img src="https://img.shields.io/badge/Since-<%= since_date %>-<%= shields_color_list[0] %>?style=<%= shields_style %>">
                 </a>
                 <% if (web_master) { %>
-                    <a class="shields-item" href="/">
+                    <a class="shields-item" href="<%- url_for('/') %>">
                         <img src="https://img.shields.io/badge/WebMaster-<%= web_master %>-<%= shields_color_list[1] %>?style=<%= shields_style %>">
                     </a>
                 <% } %>

diff --git a/layout/_partial/post/post-copyright-info.ejs b/layout/_partial/post/post-copyright-info.ejs
@@ -12,17 +12,17 @@ if (config?.language === 'zh-TW') {
 <div class="post-copyright-info-container border-box">
     <div class="copyright-info-content border-box">
         <div class="copyright-info-top border-box">
-            <div class="post-title border-box text-ellipsis">
+            <div class="copyright-post-title border-box text-ellipsis">
                 <%= page.title %>
             </div>
 
-            <div class="post-link border-box text-ellipsis">
+            <div class="copyright-post-link border-box text-ellipsis">
                 <%= page.path %>
             </div>
         </div>
 
         <div class="copyright-info-bottom border-box">
-            <div class="post-author bottom-item">
+            <div class="copyright-post-author bottom-item">
                 <div class="type">
                     <%- __('copyright.author') %>
                 </div>

diff --git a/source/css/layout/404.styl b/source/css/layout/404.styl
@@ -3,17 +3,41 @@
 
   .text-1 {
     width 100%
-    height 10rem
+    height 8rem
     color var(--text-color-3)
     font-weight 600
-    font-size 10rem
+    font-size 8rem
   }
 
   .text-2 {
     width 100%
     height 3rem
     color var(--text-color-4)
     font-size 2rem
-    letter-spacing 1px
+    letter-spacing 1.2px
+  }
+
+  .text-3 {
+    width 100%
+    height 4rem
+
+    .go-home {
+      position relative
+      box-sizing border-box
+      padding 0.3rem 0.8rem
+      color var(--text-color-3)
+      font-size 1rem
+      background transparent
+      border-color var(--text-color-3)
+      border-style solid
+      border-width 0.1rem
+      border-radius 0.6rem
+      cursor pointer
+
+      &:hover {
+        color var(--primary-color)
+        border-color var(--primary-color)
+      }
+    }
   }
 }
diff --git a/source/css/layout/_partial/post/post-copyright-info.styl b/source/css/layout/_partial/post/post-copyright-info.styl
@@ -14,13 +14,13 @@
     .copyright-info-top {
       width 100%
 
-      .post-title {
+      .copyright-post-title {
         width 100%
         color var(--text-color-3)
         font-size 1.1rem
       }
 
-      .post-link {
+      .copyright-post-link {
         width 100%
         margin-top 0.2rem
         color var(--text-color-4)

diff --git a/source/js/post/copyright-info.js b/source/js/post/copyright-info.js
@@ -4,7 +4,9 @@ function initCopyrightInfoHelper() {
   KEEP.utils.copyrightInfoHelper = {
     // set post link
     initSetPostLink() {
-      const postLinkContentDom = document.querySelector('.copyright-info-content .post-link')
+      const postLinkContentDom = document.querySelector(
+        '.copyright-info-content .copyright-post-link'
+      )
       postLinkContentDom && (postLinkContentDom.innerHTML = decodeURI(window.location.href))
     },
 
@@ -36,8 +38,8 @@ function initCopyrightInfoHelper() {
 
       copyDom.addEventListener('click', () => {
         if (!isCopied) {
-          const author = cicDom.querySelector('.post-author .content').innerHTML
-          const link = cicDom.querySelector('.post-link').innerHTML
+          const author = cicDom.querySelector('.copyright-post-author .content').innerHTML
+          const link = cicDom.querySelector('.copyright-post-link').innerHTML
           const tgtTxt = `${ccLang.author}${colon}${author}\n${ccLang.link}${colon}${link}`
           navigator.clipboard.writeText(tgtTxt).then(() => {
             setCopyDomContent('fa-copy', 'fa-check', ccLang.copied, true)