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 #244

Merged
merged 8 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 60 additions & 12 deletions .github/workflows/release-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,66 @@ jobs:
release-type: node
package-name: standard-version
changelog-types: '[
{"type": "feat", "section": "Features", "hidden": false},
{"type": "fix", "section": "Bug Fixes", "hidden": false},
{"type": "docs", "section": "Docs", "hidden": false},
{"type": "style", "section": "Styling", "hidden": false},
{"type": "refactor", "section": "Code Refactoring", "hidden": false},
{"type": "perf", "section": "Performance Improvements", "hidden": false},
{"type": "test", "section": "Tests", "hidden": false},
{"type": "build", "section": "Build System", "hidden": false},
{"type": "revert", "section": "Reverts", "hidden": false},
{"type": "ci", "section": "CI", "hidden": false},
{"type": "ui", "section": "Improvement UI", "hidden": false},
{"type": "chore", "section": "Chore", "hidden": false}
{
"type": "feat",
"section": "🌟 Features",
"hidden": false
},
{
"type": "fix",
"section": "🐞 Bug Fixes",
"hidden": false
},
{
"type": "docs",
"section": "📖 Docs",
"hidden": false
},
{
"type": "style",
"section": "🎨 Styling",
"hidden": false
},
{
"type": "refactor",
"section": "🍭 Code Refactoring",
"hidden": false
},
{
"type": "perf",
"section": "🛠 Performance Improvements",
"hidden": false
},
{
"type": "test",
"section": "🚧 Tests",
"hidden": false
},
{
"type": "build",
"section": "📦 Build System",
"hidden": false
},
{
"type": "revert",
"section": "🌀 Reverts",
"hidden": false
},
{
"type": "ci",
"section": "🎯 CI",
"hidden": false
},
{
"type": "ui",
"section": "💄 Improvement UI",
"hidden": false
},
{
"type": "chore",
"section": "🚦 Chore",
"hidden": false
}
]'

# The logic below handles the npm publication
Expand Down
5 changes: 0 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,9 @@ footer:
custom:
- link_url: # Your link url, Can be null
img_url: # Shields image url

# e.g.
# - link_url: https://github.com/XPoet/hexo-theme-keep
# img_url: https://img.shields.io/badge/Hexo-Keep%20v3.7.3-blue?style=flat-square&logo=hexo
#
# - link_url: https://github.com/XPoet/hexo-theme-keep
# img_url: https://img.shields.io/badge/Hexo-Keep%20v3.7.3-red?style=flat-square&logo=hexo
#
# - ...

