Skip to content

Commit

Permalink
Merge pull request #306 from XPoet/dev
Browse files Browse the repository at this point in the history
Release new version
  • Loading branch information
XPoet authored Feb 18, 2024
2 parents a7d6fa9 + 41ba74d commit 414e812
Show file tree
Hide file tree
Showing 14 changed files with 97 additions and 27 deletions.
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.0.5` or later. (使用 Keep `4.0.5` 或更高版本)
- label: I am using Keep version `4.0.7` or later. (使用 Keep `4.0.7` 或更高版本)
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/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.0.5` or later. (使用 Keep `4.0.5` 或更高版本)
- label: I am using Keep version `4.0.7` or later. (使用 Keep `4.0.7` 或更高版本)
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.0.5` or later. (使用 Keep `4.0.5` 或更高版本)
- label: I am using Keep version `4.0.7` or later. (使用 Keep `4.0.7` 或更高版本)
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ We welcome you to join the development of **Keep**. Please see [contributing gui
**Keep** send special thanks to these great services that sponsor our core infrastructure:

- [GitHub](https://github.com) allows us to host the Git repository and run the test suite.
- Thanks [jsDelivr](https://www.jsdelivr.com) and [UNPKG](https://www.unpkg.com) for providing public CDN service.
- Thanks [cdnjs](https://cdnjs.com), [jsDelivr](https://www.jsdelivr.com) and [UNPKG](https://www.unpkg.com) for providing public CDN service.

## :memo: License

Expand Down
2 changes: 1 addition & 1 deletion docs/README_zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ $ git pull
**Keep** 特别感谢这些支持我们核心基础设施的优质服务:

- [GitHub](https://github.com) 容许我们托管 Git 仓库及运行测试。
- [jsDelivr](https://www.jsdelivr.com)[UNPKG](https://www.unpkg.com) 提供了 CDN 服务。
- [cdnjs](https://cdnjs.com)[jsDelivr](https://www.jsdelivr.com)[UNPKG](https://www.unpkg.com) 提供了 CDN 服务。

## :memo: 许可

Expand Down
2 changes: 1 addition & 1 deletion docs/README_zh-TW.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ $ git pull
**Keep** 特别感謝這些支持我們核心基本設施的優質服務:

- [GitHub](https://github.com) 允許我們存放 Git 原始碼庫及運行測試。
- [jsDelivr](https://www.jsdelivr.com)[UNPKG](https://www.unpkg.com) 提供了 CDN 服務。
- [cdnjs](https://cdnjs.com)[jsDelivr](https://www.jsdelivr.com)[UNPKG](https://www.unpkg.com) 提供了 CDN 服務。

## :memo: 許可

Expand Down
2 changes: 1 addition & 1 deletion layout/_partial/comment/plugins/artalk.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const artalk_js = `${artalk_server_url}/dist/Artalk.js`
>
if (!window.KeepCommentPlugin?.initArtalkTheme) {
window.KeepCommentPlugin.initArtalkTheme = () => {
return document.body.classList.contains('dark-mode')
return document.documentElement.classList.contains('dark-mode')
}
}
Expand Down
2 changes: 1 addition & 1 deletion layout/_partial/comment/plugins/giscus.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const giscus_language = config?.language || 'zh-CN'
>
if (!window.KeepCommentPlugin?.getGiscusTheme) {
window.KeepCommentPlugin.getGiscusTheme = () => {
return document.body.classList.contains('dark-mode') ? 'dark_dimmed' : 'light_tritanopia'
return document.documentElement.classList.contains('dark-mode') ? 'dark_dimmed' : 'light_tritanopia'
}
}
Expand Down
1 change: 1 addition & 0 deletions source/css/common/css-variables.styl
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
// ==============================================================================================
--post-title-align left // Option values: left | center | right
--post-author-avatar block // Option values: none | block
--post-author-name flex // Option values: none | flex
--post-create-datetime flex // Option values: none | flex
--post-update-datetime flex // Option values: none | flex
--post-img-align 0 auto 0 0 // Option values: 0 auto 0 0 (left) | 0 auto (center) | 0 0 0 auto (right)
Expand Down
48 changes: 40 additions & 8 deletions source/css/layout/category-list.styl
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
$left-gap = 1.6rem
$spacing-padding = 0.6rem

.category-list-container {

keep-container(1, 2rem, 0)

padding-top 1.2rem
padding-bottom 1.2rem

.category-list-content {

ul.site-all-category-list {
Expand All @@ -17,32 +23,58 @@
margin-bottom 0
}


.self-category-info {
position relative
display flex
align-items center
justify-content space-between
box-sizing border-box
padding 0.5rem 0
height 2.6rem

.left {
position relative
box-sizing border-box
display flex
align-items center
justify-content flex-start
width 100%
height 100%


.icon {
padding-right 0.4rem
display flex
flex-shrink 0
align-items center
justify-content flex-start
width $left-gap
height 100%
color var(--text-color-3)
font-size 0.8rem
font-size 1.06rem
cursor pointer
}


.site-all-category-list-link {
position relative
display flex
align-items center
justify-content flex-start
box-sizing border-box
width 100%
height 100%
font-size 1.02rem
}
}


.right {
display flex
flex-shrink 0
align-items center
justify-content flex-end
width 1.6rem
height 100%

.site-all-category-list-count {
color var(--text-color-3)
font-size 1.08rem
}
}
}
Expand All @@ -52,7 +84,7 @@
position relative
box-sizing border-box
height 0
margin-left 1.5rem
margin-left $left-gap
overflow hidden
visibility hidden
}
Expand Down
2 changes: 1 addition & 1 deletion source/css/layout/post-content.styl
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ $spacer-padding = 2rem
padding 0.2rem 0

.author {
display flex
display var(--post-author-name)
align-items center
font-weight 600
font-size 1.18rem
Expand Down
2 changes: 0 additions & 2 deletions source/images/bg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions source/images/bg2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 10 additions & 8 deletions source/js/page/category-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ function resetCategoriesPage() {
const childCategoryInfo = dom.querySelector('.site-all-category-list-child')

let domTemplate = `
<div class="self-category-info">
<div class="left">${
childCategoryInfo ? '<i class="icon fa-solid fa-chevron-right"></i> ' : ''
<div class="self-category-info border-box">
<div class="left border-box">${
childCategoryInfo
? '<i class="icon border-box fa-regular fa-square-plus"></i> '
: ''
}${categoryNameDom.outerHTML}</div>
<div class="right">${categoryCountDom.outerHTML}</div>
<div class="right border-box">${categoryCountDom.outerHTML}</div>
</div>
`

Expand All @@ -39,13 +41,13 @@ function resetCategoriesPage() {
if (isExpand) {
childDom.style.height = 'auto'
childDom.style.visibility = 'visible'
iconDom.classList.add('fa-chevron-down')
iconDom.classList.remove('fa-chevron-right')
iconDom.classList.add('fa-square-minus')
iconDom.classList.remove('fa-square-plus')
} else {
childDom.style.height = '0'
childDom.style.visibility = 'hidden'
iconDom.classList.add('fa-chevron-right')
iconDom.classList.remove('fa-chevron-down')
iconDom.classList.add('fa-square-plus')
iconDom.classList.remove('fa-square-minus')
}
}
})
Expand Down

0 comments on commit 414e812

Please sign in to comment.