Merge pull request #375 from XPoet/dev

Release new version
XPoet · Nov 21, 2024 · 7a08e24 · 7a08e24
2 parents 240364b + 80ae08f
commit 7a08e24
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 33 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.2.3` or later. （使用 Keep `4.2.3` 或更高版本）
+        - label: I am using Keep version `4.2.4` or later. （使用 Keep `4.2.4` 或更高版本）
           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/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,9 +1,9 @@
 blank_issues_enabled: false
 contact_links:
-  - name: GitHub Discussions
-    url: https://github.com/XPoet/hexo-theme-keep/discussions
-    about: Please ask and answer questions here.
-
   - name: Keep Documents | Keep 文档
     url: https://keep-docs.xpoet.cn
     about: Official user manual of Keep Theme
+
+  - name: GitHub Discussions
+    url: https://github.com/XPoet/hexo-theme-keep/discussions
+    about: Please ask and answer questions here.
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.2.3` or later. （使用 Keep `4.2.3` 或更高版本）
+        - label: I am using Keep version `4.2.4` or later. （使用 Keep `4.2.4` 或更高版本）
           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.2.3` or later. （使用 Keep `4.2.3` 或更高版本）
+        - label: I am using Keep version `4.2.4` or later. （使用 Keep `4.2.4` 或更高版本）
           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
@@ -242,15 +242,15 @@ comment:
   twikoo:
     env_id:          # Environment ID
     region:          # Environment region, Can be null
-    version: 1.6.36  # Twikoo version, default use v1.6.36
+    version: 1.6.39  # Twikoo version, default use v1.6.39
 
   # 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.2.1      # Waline version, default use v3.2.1
+    version: 3.3.2      # Waline version, default use v3.3.2
 
   # Giscus
   # See: https://github.com/giscus/giscus

diff --git a/layout/_page/home.ejs b/layout/_page/home.ejs
@@ -17,7 +17,7 @@
                          style="height: <%= post?.home_cover_height ? post?.home_cover_height + 'px' : '10rem' %>"
                     >
                         <% if (post.sticky) { %>
-                            <div class="post-sticky-box cover">
+                            <div class="post-sticky-box cover-offset">
                                 <i class="fas fa-thumbtack"></i><span class="sticky-name">&nbsp;<%- __('top') %></span>
                             </div>
                         <% } %>
@@ -29,7 +29,7 @@
 
                 <div class="home-post-item-bottom border-box">
                     <% if (post.sticky && !post?.home_cover) { %>
-                        <div class="post-sticky-box card">
+                        <div class="post-sticky-box card-offset">
                             <i class="fas fa-thumbtack"></i><span class="sticky-name">&nbsp;<%- __('top') %></span>
                         </div>
                     <% } %>

diff --git a/layout/_partial/footer.ejs b/layout/_partial/footer.ejs
@@ -22,11 +22,13 @@ try {
 const show_word_count = f_word_count === true && f_temp_total_word !== 0
 
 const has_count_info = show_pv || show_uv || show_word_count
+
+const current_year = String(date(new Date(), 'YYYY'))
 %>
 <footer class="footer border-box">
     <div class="copyright-info info-item">
-        &copy;&nbsp;<% if (f_since) { %><span><%= f_since %></span>&nbsp;-&nbsp;<% } %><%= date(new Date(), 'YYYY') %>
-        <% if (web_master) { %>
+    &copy;&nbsp;<% if (f_since && String(f_since) !== current_year) { %><span><%= f_since %></span>&nbsp;-&nbsp;<% } %><%= current_year %>
+    <% if (web_master) { %>
             &nbsp;<i class="fas fa-heart icon-animate"></i>&nbsp;&nbsp;<a href="<%- url_for('/') %>"><%= web_master %></a>
         <% } %>
     </div>

diff --git a/layout/_partial/post/post-meta-info.ejs b/layout/_partial/post/post-meta-info.ejs
@@ -21,7 +21,7 @@ const { created_datetime_icon, updated_datetime_icon } = theme?.post || {}
 
 <div class="post-meta-info-container border-box <%= page_type %>">
     <div class="post-meta-info border-box">
-        <% if (page_type === 'home' && show_home_post_block_datetime) { %>
+        <% if (page_type === 'home' && show_home_post_block_datetime && home_post_block_datetime) { %>
             <span class="meta-info-item border-box">
                 <i class="icon <%= home_post_block_datetime_icon %>"></i>&nbsp;<span class="home-post-history"
                                                                                 data-updated="<%= home_post_block_datetime %>"
@@ -35,10 +35,12 @@ const { created_datetime_icon, updated_datetime_icon } = theme?.post || {}
                 <span class="datetime"><%= date(post.date, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
             </span>
 
-            <span class="meta-info-item post-update-date">
-                <i class="icon <%= updated_datetime_icon || 'fa-solid fa-file-pen' %>"></i>&nbsp;
-                <span class="datetime" data-updated="<%= post.updated %>"><%= date(post.updated, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
-            </span>
+            <% if (post.updated) { %>
+                <span class="meta-info-item post-update-date">
+                    <i class="icon <%= updated_datetime_icon || 'fa-solid fa-file-pen' %>"></i>&nbsp;
+                    <span class="datetime" data-updated="<%= post.updated %>"><%= date(post.updated, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
+                </span>
+            <% } %>
         <% } %>
 
         <% if (post.categories.length && (theme?.home?.category === true || page_type === 'post')) { %>

diff --git a/source/css/common/markdown.styl b/source/css/common/markdown.styl
@@ -1,4 +1,4 @@
-$h1-font-size = 1.7rem
+$h1-font-size = 1.68rem
 $h2-font-size = 1.6rem
 $h3-font-size = 1.5rem
 $h4-font-size = 1.4rem
@@ -175,12 +175,12 @@ $h6-font-size = 1.2rem
 
 
     +keep-tablet() {
-      line-height 1.4
+      line-height 1.5
     }
 
 
     +keep-mobile() {
-      line-height 1.3
+      line-height 1.4
     }
 
 
@@ -229,7 +229,7 @@ $h6-font-size = 1.2rem
     }
 
     +keep-mobile() {
-      line-height $h1-font-size * 0.8
+      font-size $h1-font-size * 0.8
     }
 
     a.headerlink
@@ -248,7 +248,7 @@ $h6-font-size = 1.2rem
     }
 
     +keep-mobile() {
-      line-height $h2-font-size * 0.8
+      font-size $h2-font-size * 0.8
     }
 
     a.headerlink
@@ -266,10 +266,12 @@ $h6-font-size = 1.2rem
       font-size $h3-font-size * 0.9
     }
 
+
     +keep-mobile() {
-      line-height $h3-font-size * 0.8
+      font-size $h3-font-size * 0.8
     }
 
+
     a.headerlink
     a.markdownIt-Anchor {
       font-size $h3-font-size * 0.8
@@ -285,10 +287,12 @@ $h6-font-size = 1.2rem
       font-size $h4-font-size * 0.9
     }
 
+
     +keep-mobile() {
-      line-height $h4-font-size * 0.8
+      font-size $h4-font-size * 0.8
     }
 
+
     a.headerlink
     a.markdownIt-Anchor {
       font-size $h4-font-size * 0.8
@@ -304,10 +308,12 @@ $h6-font-size = 1.2rem
       font-size $h5-font-size * 0.9
     }
 
+
     +keep-mobile() {
-      line-height $h5-font-size * 0.8
+      font-size $h5-font-size * 0.8
     }
 
+
     a.headerlink
     a.markdownIt-Anchor {
       font-size $h5-font-size * 0.8
@@ -318,11 +324,13 @@ $h6-font-size = 1.2rem
   h6 {
     font-weight 500
     font-size $h6-font-size
-    line-height 1.2
 
     +keep-tablet() {
-      font-size $h6-font-size
-      line-height 1.1
+      font-size $h6-font-size * 0.9
+    }
+
+    +keep-mobile() {
+      font-size $h6-font-size * 0.8
     }
 
     a.headerlink

diff --git a/source/css/layout/_page/home.styl b/source/css/layout/_page/home.styl
@@ -88,12 +88,12 @@
         cursor default
         disable-user-select()
 
-        &.cover {
+        &.cover-offset {
           top 0.6rem
           right 0.6rem
         }
 
-        &.card {
+        &.card-offset {
           top 0.8rem
           right 0.8rem
         }

diff --git a/source/css/layout/_partial/footer.styl b/source/css/layout/_partial/footer.styl
@@ -1,5 +1,3 @@
-$shields-style-height = 22px
-
 .footer {
   display flex
   flex-direction column

diff --git a/source/css/layout/page.styl b/source/css/layout/page.styl
@@ -114,6 +114,7 @@ $post-tools-offset = calc((100vw - var(--page-content-max-width) / 2) - 5rem)
 
 
     .page-main-content-middle {
+      z-index $z-index-2
       display flex
       justify-content center
       width 100%
@@ -186,6 +187,7 @@ $post-tools-offset = calc((100vw - var(--page-content-max-width) / 2) - 5rem)
     position fixed
     right 0
     bottom 1.6rem
+    z-index $z-index-3
     box-sizing border-box
     padding-right 1rem