Merge pull request #198 from XPoet/dev

release v3.6.1
This commit is contained in:
指间的诗意 2023-01-13 11:07:52 +08:00 committed by GitHub
commit 5367284355
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 30 additions and 26 deletions

View File

@ -1,8 +1,8 @@
<div align="right">
Language:
English
<a title="Chinese" href="docs/README_zh-CN.md">简中</a>
<a title="Chinese" href="docs/README_zh-TW.md">繁中</a>
English |
<a title="Chinese" href="docs/README_zh-CN.md"></a> |
<a title="Chinese" href="docs/README_zh-TW.md"></a>
</div>
<a href="https://xpoet.cn"><img align="center" alt="Keep" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/keep-logo-slogan.svg"></a>
@ -103,5 +103,7 @@ This project exists thanks to all the people who contribute.
## :memo: License
[GPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) Copyright © 2020-present XPoet
[AGPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE)
Copyright © 2020-present XPoet

View File

@ -1,5 +1,5 @@
## ======================================================================================
## Keep v3.6.0
## Keep v3.6.1
## Preview: https://xpoet.cn
## Documents: https://keep-docs.xpoet.cn
## Repository: https://github.com/XPoet/hexo-theme-keep

View File

@ -1,8 +1,8 @@
<div align="right">
语言:
简中
<a title="English" href="../README.md">English</a>
<a title="Chinese" href="README_zh-TW.md">繁中</a>
文 |
<a title="English" href="../README.md">English</a> |
<a title="Chinese" href="README_zh-TW.md"></a>
</div>
<a href="https://xpoet.cn"><img align="center" alt="Keep" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/keep-logo-slogan.svg"></a>
@ -102,4 +102,6 @@ $ git pull
## :memo: 许可
[GPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) Copyright © 2020-present XPoet
[AGPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE)
Copyright © 2020-present XPoet

View File

@ -1,8 +1,8 @@
<div align="right">
語言:
繁中
<a title="English" href="../README.md">English</a>
<a title="Chinese" href="README_zh-CN.md">简中</a>
文 |
<a title="English" href="../README.md">English</a> |
<a title="Chinese" href="README_zh-CN.md"></a>
</div>
<a href="https://xpoet.cn"><img align="center" alt="Keep" src="https://cdn.jsdelivr.net/gh/XPoet/image-hosting@master/hexo-theme-keep/keep-logo-slogan.svg"></a>
@ -103,4 +103,6 @@ $ git pull
## :memo: 許可
[GPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE) Copyright © 2020-present XPoet
[AGPL-3.0](https://github.com/XPoet/hexo-theme-keep/blob/master/LICENSE)
Copyright © 2020-present XPoet

View File

@ -34,7 +34,7 @@ const { site_uv: bsz_site_uv, site_pv: bsz_site_pv, enable: bsz_enable } = theme
</div>
<% } %>
<div class="theme-info info-item">
<%- __('powered_by', '<a target="_blank" href="https://hexo.io">Hexo</a>') %>&nbsp;|&nbsp;<%- __('theme') %>&nbsp;<a class="theme-version" target="_blank" href="https://github.com/XPoet/hexo-theme-keep">Keep v3.6.0</a>
<%- __('powered_by', '<a target="_blank" href="https://hexo.io">Hexo</a>') %>&nbsp;|&nbsp;<%- __('theme') %>&nbsp;<a class="theme-version" target="_blank" href="https://github.com/XPoet/hexo-theme-keep">Keep v3.6.1</a>
</div>
<% if (f_icp) { %>
<div class="icp-info info-item">

View File

@ -1,12 +1,9 @@
<%
const target_date = post.date !== post.updated ? post.updated : post.date
%>
<div class="home-article-meta-info-container">
<div class="home-article-meta-info">
<span>
<i class="fas fa-history"></i>&nbsp;
<span class="home-article-date" data-date="<%= target_date %>">
<%= date(target_date, 'YYYY-MM-DD') %>
<span class="home-article-date" data-updated="<%= post.updated %>">
<%= date(post.updated, 'YYYY-MM-DD') %>
</span>
</span>
<% if (post.categories.length && theme.home_article.category.enable === true) { %>

View File

@ -33,7 +33,7 @@
<div class="article-content keep-markdown-body">
<% if (page?.aging === true) { %>
<div class="article-aging-tips" data-update-date="<%= page.updated %>" data-aging-days="<%= page?.agingDays %>">
<div class="article-aging-tips" data-update-date="<%= page.updated %>" data-aging-days="<%= page?.aging_days %>">
<i class="fa-solid fa-circle-exclamation"></i><%- __('article-aging', '<span class="days">0</span>') %>
</div>
<% } %>
@ -41,7 +41,9 @@
<%- page.content %>
</div>
<% if (theme.post?.copyright_info === true || theme?.copyright_info?.enable === true) { %>
<% if (
(theme.post?.copyright_info === true || theme?.copyright_info?.enable === true) && page?.copyright_info !== false
) { %>
<div class="post-copyright-info">
<%- partial('_partial/article-copyright-info') %>
</div>

View File

@ -1,14 +1,13 @@
{
"name": "hexo-theme-keep",
"version": "3.6.0",
"version": "3.6.1",
"private": false,
"description": "A simple and elegant theme for Hexo.",
"scripts": {
"npm:publish": "npm publish",
"format": "prettier --write ./source/js/*.js ./scripts",
"lint:style": "stylelint --fix ./source/css",
"git:push": "git push --tag && git push -u origin dev",
"git:add": "npm run lint:style && git add ."
"git:add": "npm run format && npm run lint:style && git add ."
},
"repository": {
"type": "git",
@ -24,7 +23,7 @@
"powerful"
],
"author": "XPoet",
"license": "GPL-3.0",
"license": "AGPL-3.0",
"bugs": {
"url": "https://github.com/XPoet/hexo-theme-keep/issues"
},

View File

@ -295,7 +295,7 @@ KEEP.initUtils = () => {
post &&
post.forEach((v) => {
const nowDate = Date.now()
const postDate = new Date(v.dataset.date.split(' GMT')[0]).getTime()
const postDate = new Date(v.dataset.updated.split(' GMT')[0]).getTime()
v.innerHTML = this.getHowLongAgo(Math.floor((nowDate - postDate) / 1000))
})
},