Skip to content

Commit 7a08e24

Browse files
XPoetXPoet
authored
Merge pull request #375 from XPoet/dev
Release new version
2 parents 240364b + 80ae08f commit 7a08e24

File tree

12 files changed

+45
-33
lines changed

12 files changed

+45
-33
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ body:
2020
I made sure I checked
2121
我确认我已经检查过了
2222
options:
23-
- label: I am using Keep version `4.2.3` or later. （使用 Keep `4.2.3` 或更高版本）
23+
- label: I am using Keep version `4.2.4` or later. （使用 Keep `4.2.4` 或更高版本）
2424
required: true
2525
- 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)）
2626
required: true

‎.github/ISSUE_TEMPLATE/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: GitHub Discussions
4-
url: https://github.com/XPoet/hexo-theme-keep/discussions
5-
about: Please ask and answer questions here.
6-
73
- name: Keep Documents | Keep 文档
84
url: https://keep-docs.xpoet.cn
95
about: Official user manual of Keep Theme
6+
7+
- name: GitHub Discussions
8+
url: https://github.com/XPoet/hexo-theme-keep/discussions
9+
about: Please ask and answer questions here.

‎.github/ISSUE_TEMPLATE/feature-request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ body:
2020
I made sure I checked
2121
我确认我已经检查过了
2222
options:
23-
- label: I am using Keep version `4.2.3` or later. （使用 Keep `4.2.3` 或更高版本）
23+
- label: I am using Keep version `4.2.4` or later. （使用 Keep `4.2.4` 或更高版本）
2424
required: true
2525
- 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)）
2626
required: true

‎.github/ISSUE_TEMPLATE/other.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ body:
2020
I made sure I checked
2121
我确认我已经检查过了
2222
options:
23-
- label: I am using Keep version `4.2.3` or later. （使用 Keep `4.2.3` 或更高版本）
23+
- label: I am using Keep version `4.2.4` or later. （使用 Keep `4.2.4` 或更高版本）
2424
required: true
2525
- 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)）
2626
required: true

‎_config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,15 @@ comment:
242242
twikoo:
243243
env_id: # Environment ID
244244
region: # Environment region, Can be null
245-
version: 1.6.36 # Twikoo version, default use v1.6.36
245+
version: 1.6.39 # Twikoo version, default use v1.6.39
246246

247247
# Waline
248248
# See: https://github.com/walinejs/waline
249249
# https://waline.js.org/guide/get-started.html
250250
waline:
251251
server_url: # Server URL
252252
reaction: false # Post reactions, option values: true | false
253-
version: 3.2.1 # Waline version, default use v3.2.1
253+
version: 3.3.2 # Waline version, default use v3.3.2
254254

255255
# Giscus
256256
# See: https://github.com/giscus/giscus

‎layout/_page/home.ejs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
style="height: <%= post?.home_cover_height ? post?.home_cover_height + 'px' : '10rem' %>"
1818
>
1919
<% if (post.sticky) { %>
20-
<div class="post-sticky-box cover">
20+
<div class="post-sticky-box cover-offset">
2121
<i class="fas fa-thumbtack"></i><span class="sticky-name">&nbsp;<%- __('top') %></span>
2222
</div>
2323
<% } %>
@@ -29,7 +29,7 @@
2929
3030
<div class="home-post-item-bottom border-box">
3131
<% if (post.sticky && !post?.home_cover) { %>
32-
<div class="post-sticky-box card">
32+
<div class="post-sticky-box card-offset">
3333
<i class="fas fa-thumbtack"></i><span class="sticky-name">&nbsp;<%- __('top') %></span>
3434
</div>
3535
<% } %>

