From dc96e760f74d405451f88f7173ca109b1542efa4 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: Fri, 6 Sep 2024 01:27:39 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=F0=9F=94=A5=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=96=87=E7=AB=A0=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/widgets/aside/asideNewestPost.pug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/includes/widgets/aside/asideNewestPost.pug b/layout/includes/widgets/aside/asideNewestPost.pug index 31f9a3d8..6b332f04 100644 --- a/layout/includes/widgets/aside/asideNewestPost.pug +++ b/layout/includes/widgets/aside/asideNewestPost.pug @@ -6,8 +6,8 @@ - let index = 1 each post in site.posts.data.sort((a, b) => b.date < a.date ? -1 : 1) if index <= 5 - .aside-list-item - a.thumbnail(href=url_for(post.path) title=post.title) + a.aside-list-item(href=url_for(post.path) title=post.title) + .thumbnail img(alt=post.title src=url_for(post.cover)) .content span.title(href=url_for(post.path) title=post.title)= post.title From c41ad3fc1e0f598c298939a8bbab3f6d6849df7d 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: Fri, 6 Sep 2024 01:31:03 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E2=9C=A8=20=E9=87=8D=E5=86=99=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widgets/aside/asideNewestPost.pug | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/layout/includes/widgets/aside/asideNewestPost.pug b/layout/includes/widgets/aside/asideNewestPost.pug index 6b332f04..468df995 100644 --- a/layout/includes/widgets/aside/asideNewestPost.pug +++ b/layout/includes/widgets/aside/asideNewestPost.pug @@ -3,14 +3,11 @@ i.solitude.fa-solid.fa-map span= _p('aside.newpost') .aside-list - - let index = 1 - each post in site.posts.data.sort((a, b) => b.date < a.date ? -1 : 1) - if index <= 5 - a.aside-list-item(href=url_for(post.path) title=post.title) - .thumbnail - img(alt=post.title src=url_for(post.cover)) - .content - span.title(href=url_for(post.path) title=post.title)= post.title - if post.categories.data[0] - span.article-recent_post_categories(href=url_for(post.path))= post.categories.data[0].name - - index++ \ No newline at end of file + each post in site.posts.data.sort((a, b) => b.date < a.date ? -1 : 1).slice(0, 5) + a.aside-list-item(href=url_for(post.path) title=post.title) + .thumbnail + img(alt=post.title src=url_for(post.cover)) + .content + span.title(href=url_for(post.path) title=post.title)= post.title + if post.categories.data[0] + span.article-recent_post_categories(href=url_for(post.path))= post.categories.data[0].name \ No newline at end of file From 28fc28d573d0e92c50e33ce513de8c9afb42d67b Mon Sep 17 00:00:00 2001 From: Pear <1645253@qq.com> Date: Fri, 6 Sep 2024 10:40:17 +0800 Subject: [PATCH 03/19] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=B8=8E=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/says.pug | 2 +- layout/includes/rightmenu.pug | 2 +- layout/includes/widgets/aside/asideWebInfo.pug | 4 ++-- layout/includes/widgets/post/postInfo.pug | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/layout/includes/page/says.pug b/layout/includes/page/says.pug index abce6540..9188cfe2 100644 --- a/layout/includes/page/says.pug +++ b/layout/includes/page/says.pug @@ -38,7 +38,7 @@ if theme.says.enable .bber-bottom .bber-info .bber-info-time - i.solitude.fa-solid.fa-calendar-days + i.solitude.fa-solid.fa-calendar-day time.datetime(datetime=moment(item.date).format()) if item.location .bber-info-location diff --git a/layout/includes/rightmenu.pug b/layout/includes/rightmenu.pug index 81e3286d..c42ab223 100644 --- a/layout/includes/rightmenu.pug +++ b/layout/includes/rightmenu.pug @@ -7,7 +7,7 @@ div#rightMenu div.rightMenu-item#menu-forward i.solitude.fa-solid.fa-arrow-right div.rightMenu-item#menu-refresh - i.solitude.fa-solid.fa-arrow-rotate-right + i.solitude.fa-solid.fa-arrows-rotate div.rightMenu-item#menu-top i.solitude.fa-solid.fa-arrow-up div.rightMenu-group.rightMenu-line.rightMenuPlugin diff --git a/layout/includes/widgets/aside/asideWebInfo.pug b/layout/includes/widgets/aside/asideWebInfo.pug index 0751323d..65b1eac1 100644 --- a/layout/includes/widgets/aside/asideWebInfo.pug +++ b/layout/includes/widgets/aside/asideWebInfo.pug @@ -31,13 +31,13 @@ if theme.aside.siteinfo.runtimeenable .webinfo-item .webinfo-item-title - i.item-icon.solitude.fa-solid.fa-calendar-days + i.item-icon.solitude.fa-solid.fa-calendar-day .item-name= __('aside.runtime') .item-count#runtimeshow if theme.aside.siteinfo.updatetime .webinfo-item .webinfo-item-title - i.item-icon.solitude.fa-solid.fa-rotate-left + i.item-icon.solitude.fa-solid.fa-arrows-rotate .item-name= __('aside.updatetime') time.item-count(datetime=new Date()) if theme.wordcount && theme.aside.siteinfo.wordcount diff --git a/layout/includes/widgets/post/postInfo.pug b/layout/includes/widgets/post/postInfo.pug index ea8cd8fe..8d671fa9 100644 --- a/layout/includes/widgets/post/postInfo.pug +++ b/layout/includes/widgets/post/postInfo.pug @@ -18,11 +18,11 @@ .meta-secondline if theme.post.meta.date span.post-meta-date(title=_p('post.posted') + ' ' + full_date(page.date)) - i.post-meta-icon.solitude.fa-solid.fa-calendar-days + i.post-meta-icon.solitude.fa-solid.fa-clock time(datetime=date_xml(page.date))= date_xml(page.date) if theme.post.meta.updated span.post-meta-date(title=_p('post.updated') + ' ' + full_date(page.updated)) - i.post-meta-icon.solitude.fa-solid.fa-arrow-rotate-right + i.post-meta-icon.solitude.fa-solid.fa-arrows-rotate time(datetime=date_xml(page.updated))= date_xml(page.updated) if theme.wordcount span.post-meta-wordcount From 42ac915372824aafb1bcdaf10662fe8fb3e953b6 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: Fri, 6 Sep 2024 15:00:48 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=F0=9F=94=A5=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=87=E7=AB=A0=E6=A0=87=E9=A2=98=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/css/_layout/recent-post.styl | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/css/_layout/recent-post.styl b/source/css/_layout/recent-post.styl index 4ee3d3e5..62011e3f 100644 --- a/source/css/_layout/recent-post.styl +++ b/source/css/_layout/recent-post.styl @@ -128,8 +128,6 @@ if hexo-config('index_post_list.direction') == "column" display -webkit-box overflow hidden -webkit-box-orient vertical - +minWidth1300() - font-size 30px .recent-post-info-top-tips display flex From 7ceeea7005f9e127c6f663af465f74d668661fca 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: Fri, 6 Sep 2024 21:18:18 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=F0=9F=94=A5=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/css/_page/_about/buff.styl | 1 - source/css/_page/_about/contentinfo.styl | 4 ++-- source/css/_page/_about/game.styl | 2 -- source/css/_page/_about/maxim.styl | 1 - source/css/_page/_about/myphoto.styl | 1 - source/css/_page/_about/oneself.styl | 2 +- source/css/_page/_about/personalities.styl | 2 +- source/css/_page/_about/skills.styl | 1 - source/css/_page/_about/statistic.styl | 1 - source/css/_page/other.styl | 3 ++- 10 files changed, 6 insertions(+), 12 deletions(-) diff --git a/source/css/_page/_about/buff.styl b/source/css/_page/_about/buff.styl index a9d37138..c19c1c75 100644 --- a/source/css/_page/_about/buff.styl +++ b/source/css/_page/_about/buff.styl @@ -13,7 +13,6 @@ animation gradient 15s ease infinite min-height 200px height fit-content - width calc(60% - (.5rem / 2)) .card-content display flex diff --git a/source/css/_page/_about/contentinfo.styl b/source/css/_page/_about/contentinfo.styl index 1c33bee9..046461e4 100644 --- a/source/css/_page/_about/contentinfo.styl +++ b/source/css/_page/_about/contentinfo.styl @@ -7,7 +7,7 @@ background linear-gradient(120deg, #5b27ff 0, #00d4ff 100%) background-size 200% animation gradient 15s ease infinite - width calc(60% - .5rem / 2) + flex 4 .title1 opacity .8 @@ -28,7 +28,7 @@ justify-content center align-items flex-start flex-direction column - width calc(40% - (.5rem / 2)) + flex 3 h2 margin-right auto diff --git a/source/css/_page/_about/game.styl b/source/css/_page/_about/game.styl index dfa8fcb9..be4f4c11 100644 --- a/source/css/_page/_about/game.styl +++ b/source/css/_page/_about/game.styl @@ -3,7 +3,6 @@ min-height 300px overflow hidden color var(--efu-white) - width 59% &::after box-shadow 0 -69px 203px 11px #04120f inset @@ -26,7 +25,6 @@ padding 1rem 2rem .author-content-item.game-jl - width 39% min-height 300px overflow hidden color var(--efu-white) diff --git a/source/css/_page/_about/maxim.styl b/source/css/_page/_about/maxim.styl index 280ec10f..66c53154 100644 --- a/source/css/_page/_about/maxim.styl +++ b/source/css/_page/_about/maxim.styl @@ -7,7 +7,6 @@ align-items flex-start flex-direction column justify-content center - width calc(40% - (.5rem / 2)) .maxim-title display flex diff --git a/source/css/_page/_about/myphoto.styl b/source/css/_page/_about/myphoto.styl index 15317861..3e3c3001 100644 --- a/source/css/_page/_about/myphoto.styl +++ b/source/css/_page/_about/myphoto.styl @@ -4,7 +4,6 @@ min-height 240px position relative overflow hidden - width calc(40% - (.5rem / 2)) display flex align-items center justify-content center diff --git a/source/css/_page/_about/oneself.styl b/source/css/_page/_about/oneself.styl index 3979f8c8..15afb7a0 100644 --- a/source/css/_page/_about/oneself.styl +++ b/source/css/_page/_about/oneself.styl @@ -10,7 +10,7 @@ width 100% !important &.mapAndInfo - width calc(60% - (.5rem / 2)) + flex 8 gap .5rem .author-content-item diff --git a/source/css/_page/_about/personalities.styl b/source/css/_page/_about/personalities.styl index 96e710b8..d50ce82c 100644 --- a/source/css/_page/_about/personalities.styl +++ b/source/css/_page/_about/personalities.styl @@ -1,7 +1,7 @@ .author-content-item.personalities overflow hidden position relative - width calc(60% - (.5rem / 2)) + flex 6 +maxWidth768() min-height 360px diff --git a/source/css/_page/_about/skills.styl b/source/css/_page/_about/skills.styl index d3ddb91d..4f04e646 100644 --- a/source/css/_page/_about/skills.styl +++ b/source/css/_page/_about/skills.styl @@ -4,7 +4,6 @@ justify-content center align-items flex-start flex-direction column - width calc(50% - (.5rem / 2)) min-height 450px .tags-group-all diff --git a/source/css/_page/_about/statistic.styl b/source/css/_page/_about/statistic.styl index fde05194..d11a30c6 100644 --- a/source/css/_page/_about/statistic.styl +++ b/source/css/_page/_about/statistic.styl @@ -5,7 +5,6 @@ .about-statistic min-height 380px - width calc(40% - (.5rem / 2)) background-size cover color var(--efu-white) overflow hidden diff --git a/source/css/_page/other.styl b/source/css/_page/other.styl index a65b11ff..f0a86241 100644 --- a/source/css/_page/other.styl +++ b/source/css/_page/other.styl @@ -156,6 +156,7 @@ div#banners +maxWidth768() margin-top 0 + flex-direction column .author-content-item +maxWidth1300() @@ -172,7 +173,7 @@ div#banners margin-top 0 .author-content-item - width 49.5% + flex 4 border-radius 12px background var(--efu-card-bg) border var(--style-border-always) From 8b32456ae2b19ad5a8f25752fd7f153102ed66b2 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, 7 Sep 2024 00:03:18 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=F0=9F=94=A5=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=BD=9C=E8=80=85api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 39bfa393..6a1e86ef 100644 --- a/_config.yml +++ b/_config.yml @@ -487,7 +487,7 @@ envelope: # can only use NetEase Cloud Music, QQ Music and other music platforms supported by the mainland China region, # the subsequent consideration of the use of JSON files to store music information and customize the implementation of the third-party API does not depend on the page. # Music Page -meting_api: "https://meting.qjqq.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r" # Custom API +meting_api: "https://meting.everfu.cn/?server=:server&type=:type&id=:id&auth=:auth&r=:r" # Custom API music: enable: false # 歌单 ID / 单曲 ID From 65fdf7f08556cb41f731536fb03caa7e9fb90945 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, 7 Sep 2024 00:03:36 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=F0=9F=94=A5=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/css/_global/index.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/css/_global/index.styl b/source/css/_global/index.styl index 2b06c380..9d760cd3 100644 --- a/source/css/_global/index.styl +++ b/source/css/_global/index.styl @@ -411,7 +411,7 @@ i.solitude span.tags-punctuation i font-weight bold - font-size: 14px + font-size: 12px transition none margin-right: 2px opacity: .4 From 1e031d17a8f06d60ad83d34052c2e262b00fdfa9 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: Sun, 8 Sep 2024 11:30:04 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=F0=9F=94=A5=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8F=8C=E8=AF=84=E8=AE=BA=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=88#380=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/css/_comments/comment.styl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/css/_comments/comment.styl b/source/css/_comments/comment.styl index 712bb1c8..ca7ade74 100644 --- a/source/css/_comments/comment.styl +++ b/source/css/_comments/comment.styl @@ -77,7 +77,7 @@ font-size .6rem color var(--efu-secondtext) border-radius 8px - if index(hexo-config('comment.use'), ',') || hexo-config('comment.use')[1] + if hexo-config('comment.use')[1] || ',' in hexo-config('comment.use') &.move if hexo-config('comment.count') .comment-head @@ -103,7 +103,7 @@ margin .5rem 0 position relative - if index(hexo-config('comment.use'), ',') || ',' in hexo-config('comment.use') + if hexo-config('comment.use')[1] || ',' in hexo-config('comment.use') .count span:last-child display none @@ -139,7 +139,7 @@ content '' transition .4s - if ',' in hexo-config('comment.use') || index(hexo-config('comment.use'), ',') + if hexo-config('comment.use')[1] || index(hexo-config('comment.use'), ',') .comment-wrap > div:last-child display none @@ -167,4 +167,4 @@ if hexo-config('twikoo.style') && 'Twikoo' in hexo-config('comment.use') @import 'twikoo.styl' if hexo-config('valine.style') && 'Valine' in hexo-config('comment.use') - @import 'valine.styl' \ No newline at end of file + @import 'valine.styl' From bb8ecfa24cb76be606f243ba790253be1f221987 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: Sun, 8 Sep 2024 11:32:27 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=F0=9F=94=A5=20=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E4=B8=A4=E9=81=8D=E8=BD=AE=E6=92=AD=EF=BC=88#379=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/widgets/page/links/banner.pug | 1 - 1 file changed, 1 deletion(-) diff --git a/layout/includes/widgets/page/links/banner.pug b/layout/includes/widgets/page/links/banner.pug index fdd1be10..4efd0ac7 100644 --- a/layout/includes/widgets/page/links/banner.pug +++ b/layout/includes/widgets/page/links/banner.pug @@ -16,7 +16,6 @@ .tags-group-wrapper - const data = site.data.links.links - for (let i = 0; i < 2; i++) - each item in [1,2] each x in data - var pairs = [] each y, index in x.link_list From 9183930160ccdfac5dcc4d8efdcc7e96cbeec896 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: Sun, 8 Sep 2024 11:40:33 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=F0=9F=94=A5=20=E6=9B=B4=E6=96=B0=20twiko?= =?UTF-8?q?o=20=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/css/_comments/twikoo.styl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/css/_comments/twikoo.styl b/source/css/_comments/twikoo.styl index e81cffc9..c5867d7c 100644 --- a/source/css/_comments/twikoo.styl +++ b/source/css/_comments/twikoo.styl @@ -301,6 +301,9 @@ font-size .5rem color var(--efu-secondtext) +.tk-content + margin-top 0!important + .tk-meta-input .el-input .el-input-group__prepend @@ -408,10 +411,6 @@ button.el-button.tk-cancel.el-button--default.el-button--small border-radius 8px !important color var(--efu-fontcolor) !important -.tk-replies .tk-content span:first-child - font-size inherit - color black - .OwO &.OwO-open .OwO-body From cbc241194572221735a7f8fb02f354dbbf425c7b 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: Sun, 8 Sep 2024 12:08:02 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E2=9C=A8=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=A2=9E=E5=8A=A0=E7=BD=91=E7=AB=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/default.yml | 1 + languages/en.yml | 1 + languages/zh-CN.yml | 1 + languages/zh-TW.yml | 1 + layout/includes/sidebar.pug | 11 +++++++- source/css/_layout/aside.styl | 50 +++++++++++++++++------------------ 6 files changed, 38 insertions(+), 27 deletions(-) diff --git a/languages/default.yml b/languages/default.yml index 8e1db061..22f95544 100644 --- a/languages/default.yml +++ b/languages/default.yml @@ -140,6 +140,7 @@ console: sidebar: function: Function darkmode: Display mode + siteinfo: Site information footer: description: Article from ${title} diff --git a/languages/en.yml b/languages/en.yml index 0cf159c7..2fbd91ac 100755 --- a/languages/en.yml +++ b/languages/en.yml @@ -140,6 +140,7 @@ console: sidebar: function: Function darkmode: Display mode + siteinfo: Site information footer: description: Article from ${title} diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index d3a6b31c..a67ddf46 100755 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -140,6 +140,7 @@ console: sidebar: function: 功能 darkmode: 显示模式 + siteinfo: 网站信息 footer: description: 来自${title}的文章 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index f6f9c693..3b3feb84 100755 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -140,6 +140,7 @@ console: sidebar: function: 功能 darkmode: 顯示模式 + siteinfo: 網站信息 footer: description: 來自${title}的文章 diff --git a/layout/includes/sidebar.pug b/layout/includes/sidebar.pug index 0117513f..4b46b7da 100644 --- a/layout/includes/sidebar.pug +++ b/layout/includes/sidebar.pug @@ -29,4 +29,13 @@ div#sidebar(style="zoom: 1;") div.card-tag-cloud each tag in site.tags.find({ parent: { $exists: false } }).data a(href=url_for(tag.path))= tag.name - sup= tag.length \ No newline at end of file + sup= tag.length + if theme.wordcount && theme.aside.siteinfo.wordcount + span.sidebar-menu-item-title= __('sidebar.siteinfo') + .webinfo + .webinfo-item + .webinfo-item-title + i.item-icon.solitude.fa-solid.fa-file-word + .item-name= __('aside.wordcount') + .item-count= totalcount(site) + diff --git a/source/css/_layout/aside.styl b/source/css/_layout/aside.styl index ce8fe6c8..787b4b53 100644 --- a/source/css/_layout/aside.styl +++ b/source/css/_layout/aside.styl @@ -744,32 +744,6 @@ if hexo-config('aside.card.style') == 2 border var(--style-border-always) #aside-content - .card-webinfo - .webinfo - .webinfo-item-title - display flex - - i - line-height: 2 !important - margin-right: 6px - width: 16px - text-align: center - font-size: 16px !important - - .webinfo-item - display flex - justify-content space-between - white-space nowrap - -webkit-box-align center - align-items center - padding .1rem .5rem 0 - - div:first-child - -webkit-box-flex 1 - flex 1 1 0 - padding-right 1rem - - .card-allinfo hr @@ -1098,3 +1072,27 @@ if hexo-config('aside.newest_comment.enable') font-size 12px color var(--efu-secondtext) margin-top auto + +.webinfo-item + display flex + justify-content space-between + white-space nowrap + -webkit-box-align center + align-items center + padding .1rem .5rem 0 + + div:first-child + -webkit-box-flex 1 + flex 1 1 0 + padding-right 1rem + +.webinfo + .webinfo-item-title + display flex + + i + line-height: 2 + margin-right: 6px + width: 16px + text-align: center + font-size: 16px From e2e30f82a9894b0113d642a65494676c13798145 Mon Sep 17 00:00:00 2001 From: bluewhaleyt Date: Sun, 8 Sep 2024 18:30:35 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E4=BF=AE=E5=BE=A9=20zh-TW.yml=20?= =?UTF-8?q?=E8=AA=9E=E8=A8=80=E6=AA=94=E6=A1=88=E7=BF=BB=E8=AD=AF=E4=B8=8D?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/zh-TW.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index 3b3feb84..82c78e99 100755 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -1,6 +1,6 @@ more: 更多 star: 喜歡這篇的人也看了 -random: 随便逛逛 +random: 隨便逛逛 upload: 發佈時間： totalk: 無需刪除空行，直接輸入評論即可 loading: 加載中... @@ -18,9 +18,9 @@ copy: copy_copyright: author: 作者 - link: 連結 + link: 鏈結 source: 來源 - info: 著作權歸作者所有。 商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。 + info: 著作權歸作者所有。商業轉載請聯繫作者獲得授權，非商業轉載請註明出處。 time: day: "天前" @@ -41,16 +41,16 @@ nav: site_name_title: 返回博客主頁 backtop: 返回頂部 travellings: 開往-友鏈接力 - search: 搜索 + search: 搜尋 randompost: 隨機一篇文章 - console: 中控台 + console: 主控台 home: home: 推薦 sticky: 置頂 new: 最新 read: 未讀 - recommend: 荐 + recommend: 薦 recommendmore: 更多推薦 archives: 全部文章 @@ -66,9 +66,9 @@ post: pv: 文章熱度 comment: 評論數 copyright: - reprint: 本文是转载或翻译文章，版权归原作者所有。转载本文请联系原作者。 - original: 本文是原创文章，采用 - original_end: 协议，完整转载请注明来自 + reprint: 本文是轉載或翻譯文章，版權歸原作者所有。轉載本文請聯繫原作者。 + original: 本文是原創文章，採用 + original_end: 協議，完整轉載請註明來自 share: qq: 分享到QQ weibo: 分享到微博 @@ -76,8 +76,8 @@ post: twitter: 分享到Twitter linkedin: 分享到LinkedIn facebook: 分享到Facebook - link: 复制文章链接 - qrcode: 使用手机扫码阅读这篇文章 + link: 複製文章鏈接 + qrcode: 使用手機掃碼閱讀這篇文章 whatsapp: 分享到WhatsApp ai: title: 文章摘要 @@ -109,12 +109,12 @@ aside: wordcount: '字數統計：' toc: 文章目錄 tagmore: 查看全部 - avatar: 头像 + avatar: 頭像 hello: 好久不見， back: 歡迎再次回來， - sticker: 心情贴纸 - newpost: 最近发布 - newcomment: 最新评论 + sticker: 心情貼紙 + newpost: 最近發佈 + newcomment: 最新評論 card: posts: '累計文章數:' tags: '標籤總數:' @@ -124,16 +124,16 @@ console: comment_tip: 互動 comment_title: 評論 tag_tip: 標籤 - tag_title: 標籤 - switch_darkmode: 昼夜切換 - switch_hideAside: 边栏显示控制 + tag_title: 尋找感興趣的領域 + switch_darkmode: 晝夜切換 + switch_hideAside: 側邊欄顯示控制 switch_keyboard: 鍵盤快捷鍵 switch_music: 音樂開關 archive_unit: 篇 recent_comment_more: 最近評論 newest_comment: image: 圖片 - link: 連結 + link: 鏈結 code: 代碼 emoji: 表情 @@ -182,10 +182,10 @@ f12: 開發者模式已打開，請遵循GPL協定。 right_menu: copy: 複製選中文本 - paste: 粘貼文本 + paste: 貼上文本 comment: 引用到評論 new: 新窗口打開 - link: 複製連結位址 + link: 複製鏈結位址 img: 複製此圖片 downloadImg: 下載此圖片 search: 站內搜索 @@ -230,4 +230,4 @@ message: essay: tip0: '- 已展開所有短文 -' tip1: '- 只展示最近 #{count} 條短文 -' - link: '連接' + link: '鏈結' From 3b2f43ca61d5cdfc519aaf8aac7a86c52b2f1114 Mon Sep 17 00:00:00 2001 From: HPCesia Date: Sun, 8 Sep 2024 19:44:29 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20tabs=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=8F=92=E4=BB=B6=E7=B4=A2=E9=80=89=E6=8B=A9=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/tags/tabs.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/tags/tabs.js b/scripts/tags/tabs.js index 77a892e1..4d08277c 100644 --- a/scripts/tags/tabs.js +++ b/scripts/tags/tabs.js @@ -14,9 +14,7 @@ function postTabs ([name, active], content) { let tabNav = '' let tabContent = '' - if (typeof active === 'undefined') { - active = 0 - } + active = Number(active) || 0 while ((match = tabBlock.exec(content)) !== null) { matches.push(match[1]) From f2f214e43db6d033194c34066a10ebf98e491a41 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: Mon, 9 Sep 2024 11:13:03 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=F0=9F=94=A5=20=E5=88=A0=E9=99=A4todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - README_zh-Hans.md | 2 -- README_zh-Hant.md | 1 - 3 files changed, 4 deletions(-) diff --git a/README.md b/README.md index 3fb3f5d1..176ed751 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,6 @@ English丨[简体中文](README_zh-Hans.md)丨[繁体中文](README_zh-Hant.md) ## Todo - [x] The list of articles is displayed in three columns on the homepage. -- [x] btns tags plugin. > If you have any questions, please issue an [issue](https://github.com/everfu/hexo-theme-solitude/issues) diff --git a/README_zh-Hans.md b/README_zh-Hans.md index 1f4bc5c5..923a3e9f 100644 --- a/README_zh-Hans.md +++ b/README_zh-Hans.md @@ -43,8 +43,6 @@ ## Todo - [x] 首页顶部新样式 -- [x] 首页文章列表三列显示 -- [x] btns 外挂标签 > 如有问题请提 [issue](https://github.com/everfu/hexo-theme-solitude/issues) diff --git a/README_zh-Hant.md b/README_zh-Hant.md index d35576f8..188e262e 100644 --- a/README_zh-Hant.md +++ b/README_zh-Hant.md @@ -43,7 +43,6 @@ ## Todo - [x] 首页文章列表三列显示 -- [x] btns 外挂标签 ## 應用 From 6af18bec318e98f2037567097435460227e2f5f3 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: Mon, 9 Sep 2024 11:18:43 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=F0=9F=94=A5=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/filter/checkThemeConfig.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/filter/checkThemeConfig.js b/scripts/filter/checkThemeConfig.js index ce502a4d..17239d37 100644 --- a/scripts/filter/checkThemeConfig.js +++ b/scripts/filter/checkThemeConfig.js @@ -5,12 +5,12 @@ hexo.extend.filter.register('before_post_render', () => { const logger = hexo.log; const theme = hexo.theme.config; if (theme.says.enable && !data.essay) { - logger.error('\n 启用说说的情况下，必须提供 essay 数据文件！\n 请新建 essay.yaml。'); + logger.error('\n 启用即刻短文的情况下，请新建 essay.yaml。'); logger.error('\n If says is enabled, essay data must be supplied! \n Please create essay.yaml.'); process.exit(-1); } if (theme.footer.randomlink && !data.links){ - logger.error('\n 启用随机链接的情况下，必须提供 links 数据！\n 请新建 links.yaml。'); + logger.error('\n 启用随机链接的情况下，请新建 links.yaml。'); logger.error('\n If randomlink is enabled, links data must be supplied! \n Please create links.yaml.'); process.exit(-1); } @@ -20,4 +20,4 @@ hexo.extend.filter.register('before_post_render', () => { process.exit(-1); } } -); \ No newline at end of file +); From 02e3dfbba95c18bda8b19b65de9dbc8f515c23c2 Mon Sep 17 00:00:00 2001 From: HPCesia Date: Tue, 10 Sep 2024 13:41:40 +0800 Subject: [PATCH 16/19] =?UTF-8?q?feat:=20Ctrl+=E5=8F=B3=E9=94=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=B5=8F=E8=A7=88=E5=99=A8=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 3 +++ languages/default.yml | 1 + languages/en.yml | 1 + languages/zh-CN.yml | 1 + languages/zh-TW.yml | 1 + layout/includes/head/config.pug | 2 ++ scripts/event/merge_config.js | 1 + source/js/right_menu.js | 10 ++++++++++ 8 files changed, 20 insertions(+) diff --git a/_config.yml b/_config.yml index 6a1e86ef..57af340e 100644 --- a/_config.yml +++ b/_config.yml @@ -882,6 +882,9 @@ right_menu: # Whether to display the hot comment switch. # 是否显示热门评论开关 commentBarrage: false + # Whether to display the browser's context menu when hold Ctrl key. + # 是否在按住 Ctrl 键时显示浏览器右键菜单 + ctrlOriginalMenu: false # Simplified and Traditional Chinese translation. # 简繁体转换 translate: diff --git a/languages/default.yml b/languages/default.yml index 22f95544..e7dffbdf 100644 --- a/languages/default.yml +++ b/languages/default.yml @@ -196,6 +196,7 @@ right_menu: chs_to_cht: 轉為繁體 cht_to_chs: 转为简体 img_error: This image cannot be copied or downloaded. + ctrl_original_menu: Hold Ctrl + right-click to open the browser's context menu barrage: open: Open Barrage close: Close Barrage diff --git a/languages/en.yml b/languages/en.yml index 2fbd91ac..54e0ea11 100755 --- a/languages/en.yml +++ b/languages/en.yml @@ -196,6 +196,7 @@ right_menu: chs_to_cht: 轉為繁體 cht_to_chs: 转为简体 img_error: This image cannot be copied or downloaded. + ctrl_original_menu: Hold Ctrl + right-click to open the browser's context menu barrage: open: Open Barrage close: Close Barrage diff --git a/languages/zh-CN.yml b/languages/zh-CN.yml index a67ddf46..92bd88f7 100755 --- a/languages/zh-CN.yml +++ b/languages/zh-CN.yml @@ -196,6 +196,7 @@ right_menu: chs_to_cht: 轉為繁體 cht_to_chs: 转为简体 img_error: 此图片无法复制与下载 + ctrl_original_menu: 按住Ctrl+右键可打开浏览器右键菜单 barrage: open: 显示热评 close: 关闭热评 diff --git a/languages/zh-TW.yml b/languages/zh-TW.yml index 82c78e99..3e91bc1d 100755 --- a/languages/zh-TW.yml +++ b/languages/zh-TW.yml @@ -194,6 +194,7 @@ right_menu: chs_to_cht: 轉為繁體 cht_to_chs: 转为简体 img_error: 此圖片無法複製與下載 + ctrl_original_menu: 按住Ctrl+右鍵可打開瀏覽器右鍵選單 barrage: open: 顯示熱評 close: 關閉熱評 diff --git a/layout/includes/head/config.pug b/layout/includes/head/config.pug index f29ebd3f..9d3c68a9 100644 --- a/layout/includes/head/config.pug +++ b/layout/includes/head/config.pug @@ -120,6 +120,8 @@ defaultEncoding: theme.right_menu.translate.defaultEncoding } } + if (theme.right_menu.ctrlOriginalMenu) + rightMenu.ctrlOriginalMenu = _p('right_menu.ctrl_original_menu') } let highlight = false diff --git a/scripts/event/merge_config.js b/scripts/event/merge_config.js index 9c23bd4a..33906fdb 100644 --- a/scripts/event/merge_config.js +++ b/scripts/event/merge_config.js @@ -383,6 +383,7 @@ hexo.extend.filter.register('before_generate', () => { right_menu: { enable: false, commentBarrage: false, + ctrlOriginalMenu: false, translate: { enable: false, defaultEncoding: 2, diff --git a/source/js/right_menu.js b/source/js/right_menu.js index 84c21aa4..7c716fba 100644 --- a/source/js/right_menu.js +++ b/source/js/right_menu.js @@ -1,4 +1,5 @@ let selectTextNow = ""; +let firstShowRightMenu = true; const selectText = () => { selectTextNow = document.selection ? document.selection.createRange().text @@ -106,6 +107,15 @@ function stopMaskScroll() { window.oncontextmenu = (ele) => { if (document.body.clientWidth <= 768) return; + if (GLOBAL_CONFIG.right_menu.ctrlOriginalMenu) { + if (firstShowRightMenu) { + firstShowRightMenu = false; + utils.snackbarShow(GLOBAL_CONFIG.right_menu.ctrlOriginalMenu, false, 2000); + } + if (ele.ctrlKey) { + return true; + } + } let x = ele.clientX + 10; let y = ele.clientY; Array.from(rm.menuItems.other).forEach((item) => (item.style.display = "flex")); From 403af55c944544600c37ecdf4fd02868fae24ccf Mon Sep 17 00:00:00 2001 From: HPCesia Date: Tue, 10 Sep 2024 14:22:50 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20article=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=B8=8E=E4=B8=8D=E8=83=BD=E5=9C=A8=20tabs=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=86=85=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/tags/article.js | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/scripts/tags/article.js b/scripts/tags/article.js index d83bad58..6603eace 100644 --- a/scripts/tags/article.js +++ b/scripts/tags/article.js @@ -7,33 +7,12 @@ const article = ([path]) => { } const tags = post.tags.map(tag => `${tag.name}`).join(''); const category = post.categories.data.length > 0 ? `${post.categories.data[0].name}` : ''; - return ` -
-
- - ${post.title} - -
-
-
-
- ${category} -
- ${post.title} -
-
- ${post.description ? post.description : ''} -
-
- - ${tags} - - - - -
-
-
`; + const postCover = `
${post.title}
`; + const recentPostInfoTop = `
${category}
${post.title}
`; + const content = `
${post.description ? post.description : ''}
`; + const articleMetaWrap = `
${tags}
`; + const recentPostInfo = `
${recentPostInfoTop + content + articleMetaWrap}
` + return `
${postCover + recentPostInfo}
`; } hexo.extend.tag.register('article', article) From 86384c6991c3b77a0abb65ff25c22dd9723b69a0 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: Wed, 11 Sep 2024 11:52:33 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=F0=9F=94=A5=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A8=A1=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/{body => head}/mode.pug | 0 layout/includes/inject/body.pug | 3 --- layout/includes/inject/head.pug | 6 ++++++ layout/page.pug | 2 +- scripts/event/page.js | 2 +- scripts/helper/related_post.js | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) rename layout/includes/{body => head}/mode.pug (100%) diff --git a/layout/includes/body/mode.pug b/layout/includes/head/mode.pug similarity index 100% rename from layout/includes/body/mode.pug rename to layout/includes/head/mode.pug diff --git a/layout/includes/inject/body.pug b/layout/includes/inject/body.pug index 18dbc92e..4b220bda 100644 --- a/layout/includes/inject/body.pug +++ b/layout/includes/inject/body.pug @@ -121,8 +121,5 @@ if theme.footer.randomlink // pjax != partial("includes/widgets/third-party/pjax", {}, {cache: true}) -// theme -include ../body/mode - // google adsense include ../body/gadsense diff --git a/layout/includes/inject/head.pug b/layout/includes/inject/head.pug index 8e4eb8d8..3902d353 100644 --- a/layout/includes/inject/head.pug +++ b/layout/includes/inject/head.pug @@ -48,3 +48,9 @@ if theme.extends.head != item !=fragment_cache('injectHeadJs', function(){return inject_head_js()}) + +// theme +include ../head/mode + +if theme.page.echart + script(src=url_for(theme.cdn.echarts)) diff --git a/layout/page.pug b/layout/page.pug index 4977b411..3adf27b4 100644 --- a/layout/page.pug +++ b/layout/page.pug @@ -36,4 +36,4 @@ block content - var comment_js = true include includes/widgets/third-party/comments/comment if page.aside - include includes/widgets/aside/aside \ No newline at end of file + include includes/widgets/aside/aside diff --git a/scripts/event/page.js b/scripts/event/page.js index b4ff82bd..fe8d9cdb 100644 --- a/scripts/event/page.js +++ b/scripts/event/page.js @@ -30,4 +30,4 @@ hexo.extend.generator.register('categories', function(locals) { comment: false } }; -}); \ No newline at end of file +}); diff --git a/scripts/helper/related_post.js b/scripts/helper/related_post.js index b82bdfe3..46269a6d 100644 --- a/scripts/helper/related_post.js +++ b/scripts/helper/related_post.js @@ -82,4 +82,4 @@ function compare(attr, dateType) { } return val2 - val1 } -} \ No newline at end of file +} From bdb10abdfcc545689c2fdf9d3cb369df128de0db 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: Wed, 11 Sep 2024 11:53:00 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E2=9C=A8=20v2.0.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d214f14..b5505156 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-solitude", - "version": "2.0.12", + "version": "2.0.13", "description": "A beautiful, powerful, and efficient Hexo theme developed by everfu.", "main": "package.json", "scripts": {