# ---------------------------------------------------------------------------------------
Expand Down
14 changes: 8 additions & 6 deletions languages/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ copy_copyright:
author: Original article author
link: Original article link
copyright:
author: Post author
title: Post title
link: Post link
author: Author
title: Title
link: Link
create_time: Create time
published: Published
license: License
license_title: Copyright notice
license_content: "All articles in this blog are licensed under %s unless stating additionally."
article-aging: "It has been %s days since the last update of this article. Some contents may be outdated. Please pay attention to screening."
Expand All @@ -71,9 +73,9 @@ ago:
year: "%s years ago"
footer:
powered_by: "Powered by %s"
site_uv: Visitor count
site_pv: Totalview
deploy: "This site is provided with deployment services by %s"
site_uv: Unique Visitor
site_pv: Page View
deploy: "This site is deployed on %s"
deploy_provider:
github: GitHub Pages
vercel: Vercel
Expand Down
14 changes: 8 additions & 6 deletions languages/zh-CN.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ copy_copyright:
author: 原文作者
link: 原文链接
copyright:
title: 本文标题
author: 本文作者
link: 本文链接
title: 标题
author: 作者
link: 链接
create_time: 创建时间
published: 发布于
license: 许可
license_title: 版权声明
license_content: "本博客所有文章除特别声明外,均采用 %s 许可协议。转载请注明出处!"
article-aging: "本文距离上次更新已过去 %s 天,部分内容可能已经过时,请注意甄别。"
Expand All @@ -71,8 +73,8 @@ ago:
year: "%s 年前"
footer:
powered_by: "由 %s 驱动"
site_uv: 访问人数
site_pv: 总访问量
site_uv: 访客数
site_pv: 访问量
deploy: "本站由 %s 提供部署服务"
deploy_provider:
github: GitHub Pages
Expand All @@ -82,4 +84,4 @@ footer:
aliyun: 阿里云
tencent_cloud: 腾讯云
upyun: 又拍云
total_words: 全站总字数
total_words: 总字数
12 changes: 7 additions & 5 deletions languages/zh-TW.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ copy_copyright:
copied: 已復製
title: 原文標題
author: 原文作者
link: 原文鏈接
link: 原文連結
copyright:
author: 文章作者
title: 文章標題
link: 永久連結
author: 作者
title: 標題
link: 連結
create_time: 撰寫時間
published: 發布于
license: 許可
license_title: 版權宣告
license_content: "這個網站所有文章均使用 %s 授權"
article-aging: "本文距離上次更新已過去 %s 天,部分內容可能已經過時,請註意甄別。"
Expand All @@ -82,4 +84,4 @@ footer:
aliyun: 阿裏雲
tencent_cloud: 騰訊雲
upyun: 又拍雲
total_words: 全站總字數
total_words: 總字數
66 changes: 45 additions & 21 deletions layout/_partial/article-copyright-info.ejs
Original file line number Diff line number Diff line change
@@ -1,24 +1,48 @@
<%
const colon = config.language === 'en' ? ': ' : ':'
%>
<div class="article-copyright-info-container">
<ul class="copyright-info-content">
<li class="post-title">
<span class="type"><%- __('copyright.title') %></span><%= colon %><span class="content"><%= page.title %></span>
</li>
<li class="post-author">
<span class="type"><%- __('copyright.author') %></span><%= colon %><span class="content"><%= theme?.base_info?.author || config.author %></span>
</li>
<li class="post-time">
<span class="type"><%- __('copyright.create_time') %></span><%= colon %><span class="content"><%= date(page.date, 'YYYY-MM-DD HH:mm:ss') %></span>
</li>
<li class="post-link">
<span class="type"><%- __('copyright.link') %></span><%= colon %><span class="content"><%= page.path %></span>
</li>
<li class="post-license">
<span class="type"><%- __('copyright.license_title') %></span><%= colon %><span class="content"><%- __('copyright.license_content', '<a class="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh">BY-NC-SA</a>') %></span>
</li>
</ul>
<div class="article-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">
<%= page.title %>
</div>

<div class="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="type">
<%- __('copyright.author') %>
</div>
<div class="content"><%= theme?.base_info?.author || config.author %></div>
</div>

<div class="post-time bottom-item">
<div class="type">
<%- __('copyright.published') %>
</div>
<div class="content"><%= date(page.date, 'YYYY-MM-DD HH:mm') %></div>
</div>


<div class="post-license bottom-item">
<div class="type">
<%- __('copyright.license') %>
</div>
<div class="content tooltip" data-content="CC BY-NC-SA 4.0">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh">
<i class="fa-brands fa-creative-commons"></i>
<i class="fa-brands fa-creative-commons-by"></i>
<i class="fa-brands fa-creative-commons-nc"></i>
<i class="fa-brands fa-creative-commons-sa"></i>
</a>
</div>
</div>
</div>

<i class="copyright-bg fa-solid fa-copyright"></i>
</div>
<div class="copy-copyright-info flex-center tooltip" data-content="<%= __('copy_copyright.copy') %>" data-offset-y="-2px">
<i class="fa-solid fa-copy"></i>
</div>
Expand Down
2 changes: 1 addition & 1 deletion layout/_partial/article-meta-info.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const home_tag_limit_number = theme?.home_article?.tag?.limit || 3

<span class="meta-info-item article-update-date">
<i class="icon fa-solid fa-file-pen"></i>&nbsp;
<span class="pc"><%= date(post.updated, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
<span class="pc" data-updated="<%= post.updated %>"><%= date(post.updated, theme.post?.datetime_format || 'YYYY-MM-DD HH:mm:ss') %></span>
</span>
<% } %>

