From 5aac8eab692de85c75b298e5a9d4acbc84475c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Thu, 28 Nov 2024 10:09:44 +0800 Subject: [PATCH 1/8] =?UTF-8?q?build:=20=E6=9B=B4=E6=96=B0=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E7=89=88=E6=9C=AC=E5=92=8C=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 fontawesome 版本至 6.7.1 - 修改 fontawesome 包名以使用官方名称 - 添加 fontawesome 的其他名称以保持向后兼容 - 更新 typeit_js 文件路径 --- plugins.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins.yml b/plugins.yml index 8735f62f..620c6177 100644 --- a/plugins.yml +++ b/plugins.yml @@ -86,9 +86,10 @@ snackbar: file: dist/snackbar.min.js version: 0.1.16 fontawesome: - name: font-awesome + name: '@fortawesome/fontawesome-free' file: css/all.min.css - version: 6.6.0 + version: 6.7.1 + other_name: font-awesome medium_zoom: name: medium-zoom file: dist/medium-zoom.min.js @@ -114,7 +115,7 @@ chart_js: other_name: Chart.js typeit_js: name: typeit - file: index.umd.min.js + file: dist/index.umd.min.js version: 8.8.7 other_name: typeit blueimp_md5: From 73f19e1b528b7226c52a5b043cb9b239031229cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Sat, 30 Nov 2024 17:43:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?refactor(layout):=20=E5=B0=86=20pace.js=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=BC=95=E5=85=A5=E6=96=B9=E5=BC=8F=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8C=85=E5=90=AB=E6=B7=B7=E5=85=A5=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 用 include 语句引入 ../mixins/pace.pug 替代直接引入 pace.js - 此更改有助于更好地组织代码结构，提高可维护性 --- layout/includes/inject/body.pug | 2 +- layout/includes/mixins/pace.pug | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 layout/includes/mixins/pace.pug diff --git a/layout/includes/inject/body.pug b/layout/includes/inject/body.pug index acffbf8c..835ac3c7 100644 --- a/layout/includes/inject/body.pug +++ b/layout/includes/inject/body.pug @@ -82,7 +82,7 @@ div script(src=url_for(theme.cdn.cover_ave)) if theme.loading.pace - script(src=url_for(theme.cdn.pace_js)) + include ../mixins/pace.pug if theme.search.enable && theme.search.type === "algolia" script(src=url_for(theme.cdn.instantsearch)) diff --git a/layout/includes/mixins/pace.pug b/layout/includes/mixins/pace.pug new file mode 100644 index 00000000..c31afda2 --- /dev/null +++ b/layout/includes/mixins/pace.pug @@ -0,0 +1,10 @@ +script. + window.paceOptions = { + restartOnPushState: false + } + + utils.addGlobalFn('pjaxSend', () => { + Pace.restart() + }, 'pace_restart') + +script(src=url_for(theme.cdn.pace_js)) \ No newline at end of file From cdb3d3d5a6832ae61e5450ab2d03413ab2c5bb60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Sat, 30 Nov 2024 17:46:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?style(header):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=A4=B4=E9=83=A8=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为搜索输入框添加宽度限制，防止内容溢出 - 添加文本溢出省略效果，提高可读性 - 设置白色空间为 nowrap，确保文本不换行 --- source/css/_layout/header.styl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/css/_layout/header.styl b/source/css/_layout/header.styl index b687ecbd..fbc76a28 100644 --- a/source/css/_layout/header.styl +++ b/source/css/_layout/header.styl @@ -279,6 +279,10 @@ opacity 1 transition .3s line-height 1 + width 70% + overflow hidden + text-overflow ellipsis + white-space nowrap &:hover &:after From 9f6d2fb580a7b08590c467e0455925531b550d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Sat, 30 Nov 2024 18:03:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?refactor(css):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除控制台的最小宽度限制 - 调整控制台卡片的布局和样式 - 优化最近评论页面的响应式布局 - 改进按钮和图标样式 --- source/css/_layout/console.styl | 13 +++++-------- source/css/_page/recentcomment.styl | 9 +++++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/source/css/_layout/console.styl b/source/css/_layout/console.styl index 83a5ec75..181f052d 100644 --- a/source/css/_layout/console.styl +++ b/source/css/_layout/console.styl @@ -34,7 +34,6 @@ transform translateY(20px) transition .3s max-width 1400px - min-width 1000px +maxWidth1300() justify-content center @@ -58,7 +57,7 @@ width 40% height 100% - +maxWidth1300() + +maxWidth900() display none .console-card-group-right @@ -69,9 +68,6 @@ width 60% overflow hidden - +maxWidth1300() - display none - .console-card background var(--efu-maskbg) border-radius 12px @@ -134,8 +130,8 @@ width fit-content .console-btn-item - width 60px - height 60px + width 80px + height 40px transition .3s cursor pointer @@ -162,7 +158,8 @@ align-items center justify-content center color var(--efu-fontcolor) - transition all .3s + transition .3s + box-shadow var(--efu-shadow-border) i font-size 1rem diff --git a/source/css/_page/recentcomment.styl b/source/css/_page/recentcomment.styl index ebdbe35b..a6f5087a 100644 --- a/source/css/_page/recentcomment.styl +++ b/source/css/_page/recentcomment.styl @@ -5,6 +5,10 @@ div.console_recentcomments min-height 100px width 100% + +maxWidth1300() + overflow-y scroll + scrollbar-width none + .comment-card position relative width calc(100% / 3 - 8px) @@ -22,8 +26,9 @@ div.console_recentcomments .console-card & width calc(100% / 2 - 8px) - +maxWidth900() - width calc(100% / 2 - 6px) + +maxWidth1300() + min-width 100% + height calc(100% / 3 - 8px) +maxWidth768() width 100% From 66675d0a7c045964f536f547fd4974d1c4f25a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Sat, 30 Nov 2024 20:52:29 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat(layout):=20=E4=BC=98=E5=8C=96=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E6=A0=8F=E5=92=8C=E5=AD=98=E6=A1=A3=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改右侧栏样式，增加 needEndHide 类名 - 更新存档卡片样式，添加全部存档链接 - 调整控制台样式，优化响应式布局 - 修改右侧栏隐藏逻辑，确保正确显示 --- layout/includes/rightside.pug | 2 +- layout/includes/widgets/aside/asideArchive.pug | 8 +++++++- source/css/_layout/console.styl | 3 +++ source/css/_layout/rightside.styl | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/layout/includes/rightside.pug b/layout/includes/rightside.pug index bca5cef4..3dafb015 100644 --- a/layout/includes/rightside.pug +++ b/layout/includes/rightside.pug @@ -1,3 +1,3 @@ -#rightside +#rightside.needEndHide include ./widgets/rightside/hide include ./widgets/rightside/show \ No newline at end of file diff --git a/layout/includes/widgets/aside/asideArchive.pug b/layout/includes/widgets/aside/asideArchive.pug index 2dc18ca2..1b9ae83b 100644 --- a/layout/includes/widgets/aside/asideArchive.pug +++ b/layout/includes/widgets/aside/asideArchive.pug @@ -8,4 +8,10 @@ ul.card-archive-list span.card-archive-list-date= key .card-archive-list-count-group span.card-archive-list-count= value - span.card-archive-list-count-unit= __('console.archive_unit') \ No newline at end of file + span.card-archive-list-count-unit= __('console.archive_unit') + li.card-archive-list-item + a.card-archive-list-link(href='/archives/') + span.card-archive-list-date= __('console.archive_all') + .card-archive-list-count-group + span.card-archive-list-count= site.posts.length + span.card-archive-list-count-unit= __('console.archive_unit') \ No newline at end of file diff --git a/source/css/_layout/console.styl b/source/css/_layout/console.styl index 181f052d..94fa0174 100644 --- a/source/css/_layout/console.styl +++ b/source/css/_layout/console.styl @@ -68,6 +68,9 @@ width 60% overflow hidden + +maxWidth900() + width 100% + .console-card background var(--efu-maskbg) border-radius 12px diff --git a/source/css/_layout/rightside.styl b/source/css/_layout/rightside.styl index 22fe106a..6599ba37 100644 --- a/source/css/_layout/rightside.styl +++ b/source/css/_layout/rightside.styl @@ -6,6 +6,11 @@ if hexo-config('rightside.enable') z-index: 1000 opacity: 0 transition: all .5s + &.needEndHide + display block!important + &.hide.needEndHide + bottom 0!important + transform: none !important button display: block From b75e62e2e23108d077221bfd31f8b5868bbdfc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Sat, 30 Nov 2024 20:56:49 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(i18n):=20=E6=B7=BB=E5=8A=A0"=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=96=87=E7=AB=A0"=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 default、en、zh-CN 和 zh-TW 语言文件中添加了"全部文章"的翻译，用于归档页面显示所有文章。 --- index.html | 123 ++++++++++++++++++++++++++++++++++++++++++ languages/default.yml | 1 + languages/en.yml | 1 + languages/zh-CN.yml | 1 + languages/zh-TW.yml | 1 + 5 files changed, 127 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 00000000..cd772d9f --- /dev/null +++ b/index.html @@ -0,0 +1,123 @@ + + + + + + 404 - Page Not Found + + + + + +
+
+