‎layout/_partial/footer.ejs

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ try {
2222
const show_word_count = f_word_count === true && f_temp_total_word !== 0
2323
2424
const has_count_info = show_pv || show_uv || show_word_count
25+
26+
const current_year = String(date(new Date(), 'YYYY'))
2527
%>
2628
<footer class="footer border-box">
2729
<div class="copyright-info info-item">
28-
&copy;&nbsp;<% if (f_since) { %><span><%= f_since %></span>&nbsp;-&nbsp;<% } %><%= date(new Date(), 'YYYY') %>
29-
<% if (web_master) { %>
30+
&copy;&nbsp;<% if (f_since && String(f_since) !== current_year) { %><span><%= f_since %></span>&nbsp;-&nbsp;<% } %><%= current_year %>
31+
<% if (web_master) { %>
3032
&nbsp;<i class="fas fa-heart icon-animate"></i>&nbsp;&nbsp;<a href="<%- url_for('/') %>"><%= web_master %></a>
3133
<% } %>
3234
</div>

‎layout/_partial/post/post-meta-info.ejs

+7-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const { created_datetime_icon, updated_datetime_icon } = theme?.post || {}
2121
2222
<div class="post-meta-info-container border-box <%= page_type %>">
2323
<div class="post-meta-info border-box">
24-
<% if (page_type === 'home' && show_home_post_block_datetime) { %>
24+
<% if (page_type === 'home' && show_home_post_block_datetime && home_post_block_datetime) { %>
2525
<span class="meta-info-item border-box">
2626
<i class="icon <%= home_post_block_datetime_icon %>"></i>&nbsp;<span class="home-post-history"
2727
data-updated="<%= home_post_block_datetime %>"
@@ -35,10 +35,12 @@ const { created_datetime_icon, updated_datetime_icon } = theme?.post || {}
3535
<span class="datetime"><%= date(post.date, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
3636
</span>
3737
38-
<span class="meta-info-item post-update-date">
39-
<i class="icon <%= updated_datetime_icon || 'fa-solid fa-file-pen' %>"></i>&nbsp;
40-
<span class="datetime" data-updated="<%= post.updated %>"><%= date(post.updated, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
41-
</span>
38+
<% if (post.updated) { %>
39+
<span class="meta-info-item post-update-date">
40+
<i class="icon <%= updated_datetime_icon || 'fa-solid fa-file-pen' %>"></i>&nbsp;
41+
<span class="datetime" data-updated="<%= post.updated %>"><%= date(post.updated, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
42+
</span>
43+
<% } %>
4244
<% } %>
4345
4446
<% if (post.categories.length && (theme?.home?.category === true || page_type === 'post')) { %>

‎source/css/common/markdown.styl

+19-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$h1-font-size = 1.7rem
1+
$h1-font-size = 1.68rem
22
$h2-font-size = 1.6rem
33
$h3-font-size = 1.5rem
44
$h4-font-size = 1.4rem
@@ -175,12 +175,12 @@ $h6-font-size = 1.2rem
175175

176176

177177
+keep-tablet() {
178-
line-height 1.4
178+
line-height 1.5
179179
}
180180

181181

182182
+keep-mobile() {
183-
line-height 1.3
183+
line-height 1.4
184184
}
185185

186186

@@ -229,7 +229,7 @@ $h6-font-size = 1.2rem
229229
}
230230

231231
+keep-mobile() {
232-
line-height $h1-font-size * 0.8
232+
font-size $h1-font-size * 0.8
233233
}
234234

235235
a.headerlink
@@ -248,7 +248,7 @@ $h6-font-size = 1.2rem
248248
}
249249

250250
+keep-mobile() {
251-
line-height $h2-font-size * 0.8
251+
font-size $h2-font-size * 0.8
252252
}
253253

254254
a.headerlink
@@ -266,10 +266,12 @@ $h6-font-size = 1.2rem
266266
font-size $h3-font-size * 0.9
267267
}
268268

269+
269270
+keep-mobile() {
270-
line-height $h3-font-size * 0.8
271+
font-size $h3-font-size * 0.8
271272
}
272273

274+
273275
a.headerlink
274276
a.markdownIt-Anchor {
275277
font-size $h3-font-size * 0.8
@@ -285,10 +287,12 @@ $h6-font-size = 1.2rem
285287
font-size $h4-font-size * 0.9
286288
}
287289

290+
288291
+keep-mobile() {
289-
line-height $h4-font-size * 0.8
292+
font-size $h4-font-size * 0.8
290293
}
291294

295+
292296
a.headerlink
293297
a.markdownIt-Anchor {
294298
font-size $h4-font-size * 0.8
@@ -304,10 +308,12 @@ $h6-font-size = 1.2rem
304308
font-size $h5-font-size * 0.9
305309
}
306310

311+
307312
+keep-mobile() {
308-
line-height $h5-font-size * 0.8
313+
font-size $h5-font-size * 0.8
309314
}
310315

316+
311317
a.headerlink
312318
a.markdownIt-Anchor {
313319
font-size $h5-font-size * 0.8
@@ -318,11 +324,13 @@ $h6-font-size = 1.2rem
318324
h6 {
319325
font-weight 500
320326
font-size $h6-font-size
321-
line-height 1.2
322327

323328
+keep-tablet() {
324-
font-size $h6-font-size
325-
line-height 1.1
329+
font-size $h6-font-size * 0.9
330+
}
331+
332+
+keep-mobile() {
333+
font-size $h6-font-size * 0.8
326334
}
327335

328336
a.headerlink

‎source/css/layout/_page/home.styl

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@
8888
cursor default
8989
disable-user-select()
9090

91-
&.cover {
91+
&.cover-offset {
9292
top 0.6rem
9393
right 0.6rem
9494
}
9595

96-
&.card {
96+
&.card-offset {
9797
top 0.8rem
9898
right 0.8rem
9999
}

‎source/css/layout/_partial/footer.styl

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
$shields-style-height = 22px
2-
31
.footer {
42
display flex
53
flex-direction column

‎source/css/layout/page.styl

+2
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ $post-tools-offset = calc((100vw - var(--page-content-max-width) / 2) - 5rem)
114114

115115

116116
.page-main-content-middle {
117+
z-index $z-index-2
117118
display flex
118119
justify-content center
119120
width 100%
@@ -186,6 +187,7 @@ $post-tools-offset = calc((100vw - var(--page-content-max-width) / 2) - 5rem)
186187
position fixed
187188
right 0
188189
bottom 1.6rem
190+
z-index $z-index-3
189191
box-sizing border-box
190192
padding-right 1rem
191193

0 commit comments

Comments
 (0)