Expand Down
34 changes: 18 additions & 16 deletions layout/article-content.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<% if (page?.cover) { %>
<div class="article-content-top border-box">
<div class="cover-article-title text-ellipsis">
<div class="cover-article-title">
<%= page.title %>
</div>
<img class="post-cover" src="<%= page.cover %>" alt="<%= page.title %>">
Expand All @@ -15,7 +15,7 @@
<div class="article-content-bottom border-box<%= page?.cover ? ' has-cover' : '' %>">
<% if (!page?.cover) { %>
<div class="article-title">
<span class="title-hover-animation"><%= page.title %></span>
<%= page.title %>
</div>
<% } %>

Expand Down Expand Up @@ -84,14 +84,15 @@
<a class="prev"
rel="prev"
href="<%= url_for(page.prev.path) %>"
title="<%= page.prev.title %>"
>
<span class="left arrow-icon flex-center">
<i class="fas fa-chevron-left"></i>
</span>
<span class="title flex-center">
<span class="post-nav-title-item text-ellipsis"><%= page.prev.title %></span>
<span class="post-nav-item"><%= __('prev_posts') %></span>
</span>
<span class="left arrow-icon flex-center">
<i class="fas fa-chevron-left"></i>
</span>
<span class="title flex-center">
<span class="post-nav-title-item text-ellipsis"><%= page.prev.title %></span>
<span class="post-nav-item"><%= __('prev_posts') %></span>
</span>
</a>
</div>
<% } %>
Expand All @@ -100,14 +101,15 @@
<a class="next"
rel="next"
href="<%= url_for(page.next.path) %>"
title="<%= page.next.title %>"
>
<span class="title flex-center">
<span class="post-nav-title-item text-ellipsis"><%= page.next.title %></span>
<span class="post-nav-item"><%= __('next_posts') %></span>
</span>
<span class="right arrow-icon flex-center">
<i class="fas fa-chevron-right"></i>
</span>
<span class="title flex-center">
<span class="post-nav-title-item text-ellipsis"><%= page.next.title %></span>
<span class="post-nav-item"><%= __('next_posts') %></span>
</span>
<span class="right arrow-icon flex-center">
<i class="fas fa-chevron-right"></i>
</span>
</a>
</div>
<% } %>
Expand Down
2 changes: 1 addition & 1 deletion layout/home-content.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<% if (post?.cover) { %>
<div class="home-article-item-top border-box"
style="height: <%= post?.cover_height ? post?.cover_height + 'px' : '9.2rem' %>"
style="height: <%= post?.cover_height ? post?.cover_height + 'px' : '10rem' %>"
>
<% if (post.sticky) { %>
<div class="post-sticky-box cover">
Expand Down
3 changes: 2 additions & 1 deletion source/css/common/basic.styl
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ img {
box-sizing border-box
}


// ======================================================================
// text ellipsis
// ======================================================================
Expand Down Expand Up @@ -252,7 +253,7 @@ img {
position absolute
top -0.4rem
left 50%
z-index $z-index-9
z-index $z-index-10
display none
box-sizing border-box
padding 0.2rem 0.6rem
Expand Down
8 changes: 4 additions & 4 deletions source/css/common/variables.styl
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $scrollbar-color = lighten($text-color-3, 10%)
$scrollbar-background-color = darken($background-color-1, 10%)
$toc-scrollbar-color = alpha($text-color-3, 0.1)

$copyright-info-color = #cc0033
$copyright-icon-bg-color = alpha($text-color-3, 0.12)

$avatar-background-color = $primary-color-dark-1

Expand Down Expand Up @@ -153,7 +153,7 @@ $dark-scrollbar-color = darken($dark-background-color-1, 10%)
$dark-scrollbar-background-color = lighten($dark-background-color-1, 20%)
$dark-toc-scrollbar-color = alpha($dark-text-color-3, 0.1)

$dark-copyright-info-color = darken($copyright-info-color, 20%)
$dark-copyright-icon-bg-color = alpha($dark-text-color-3, 0.12)

$dark-avatar-background-color = darken($avatar-background-color, 20%)

Expand Down Expand Up @@ -219,8 +219,8 @@ root-color(mode) {
--scrollbar-background-color mode == 'light' ? $scrollbar-background-color : $dark-scrollbar-background-color
--toc-scrollbar-color mode == 'light' ? $toc-scrollbar-color : $dark-toc-scrollbar-color

// copyright info left side color
--copyright-info-color mode == 'light' ? $copyright-info-color : $dark-copyright-info-color
// copyright icon background color
--copyright-icon-bg-color mode == 'light' ? $copyright-icon-bg-color : $dark-copyright-icon-bg-color

// avatar background color
--avatar-background-color mode == 'light' ? $avatar-background-color : $dark-avatar-background-color
Expand Down
Loading