404

+

Oops! The page you're looking for seems to have wandered off into the digital wilderness.

+ Return Home +
+
+ + diff --git a/languages/default.yml b/languages/default.yml index a0186255..e903fd45 100644 --- a/languages/default.yml +++ b/languages/default.yml @@ -131,6 +131,7 @@ console: switch_keyboard: 键盘快捷键 switch_music: 音乐开关 archive_unit: 篇 + archive_all: 全部文章 recent_comment_more: 最近评论 newest_comment: image: 图片 diff --git a/languages/en.yml b/languages/en.yml index 6f021b83..a4bacadb 100755 --- a/languages/en.yml +++ b/languages/en.yml @@ -131,6 +131,7 @@ console: switch_keyboard: Keyboard operation switch_music: Music switch archive_unit: Posts + archive_all: All posts recent_comment_more: Recent comments newest_comment: image: Image diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index a0186255..e903fd45 100755 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -131,6 +131,7 @@ console: switch_keyboard: 键盘快捷键 switch_music: 音乐开关 archive_unit: 篇 + archive_all: 全部文章 recent_comment_more: 最近评论 newest_comment: image: 图片 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index 383ec6aa..5fb09e18 100755 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -131,6 +131,7 @@ console: switch_keyboard: 鍵盤快捷鍵 switch_music: 音樂開關 archive_unit: 篇 + archive_all: 全部文章 recent_comment_more: 最近評論 newest_comment: image: 圖片 From 41788cc860269a32201ae5e4d80e06dd36092174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Sat, 30 Nov 2024 21:01:25 +0800 Subject: [PATCH 7/8] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E5=88=97=E8=A1=A8=E9=A1=B9=E5=AE=BD=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将卡片列表项的宽度从固定的百分比改为使用 calc 函数计算 - 新的宽度计算方法为：25% - 0.375rem - 这样可以更精确地控制卡片列表项的宽度，适应不同的屏幕尺寸 --- source/css/_layout/console.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/css/_layout/console.styl b/source/css/_layout/console.styl index 94fa0174..2dc4e05f 100644 --- a/source/css/_layout/console.styl +++ b/source/css/_layout/console.styl @@ -254,7 +254,7 @@ gap .5rem li.card-archive-list-item - flex 0 1 24.101% + flex 0 1 calc(25% - .375rem) .card-archive-list-link border-radius 8px From e9c7a1d994330e54b2f3926608648473308358d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E5=B0=8F=E5=8F=AA=E6=89=98=E5=B0=BC?= Date: Sat, 30 Nov 2024 21:07:16 +0800 Subject: [PATCH 8/8] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=20404=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了 index.html 文件，包括自定义的 404 页面样式和内容 - 在 package.json 中将版本号从 2.1.10 升级到 2.1.11 --- index.html | 123 --------------------------------------------------- package.json | 2 +- 2 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index cd772d9f..00000000 --- a/index.html +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - 404 - Page Not Found - - - - - -
-
-

404

-

Oops! The page you're looking for seems to have wandered off into the digital wilderness.

- Return Home -
-
- - diff --git a/package.json b/package.json index 09df27c1..2706e341 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-solitude", - "version": "2.1.10", + "version": "2.1.11", "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.", "main": "package.json", "scripts": {