Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release new version #375

Merged
merged 9 commits into from
Nov 21, 2024
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions layout/_page/home.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<% } %>
Expand All @@ -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>
<% } %>
Expand Down
6 changes: 4 additions & 2 deletions layout/_partial/footer.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 7 additions & 5 deletions layout/_partial/post/post-meta-info.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>"
Expand All @@ -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')) { %>
Expand Down
30 changes: 19 additions & 11 deletions source/css/common/markdown.styl
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
}


Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/css/layout/_page/home.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions source/css/layout/_partial/footer.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
$shields-style-height = 22px

.footer {
display flex
flex-direction column
Expand Down
2 changes: 2 additions & 0 deletions source/css/layout/page.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand Down Expand Up @@ -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

Expand Down
Loading