From c7b5a74b785de662c795841a6a917fe186be5234 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Fri, 9 Aug 2024 09:59:44 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E2=9C=A8=20=E4=BC=98=E5=8C=96twikoo?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9D=97=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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/css/_comments/twikoo.styl b/source/css/_comments/twikoo.styl index 37d86a71..e81cffc9 100644 --- a/source/css/_comments/twikoo.styl +++ b/source/css/_comments/twikoo.styl @@ -408,6 +408,9 @@ 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 From 6690cd0bdb8f7463c0268e12646258c265468f4d Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 11 Aug 2024 10:38:16 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E2=9C=A8=20=E6=9B=B4=E6=96=B0=20twikoo?= =?UTF-8?q?=201.6.39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins.yml b/plugins.yml index 31c255f3..b5b49bd1 100644 --- a/plugins.yml +++ b/plugins.yml @@ -13,7 +13,7 @@ pjax: twikoo: name: twikoo file: dist/twikoo.all.min.js - version: 1.6.38 + version: 1.6.39 waline_js: name: '@waline/client' file: dist/waline.js From 69f0a7fd4c755b0c1272fb55c4ff041c4b3f9f00 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 11 Aug 2024 10:38:48 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E2=9C=89=EF=B8=8F=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/page/categories.pug | 2 +- layout/includes/page/tags.pug | 2 +- scripts/helper/getArchiveLength.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layout/includes/page/categories.pug b/layout/includes/page/categories.pug index 54135caa..f2fef1e2 100644 --- a/layout/includes/page/categories.pug +++ b/layout/includes/page/categories.pug @@ -6,4 +6,4 @@ h1.page-title= _p('page.category') span.tags-punctuation i.solitude.fa-solid.fa-hashtag = item.name - span.tagsPageCount= item.length \ No newline at end of file + span.tagsPageCount= item.length diff --git a/layout/includes/page/tags.pug b/layout/includes/page/tags.pug index 0b888a08..db33af87 100644 --- a/layout/includes/page/tags.pug +++ b/layout/includes/page/tags.pug @@ -6,4 +6,4 @@ h1.page-title= __('page.tag') span.tags-punctuation i.solitude.fa-solid.fa-hashtag = tag.name - span.tagsPageCount= tag.length \ No newline at end of file + span.tagsPageCount= tag.length diff --git a/scripts/helper/getArchiveLength.js b/scripts/helper/getArchiveLength.js index 0391ab1b..c4bdcb92 100644 --- a/scripts/helper/getArchiveLength.js +++ b/scripts/helper/getArchiveLength.js @@ -11,4 +11,4 @@ hexo.extend.helper.register('getArchiveLength', function (type) { archive[postdate] = (archive[postdate] || 0) + 1; } return archive; -}); \ No newline at end of file +}); From 3cdf28fd12d499a7003fc845592de82dcf1c69e7 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 11 Aug 2024 10:39:08 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E2=9C=A8=20=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E9=A1=B6=E9=83=A8=E6=8E=A8=E8=8D=90=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=97=A0=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/css/_page/_home/home-top.styl | 1 + source/css/_page/recentcomment.styl | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/css/_page/_home/home-top.styl b/source/css/_page/_home/home-top.styl index 4d1b82d0..c18d3590 100644 --- a/source/css/_page/_home/home-top.styl +++ b/source/css/_page/_home/home-top.styl @@ -90,6 +90,7 @@ transition .3s position relative box-shadow var(--efu-shadow-border) + min-width fit-content &:nth-last-child(2):nth-child(1), &:nth-last-child(1):nth-child(2) diff --git a/source/css/_page/recentcomment.styl b/source/css/_page/recentcomment.styl index 92ac958a..f303c27d 100644 --- a/source/css/_page/recentcomment.styl +++ b/source/css/_page/recentcomment.styl @@ -9,6 +9,7 @@ div.console_recentcomments .comment-card position relative width calc(100% / 3 - 8px) + min-width fit-content background var(--efu-card-bg) border-radius 12px border var(--style-border-always) @@ -85,4 +86,4 @@ span.comment-user time.comment-time font-size 12px color var(--efu-secondtext) - margin-left auto \ No newline at end of file + margin-left auto From 1cce2f80352d5330203efb167874985377deb982 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 11 Aug 2024 10:41:25 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E2=9C=89=EF=B8=8F=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/console.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/includes/console.pug b/layout/includes/console.pug index a58a9d4f..8e097c24 100644 --- a/layout/includes/console.pug +++ b/layout/includes/console.pug @@ -66,4 +66,4 @@ div#console div.console-btn-item.on#consoleCommentBarrage(onclick="sco.switchCommentBarrage()") span.commentBarrage i.solitude.fa-solid.fa-comment - div.console-mask(onclick="sco.hideConsole()") \ No newline at end of file + div.console-mask(onclick="sco.hideConsole()") From deecfb74d89629156b202f3f774479495d36f52d Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 11 Aug 2024 10:41:41 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E2=9A=A0=EF=B8=8F=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/img/recent_c.avif | Bin 25842 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 source/img/recent_c.avif diff --git a/source/img/recent_c.avif b/source/img/recent_c.avif deleted file mode 100644 index 281a57b7e57934aa5d65722f65e7b29c7a4d9d40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25842 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 Date: Sun, 11 Aug 2024 10:47:02 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E2=9C=A8=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/filter/default.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/filter/default.js b/scripts/filter/default.js index 18c01b29..67a45eae 100644 --- a/scripts/filter/default.js +++ b/scripts/filter/default.js @@ -28,4 +28,4 @@ function getRandomInt(min, max) { min = Math.ceil(min); max = Math.floor(max); return Math.floor(Math.random() * (max - min)) + min; -} \ No newline at end of file +} From 0903f33a76e52783eff5b106e7e20b1a14e4b0e4 Mon Sep 17 00:00:00 2001 From: L33Z22L11 Date: Tue, 13 Aug 2024 11:57:35 +0800 Subject: [PATCH 08/16] =?UTF-8?q?style:=20=E7=BB=9F=E4=B8=80=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 36 ++++++++++++++++++--------------- source/css/_layout/sidebar.styl | 14 +++++++++++-- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/_config.yml b/_config.yml index 7cdb8b5a..67d7b60c 100644 --- a/_config.yml +++ b/_config.yml @@ -118,7 +118,8 @@ aside: afternoon: Tea time. 🍵 night: early bedtime goodnight: Good night 😴 - sayhello2: # Style 2 is invalid, Triggered when sayhello is clicked. + # Style 2 is invalid, Triggered when sayhello is clicked. + sayhello2: # - You'll make it. # - You're gonna make it. # - Good luck, stranger. @@ -157,7 +158,8 @@ aside: tags: enable: false limit: 20 # Number of tags displayed - highlight_list: # Highlighted tags + # Highlighted tags + highlight_list: # - Hexo # --------------------------- end --------------------------- @@ -207,7 +209,8 @@ page: post: default: top_cover: true # Article information that displays a wave effect at the top of the article when opened. - cover: # Default image when no cover is set + # Default image when no cover is set + cover: # - # 默认图片 / default cover locate: China # Location copyright: # Copyright @@ -238,15 +241,15 @@ post: share: # Share icon enable: false list: - # - qq - # - weibo - # - twitter - # - facebook - # - telegram - # - whatsapp - # - linkedin - # - link - # - qrcode + # - qq + # - weibo + # - twitter + # - facebook + # - telegram + # - whatsapp + # - linkedin + # - link + # - qrcode rss: # /atom.xml covercolor: # After opening, the main color of the cover image will be used as the background color. enable: false @@ -338,7 +341,7 @@ errorpage: says: enable: false home_mini: false - page: '/essay/' + page: /essay/ style: 1 strip: 30 # --------------------------- end --------------------------- @@ -646,7 +649,8 @@ right_menu: enable: false defaultEncoding: 2 # 1: 默认繁体 2: 默认简体 translateDelay: 0 # 首次加载翻译迟疑时间 - custom_list: # Custom list + # Custom list + custom_list: # - name: Random # click: toRandomPost() # id: menu-randomPost @@ -690,8 +694,8 @@ expire: enable: false time: 30 # days position: top # top / bottom - text_prev: 'This article expired ' - text_next: ' day ago, if the content does not match, please contact the webmaster to update it.' + text_prev: "This article expired " + text_next: " day ago, if the content does not match, please contact the webmaster to update it." # --------------------------- end --------------------------- # --------------------------- start --------------------------- diff --git a/source/css/_layout/sidebar.styl b/source/css/_layout/sidebar.styl index ae93437d..3f9fe1ab 100644 --- a/source/css/_layout/sidebar.styl +++ b/source/css/_layout/sidebar.styl @@ -176,13 +176,17 @@ margin-bottom 60px a - color var(--efu-fontcolor) !important + color var(--efu-fontcolor) padding 2px 8px 2px 12px border-radius 8px border var(--style-border-always) background var(--efu-card-bg) font-size 14px !important + &:hover + background var(--efu-main) + color var(--efu-white) + sup opacity .6 margin-left 4px @@ -200,6 +204,12 @@ span.darkmode_switchbutton padding 4px 8px + cursor pointer + transition all .5s ease 0s + + &:hover + background var(--efu-main) + color var(--efu-white) [data-theme="dark"] & background var(--efu-orange) @@ -237,4 +247,4 @@ color var(--efu-fontcolor) #toggle-sidebar - bottom 80px \ No newline at end of file + bottom 80px From 9bec60d74dd068068d9d576e1a698790bb3e6d42 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Tue, 13 Aug 2024 13:09:35 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=AE=B2=E5=9B=8A=E7=B1=BB=E5=90=8D=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=88#361=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/loading.pug | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layout/includes/loading.pug b/layout/includes/loading.pug index 4ad56975..cc73e2d6 100644 --- a/layout/includes/loading.pug +++ b/layout/includes/loading.pug @@ -9,14 +9,16 @@ script. if (!preloader.isLoaded) { document.getElementById('loading-box').classList.add('loaded'); preloader.isLoaded = true; + preloader.togglePaceDone(); } }, initLoading: () => { document.getElementById('loading-box').classList.remove('loaded'); preloader.isLoaded = false; + preloader.togglePaceDone(); }, - removePaceDone: () => { - document.getElementById('body').classList = 'pace-done'; + togglePaceDone: () => { + document.getElementById('body').className = preloader.isLoaded ? 'pace-done' : ''; } } From 55d2084e47213e5c83808e18aff94613e800232b Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Tue, 13 Aug 2024 13:11:14 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E2=9C=89=EF=B8=8F=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/widgets/third-party/pjax.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/includes/widgets/third-party/pjax.pug b/layout/includes/widgets/third-party/pjax.pug index 13a7e8de..18ce7f6c 100644 --- a/layout/includes/widgets/third-party/pjax.pug +++ b/layout/includes/widgets/third-party/pjax.pug @@ -36,4 +36,4 @@ script. if (e.request.status === 404) { pjax.loadUrl('/404.html') } - }) \ No newline at end of file + }) From 6d99af71eb915494d99e00edce3ad035ff880770 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Tue, 13 Aug 2024 19:59:53 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E2=9C=A8=20=E6=95=B4=E5=90=88=E4=B8=BA?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=BD=91=E7=AB=99=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 3 +-- layout/includes/head.pug | 4 ++-- layout/includes/head/opengraph.pug | 4 ++-- layout/includes/head/pwa.pug | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/_config.yml b/_config.yml index 67d7b60c..42bd1958 100644 --- a/_config.yml +++ b/_config.yml @@ -15,8 +15,7 @@ site: name: class: text # text / i_class / img custom: Solitude # Solitude / fas fa-ghost / /img/pwa/favicon.ico - siteIcon: /img/pwa/favicon.ico # Site icon - icon: /img/pwa/favicon.ico + icon: /img/pwa/favicon.ico # Site icon / 网站图标 # --------------------------- end --------------------------- # --------------------------- start --------------------------- diff --git a/layout/includes/head.pug b/layout/includes/head.pug index 7bea6141..9fcccde5 100644 --- a/layout/includes/head.pug +++ b/layout/includes/head.pug @@ -17,7 +17,7 @@ meta(name="viewport" content="width=device-width, initial-scale=1") title= title + subtitle noscript= _p('head.noscript') -link(rel="icon", href=url_for(theme.site.siteIcon)) +link(rel="icon", href=url_for(theme.site.icon)) // index.css link(rel="stylesheet", href=url_for(theme.cdn.main_css)) @@ -29,4 +29,4 @@ include ./inject/head.pug include ./head/config.pug // page-config head -include ./head/page_config \ No newline at end of file +include ./head/page_config diff --git a/layout/includes/head/opengraph.pug b/layout/includes/head/opengraph.pug index bbd0f606..62c6c228 100644 --- a/layout/includes/head/opengraph.pug +++ b/layout/includes/head/opengraph.pug @@ -1,6 +1,6 @@ if theme.OpenGraph.enable - - const coverVal = page.cover || theme.site.siteIcon + const coverVal = page.cover || theme.site.icon let ogOption = { type: is_post() ? 'article' : 'website', image: coverVal ? full_url_for(coverVal) : '', @@ -10,4 +10,4 @@ if theme.OpenGraph.enable != open_graph(ogOption) meta(name="description" content=page_description()) else - meta(name="description" content=page_description()) \ No newline at end of file + meta(name="description" content=page_description()) diff --git a/layout/includes/head/pwa.pug b/layout/includes/head/pwa.pug index 078a397d..9e2e881f 100644 --- a/layout/includes/head/pwa.pug +++ b/layout/includes/head/pwa.pug @@ -18,5 +18,5 @@ else meta(name="apple-mobile-web-app-capable", content=config.title) meta(name="theme-color", content="var(--efu-main)") meta(name="apple-mobile-web-app-status-bar-style", content="var(--efu-main)") - link(rel="bookmark", href=url_for(theme.site.siteIcon)) - link(rel="apple-touch-icon", href=url_for(theme.site.siteIcon), sizes="180x180") \ No newline at end of file + link(rel="bookmark", href=url_for(theme.site.icon)) + link(rel="apple-touch-icon", href=url_for(theme.site.icon), sizes="180x180") From 48aee31908767a60bd07a4b30b4d79387359b3e3 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Tue, 13 Aug 2024 20:38:41 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E2=9C=A8=20=E5=A2=9E=E5=8A=A0=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 474 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 367 insertions(+), 107 deletions(-) diff --git a/_config.yml b/_config.yml index 42bd1958..b9b4f5c1 100644 --- a/_config.yml +++ b/_config.yml @@ -1,16 +1,20 @@ # --------------------------- # Hexo Theme Solitude -# Author: EverFu +# Author: Ever Fu # Github: https://github.com/everfu/hexo-theme-solitude # # Guide: https://solitude.js.org # You can get more detailed help from the guide +# 指南：https://solitude.js.org +# 你可以从指南中获取更详细的帮助 # -# sponsor: https://www.patreon.com/everfu +# sponsor: https://ko-fi.com/everfu +# 赞助：https://afdian.com/a/everfu # --------------------------- # --------------------------- start --------------------------- # Site information +# 网站信息 site: name: class: text # text / i_class / img @@ -19,10 +23,17 @@ site: # --------------------------- end --------------------------- # --------------------------- start --------------------------- +# Navigation bar +# 导航栏 nav: + # Left button + # 左侧按钮 group: # project: # name # Solitude: https://github.com/everfu/hexo-theme-solitude || /img/pwa/favicon.ico # name: url || icon + + # Menu + # 菜单 menu: # Home: / # name: link # Article: # name @@ -38,8 +49,11 @@ nav: # Toobox: /tlink/ || fas fa-toolbox # Music: /music/ || fas fa-music # About: /about/ - right: # right button - random: false # Random article + + # Right button + # 右侧按钮 + right: + random: false # Random article / 随机文章按钮 custom: # - name: Start # name # url: https://www.travellings.cn/go.html # Jump link @@ -49,10 +63,12 @@ nav: # --------------------------- end --------------------------- # --------------------------- start --------------------------- +# Home Top Banner +# 首页顶部 hometop: enable: false banner: - title: Tranquility
and love life + title: # Tranquility
and love life / 宁静致远
热爱生活 # Title url: Hexo Theme Solitude icon: # HTML: # name @@ -74,21 +90,28 @@ hometop: # img: https://i.postimg.cc/nhgjwjCS/git.png # color: "#df5b40" group: - # Fire: /tags/Fire/ || fas fa-fire || linear-gradient(to right,#f65,#ffbf37) - # Course: /tags/Course/ || fas fa-book || linear-gradient(to right,#358bff,#15c6ff) - # Curation: /tags/Curation/ || fas fa-star || linear-gradient(to right,#18e7ae,#1eebeb) + # 热门: /tags/Fire/ || fas fa-fire || linear-gradient(to right,#f65,#ffbf37) recommendList: - sup: Top - title: Solitude Documentation + sup: 置顶 + title: Solitude 官方文档 url: https://solitude.js.org/ img: /img/default.avif color: "none" + +# Article Top Banner +# 文章推荐轮播图 carousel: false # --------------------------- end --------------------------- # --------------------------- start --------------------------- +# Aside +# 侧边栏 aside: # Values: about (info card), newestPost (latest article), allInfo (website information), flip (official account QR code), newest_comment (latest comment) + # 值: about(信息卡), newestPost(最新文章), allInfo(网站信息), flip(官方账号二维码), newest_comment(最新评论) + + # Sticky: Fixed position / noSticky: Not fixed position + # Sticky: 固定位置 / noSticky: 不固定位置 home: # on the homepage noSticky: "about" Sticky: "allInfo" @@ -98,30 +121,39 @@ aside: page: # on the page noSticky: "about" Sticky: "newestPost,allInfo" + # 菜单栏位置(0: 左 1: 右) position: 1 # Sidebar positioning(0: left 1: right) # --------------------------- start --------------------------- # Information card + # 信息卡 card: style: 0 # 0: default 1: style 1 2: style 2 author: - img: /img/avatar.avif # url (avatar) - sticker: # url (sticker), 24x24 - url: /about/ # Click name to jump to address + img: /img/avatar.avif # url + sticker: # url, 24x24 size + url: /about/ # link / 点击头像跳转链接 background: # https://s3.qjqq.cn/47/663af296b85f4.webp!color # Background image(Invalid if style is 0) - content: Here is my personal blog # Introduction (Invalid if style is 1) - content2: I believe you can find knowledge and tutorials here that will be useful to you. # Introduction (Invalid if style is 1) - sayhello: # Style 2 is invalid + # Content(Invalid if style is 0) + # 内容(Style 0 无效) + content: # 这是我的博客 / This is my Blog + content2: # 一个热爱生活的人 / A person who loves life + # Style 2 is invalid + # Style 2 无效 + sayhello: morning: ✨ Good morning. It's a new day noon: It's time for a midday break afternoon: Tea time. 🍵 night: early bedtime goodnight: Good night 😴 # Style 2 is invalid, Triggered when sayhello is clicked. + # Style 2 无效, 点击 sayhello 时触发 sayhello2: # - You'll make it. # - You're gonna make it. # - Good luck, stranger. + # social + # 社交信息图标 information: # Github: https://github.com/everfu || fab fa-github # Name: link || icon # Bilibili: https://space.bilibili.com/1329819902 || fab fa-bilibili @@ -129,6 +161,7 @@ aside: # --------------------------- start --------------------------- # Sidebar QR code component + # 侧边栏二维码组件 flip: favicon: # url (favicon) face: # url (QR code) @@ -138,6 +171,7 @@ aside: # --------------------------- start --------------------------- # recent comments(⚠️ Comments need to be configured first.) + # 最新评论(⚠️ 需要先配置评论) newest_comment: enable: true storage: .5 # 缓存时间 1: 1天 / .5 : 半天 / Cache time 1: 1 day .5 : half a day @@ -146,6 +180,7 @@ aside: # --------------------------- start --------------------------- # article table of contents + # 文章目录 toc: post: true page: false @@ -154,6 +189,7 @@ aside: # --------------------------- start --------------------------- # Tags + # 标签 tags: enable: false limit: 20 # Number of tags displayed @@ -164,80 +200,154 @@ aside: # --------------------------- start --------------------------- # Archive + # 归档 archive: enable: false type: "month" # month: by month / year: by year # --------------------------- end --------------------------- # --------------------------- start --------------------------- + # Site Info + # 网站信息 siteinfo: - postcount: true # Number of articles - wordcount: false # Total number of words - pv: true # PV - uv: true # UV - updatetime: true # Last update date - runtimeenable: true # Website creation time - runtime: "2023-04-20 00:00:00" # Format: yyyy-MM-dd hh-mm-ss + # Number of articles + # 文章数量 + postcount: true + # Total number of words + # 总字数 + wordcount: false + # PV + pv: true + # UV + uv: true + # Last update date + # 最后更新日期 + updatetime: true + # Website creation time + # 网站创建时间 + runtimeenable: true + # Format: yyyy-MM-dd hh-mm-ss + # 格式: yyyy-MM-dd hh-mm-ss + runtime: "2023-04-20 00:00:00" # --------------------------- end --------------------------- # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Home page article configuration information +# 首页文章配置信息 index_post_list: direction: column # row / column column: 2 # 2: 2 columns 3: 3 columns - content: false # 1: post.description / 2: Automatically get descriptions or screenshots / 3: Use only interception / false: No content is displayed - length: 500 # The length of the screenshot content - cover: both # left: on the left : left / right: on the right : right / both: both sides : both + # 1: 1 post.description / 1: 使用自己写的文章摘要 + # 2: 2 Automatically get descriptions or screenshots / 2: 自动获取描述或截图 + # 3: 3 Use only interception / 3: 仅使用截取 + # false: Do not display / false: 不显示 + content: false + # The length of the screenshot content + # 截图内容长度 + length: 500 + # left: on the left : left / right: on the right : right / both: both sides : both + # left: 左侧 : left / right: 右侧 : right / both: 两侧 : both + cover: both # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Page default settings +# 页面默认设置 page: - error: true # 404 page - tags: true # Tags page - categories: true # Categories page - archives: 0 # list: Sort List / 1: Follow HomeList - default: # Default value + # 404 page + # 404 页面 + error: true + # Tags page + # 标签页面 + tags: true + # Categories page + # 分类页面 + categories: true + # list: Sort List / 1: Follow HomeList + # list: 排序列表 / 1: 跟随首页列表 + archives: 0 + # Default value + # 默认值 + default: + # Default image when no cover is set + # 未设置封面时的默认图片 cover: # - /img/default.png # 默认图片 / default cover # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Post default settings +# 文章默认设置 post: default: - top_cover: true # Article information that displays a wave effect at the top of the article when opened. + # The cover of the article is displayed + # 文章封面显示 + top_cover: true # Default image when no cover is set + # 未设置封面时的默认图片 cover: # - # 默认图片 / default cover - locate: China # Location - copyright: # Copyright + # Location + # 位置 + locate: China + # Copyright + # 版权 + copyright: enable: true author: url: /about/ # Author link - img: # Default site_icon is not filled in - license: CC BY-NC-SA 4.0 # License - licenurl: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh # License link - meta: # Article meta information - date: false # Release date - updated: false # Update date - locate: false # Location - wordcount: false # Number of words - readtime: false # uv - pv: false # pv - comment: false # Comment count - award: # Reward + # Default icon is not filled in + # 不填显示默认图标 + img: + # License + # 许可证 + license: CC BY-NC-SA 4.0 + # License link + # 许可证链接 + licenurl: https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh + # Article meta information + # 文章元信息 + meta: + # Release date + # 发布日期 + date: false + # Update date + # 更新日期 + updated: false + # Location + # 位置 + locate: false + # Number of words + # 字数 + wordcount: false + # uv + readtime: false + # pv + pv: false + # Comment count + # 评论数 + comment: false + # Reward + # 打赏 + award: enable: false appreciators: /about/ # Reward page - title: Thanks for your appreciation. - desc: Because of your support, I realize the value of writing articles. + # Reward Title + # 打赏标题 + title: # Thanks for your appreciation. / 感谢您的赞赏 + desc: # Because of your support, I realize the value of writing articles. / 由于您的支持，我才能够实现写作的价值。 + # Reward list + # 打赏列表 list: # - name: Github Sponsor # qcode: https://s3.qjqq.cn/47/661ba900c4bc1.webp!color # url: https://github.com/sponsors/everfu # color: var(--efu-black) - share: # Share icon + + # Share icon + # 分享图标 + share: enable: false list: # - qq @@ -250,17 +360,22 @@ post: # - link # - qrcode rss: # /atom.xml - covercolor: # After opening, the main color of the cover image will be used as the background color. + # Article reading progress + # 文章封面取色 + covercolor: enable: false - mode: local # local: local color / api: img2color color - api: https://api.qjqq.cn/api/Imgcolor?img= # api address - time: 43200000 # api color interval (milliseconds), default is 12 hours + # local: local color / api: api color + mode: local + # api address / api 地址 + api: https://api.qjqq.cn/api/Imgcolor?img= + # Storage / 缓存时间 + time: 43200000 footer: - enable: true - desc: Articles from Ever Fu. # description + enable: false + desc: # Articles from Ever Fu. / 文章来自 Ever Fu # description button: # Button enable: true - name: Learn more + name: # Learn more / 了解更多 url: /about/ # --------------------------- end --------------------------- @@ -278,48 +393,64 @@ theme_color: # --------------------------- end --------------------------- # --------------------------- start --------------------------- -# dark mode +# display mode +# 显示模式 display_mode: - type: auto # auto: automatic switching / dark: dark mode / light: light mode - universe: true # After opening, the dark mode will display the starry sky background -# auto: Recognize the current theme mode of the device + # auto: automatic switching(Recognize the current theme mode of the device) / dark: dark mode / light: light mode + # auto: 自动切换（识别设备当前主题模式） / dark: 深色模式 / light: 浅色模式 + type: auto + # After opening, the dark mode will display the starry sky background + # 开启后深色模式会显示星空背景 + universe: false # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Related articles +# 相关文章 related_post: enable: false limit: 2 - date_type: created # created: release date / updated: update date + # created: release date / updated: update date + # created: 发布日期 / updated: 更新日期 + date_type: created # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Footer +# 页脚 footer: + # Information social icon information: - author: false # enable site_icon in footer + author: false # enable site.icon in footer left: - # Github: https://github.com/efuo || fab fa-github # Name: link || icon + # Github: https://github.com/everfu || fab fa-github # Name: link || icon # Mail: mailto:o@efu.me || fab fa-envelope right: # Bilibili: https://space.bilibili.com/1329819902 || fab fa-bilibili # Douyin: https://v.douyin.com/iJsLc8jt/ || fab fa-tiktok group: - # Navgation: + # Navigation: # Archives: /archives/ # Categories: /categories/ # Tags: /tags/ - # Server: - # Aliyun: https://aliyun.com/ - # 51la: https://v6.51.la/ # Arrangement: # Cookies: /cookies/ # Privacy: /privacy/ # Copyright: /copyright/ + # Random link + # 随机友链 randomlink: false # Random link - privacy: # /privacy/ # Privacy policy + # Privacy policy + # 隐私政策 + privacy: # /privacy/ + # License license: # https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh # License + + # Footer information text + # 页脚信息文字 + # Please do not delete the theme information, this is respect for the author + # 请不要删除主题信息，这是对作者的尊重 links: - name: Theme url: https://github.com/everfu/hexo-theme-solitude @@ -328,7 +459,8 @@ footer: # --------------------------- end --------------------------- # --------------------------- start --------------------------- -# error page +# 404 page +# 404 页面 errorpage: img: /img/404.avif text: =awa= Page NotFound # Text @@ -337,6 +469,7 @@ errorpage: # --------------------------- start --------------------------- # Says Page +# 即可短文 says: enable: false home_mini: false @@ -347,6 +480,7 @@ says: # --------------------------- start --------------------------- # Recent comments Page +# 最近评论页面 recent_comments: enable: false limit: 50 # ⚠️waline 仅支持最大50条评论 / ⚠️waline only supports a maximum of 50 comments @@ -357,6 +491,7 @@ recent_comments: # --------------------------- start --------------------------- # Danmaku Page +# 弹幕留言页面 envelope: enable: false line: 10 # 显示行数 @@ -369,27 +504,38 @@ envelope: # --------------------------- start --------------------------- # This part of the content uses metingjs, # 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. +# 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 music: enable: false + # 歌单 ID / 单曲 ID id: 1994908354 + # 服务商：netease / qq / xiami / kugou / baidu server: netease + # 类型：playlist / song type: playlist + # 默认音量 volume: 0.8 + # 是否自动播放 mutex: true # Capsule music +# 音乐胶囊 capsule: enable: false + # 歌单 ID / 单曲 ID id: 8407304077 + # 服务商：netease / qq / xiami / kugou / baidu server: netease + # 类型：playlist / song type: playlist # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Quick Menu # Open with shift + ? +# 快捷菜单 +# 使用 shift + ? 打开 keyboard: enable: false list: @@ -409,44 +555,71 @@ keyboard: # --------------------------- start --------------------------- # Copy +# information +# 复制信息 copy: - enable: true - copyright: # Turn on Link copyright information after copying. - enable: true - limit: 50 # When more than 50 copies, the copy will contain copyright information. + enable: false + # Turn on Link copyright information after copying. + # 复制后链接版权信息 + copyright: + enable: false + # Display when the number of words copied exceeds + # 复制文字时超过多少字数显示 + limit: 50 # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Lazyload +# 图片懒加载 lazyload: enable: false - field: site # post, site + # post, site + field: site + # 加载时替换图 placeholder: /img/loading.avif + # 加载失败替换图 errorimg: /img/error_load.avif # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Loading +# 加载 loading: - fullpage: false # Full screen loading - pace: true # Pace loading + # Full screen loading + # 全屏加载 + fullpage: false + # Pace loading + # Pace 加载 + pace: true # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Highlight +# 代码块高亮 highlight: enable: true - limit: 200 # Code line limit - copy: true # Whether to enable the copy button - expand: true # Whether to expand by default - theme: mac # default: default / mac : apple terminal - color: default # default / solidity / dracula + # Display the fold button when the number of words exceeds + # 当超过多少字时显示折叠按钮 + limit: 200 + # Whether to enable the copy button + # 是否启用复制按钮 + copy: true + # Whether to expand by default + # 是否默认展开 + expand: true + # default: default / mac : apple terminal + # default: 默认 / mac : 苹果终端 + theme: mac + # default / solidity / dracula + color: default # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Lightbox +# 图片灯箱 lightbox: false # warning: Please select any one, but cannot be turned on at the same time. +# 警告: 请任选其一，但不能同时开启。 fancybox: false # fancybox mediumZoom: false # mediumZoom # --------------------------- end --------------------------- @@ -471,21 +644,30 @@ OpenGraph: # --------------------------- end --------------------------- # --------------------------- start --------------------------- -# Wordcount +# Word count +# 字数统计 # warning: Please install the hexo-wordcount plugin first. +# 警告: 请先安装 hexo-wordcount 插件。 wordcount: false # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Busuanzi busuanzi: false -busuanzi_use: 0 # 0: original / 1: qingjiao (other: other custom busuanzi platform) +# 0: Use the original version of busuanzi / 1: Use the custom version of busuanzi +# The difference between the original and the default: please search by yourself +# 0：使用原版的不蒜子 / 1：使用不蒜子的自定义版本 +# 原版和默认的区别：请自行搜索 +busuanzi_use: 0 # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Search +# warning: Please open the search page config: https://solitude.js.org/search/algolia or https://solitude.js.org/search/local +# 警告: 请打开搜索页面配置: https://solitude.js.org/zh/search/algolia 或 https://solitude.js.org/zh/search/local search: enable: false + # type: 使用的搜索引擎 / search engine type: local # local / algolia tags: # - Solitude @@ -500,6 +682,7 @@ search: # --------------------------- start --------------------------- # This part is only supported in mainland China, and we will consider supporting ChatGPT Key in the future. +# 该部分仅支持中国大陆，后续会考虑支持 ChatGPT Key。 tianli_talk: enable: false title: 智能客服与搜索 # title @@ -517,33 +700,60 @@ post_ai: # --------------------------- start --------------------------- # Katex +# Latex formula support +# Latex 公式支持 katex: enable: false - per_page: false # Whether to load on each page - copytex: false # Whether to enable copy formula + # Whether to load on each page + # 是否在每个页面加载 + per_page: false + # Whether to enable copy formula + # 是否启用复制公式 + copytex: false # --------------------------- end --------------------------- # --------------------------- start --------------------------- +# Comment +# 评论 comment: + # Which commenting system to use(e.g. waline or waline,twikoo) + # 使用哪个评论系统（例如： waline or waline,twikoo） use: # waline, twikoo, valine, artalk, giscus # Up to two comment systems can be turned on at the same time - commentBarrage: false # Hot comment switch - lazyload: false # Lazy load - count: false # Whether to use the comment count - pv: false # Whether to use the page view count - avatar: https://gravatar.com/avatar # Avatar - hot_tip: # Hot comment tips + # Whether to display the hot comment switch. + # 是否显示热门评论开关 + commentBarrage: false + # Lazy load + # 懒加载评论区 + lazyload: false + # Whether to display the comment count + # 显示评论数 + count: false + # PV + pv: false + # Avatar + avatar: https://gravatar.com/avatar + # Hot comment tips + # 热评提示 + hot_tip: enable: false - count: 3 # Display when more than 3 comments + # Number of hot comments + count: 3 +# Twikoo: https://solitude.js.org/comment/twikoo +# Twikoo: https://solitude.js.org/zh/comment/twikoo twikoo: # https://twikoo.js.org/ envId: # url: https://twikoo.sondy.top/ region: # Environment locale, default is ap-shanghai, Tencent cloud environment fill ap-shanghai or ap-guangzhou; Vercel environment do not fill the. style: true # Use custom styles when turned on accessToken: # AccessToken option: # twikoo option +# Waline: https://solitude.js.org/comment/waline +# Waline: https://solitude.js.org/zh/comment/waline waline: # https://waline.js.org/ envId: # url: https://waline.wzsco.top pageview: false # Whether to enable page access statistics option: # waline configuration item +# Valine: https://solitude.js.org/comment/valine +# Valine: https://solitude.js.org/zh/comment/valine valine: appId: # leancloud application app id appKey: # leancloud application app key @@ -552,10 +762,14 @@ valine: visitor: false style: true # Use custom styles when turned on option: # options list +# Artalk: https://solitude.js.org/comment/artalk +# Artalk: https://solitude.js.org/zh/comment/artalk artalk: server: # server url site: # site name option: # options +# Giscus: https://solitude.js.org/comment/giscus +# Giscus: https://solitude.js.org/zh/comment/giscus giscus: repo: # GitHub repository name repo_id: # GitHub repository ID @@ -568,18 +782,28 @@ giscus: # --------------------------- start --------------------------- # Console +# 控制台 console: enable: false - recentComment: # Recent comments + # Recent comments + # 最新评论 + recentComment: enable: false - storage: .2 # Cache time 1: 1 day / .5 : half a day + # Cache time 1: 1 day / .5 : half a day + # 缓存时间 1: 1天 / .5 : 半天 + storage: .2 card: - tags: true # Tags - archive: true # Archive + # Tags + # 标签 + tags: true + # Archives + # 归档 + archive: true # --------------------------- end --------------------------- # --------------------------- start --------------------------- # verification +# 验证 verify_site: # - name: google-site-verification # content: xxxxxx @@ -589,31 +813,44 @@ verify_site: # --------------------------- start --------------------------- # CSS Prefix +# CSS 前缀 # When turned on, it will automatically prefix the CSS (to get better browser support), but this will increase the size of the CSS file. +# 开启后会自动给 CSS 加前缀（以获得更好的浏览器支持），但这会增加 CSS 文件的大小。 css_prefix: false # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Font +# 字体 font: font-size: 16px code-font-size: 16px + # Global font + # 全局字体 font-family: "PingFang SC, Hiragino Sans GB, Microsoft YaHei" + # Code font + # 代码字体 code-font-family: '"monospace", monospace' # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Extend +# 扩展 extends: - head: # Insert in head + # 插入到 head + head: # - - body: + # Insert in body + # 插入到 body + body: + # - # --------------------------- end --------------------------- # --------------------------- start --------------------------- # PWA +# Progressive Web App pwa: enable: false manifest: /manifest.json # manifest.json @@ -627,28 +864,47 @@ pwa: # --------------------------- start --------------------------- # Google Adsense +# 谷歌广告 google_adsense: enable: false - auto_ads: false # After auto ads are turned off, it is manual ads - enable_page_level_ads: true # Page-level ads - aside_card: true # Sidebar card ads - post_card: true # Post card ads - post_content: true # Post content ads - js: https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js # Google Adsense js + # Auto ads + # 自动广告 + auto_ads: false + # Page-level ads + # 页面级广告 + enable_page_level_ads: true + # Sidebar card ads + # 侧边栏卡片广告 + aside_card: true + # Post card ads + # 文章卡片广告 + post_card: true + # Post content ads + # 文章内容广告 + post_content: true + # Google Adsense js + # 谷歌广告 js + js: https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js client: # ca-pub-XXXXXXXXXXXXXX slot: # 4236388782 # --------------------------- end --------------------------- # --------------------------- start --------------------------- # Custom right menu +# 自定义右键菜单 right_menu: enable: false - commentBarrage: false # Whether to display the hot comment switch. - translate: # Simplified and Traditional Chinese translation. + # Whether to display the hot comment switch. + # 是否显示热门评论开关 + commentBarrage: false + # Simplified and Traditional Chinese translation. + # 简繁体转换 + translate: enable: false defaultEncoding: 2 # 1: 默认繁体 2: 默认简体 translateDelay: 0 # 首次加载翻译迟疑时间 # Custom list + # 自定义列表 custom_list: # - name: Random # click: toRandomPost() @@ -670,6 +926,7 @@ right_menu: # --------------------------- start --------------------------- # Memorial # Turn the entire site gray on memorable days. +# 在纪念日整个网站变灰 memorial: enable: false date: @@ -681,6 +938,7 @@ memorial: # --------------------------- start --------------------------- # Lure # When the user exits the page, modify the title +# 当用户退出页面时，修改标题 lure: enable: false jump: 404 Not Found @@ -689,6 +947,7 @@ lure: # --------------------------- start --------------------------- # Article expiration +# 文章过期 expire: enable: false time: 30 # days @@ -699,6 +958,7 @@ expire: # --------------------------- start --------------------------- # Background +# 背景图片 background: enable: false opacity: .2 From 7152a816161e72743a3acef145a03cbd27d51d35 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Thu, 15 Aug 2024 09:42:39 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E2=9C=A8=20=E6=9B=B4=E6=96=B0v2.0.8?= 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 c3c2d5ce..cc19023b 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-solitude", - "version": "2.0.7", + "version": "2.0.8", "description": "A beautiful, powerful, and efficient Hexo theme developed by EverFu.", "main": "package.json", "scripts": { From 03d33d8e51aa02c6709c88df9580f3c77dbbcbf5 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 18 Aug 2024 22:03:51 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=F0=9F=94=A5=20=E7=A7=BB=E9=99=A4=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layout/includes/layout.pug | 2 +- package.json | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/layout/includes/layout.pug b/layout/includes/layout.pug index e5fa7b7e..981ac089 100644 --- a/layout/includes/layout.pug +++ b/layout/includes/layout.pug @@ -55,4 +55,4 @@ html(lang=config.language, data-theme="light") // music if theme.capsule.enable - include ./widgets/third-party/music.pug \ No newline at end of file + include ./widgets/third-party/music.pug diff --git a/package.json b/package.json index cc19023b..e9a49218 100755 --- a/package.json +++ b/package.json @@ -28,8 +28,5 @@ }, "homepage": "https://everfu.github.io/Solitude/", "author": "Hexo-Theme-Solitude", - "license": "MIT", - "devDependencies": { - "@types/node": "^22.0.0" - } + "license": "MIT" } From c25e9349aded52f9894919819e9d502af9967073 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 18 Aug 2024 22:06:50 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=F0=9F=94=A5=20=E7=A7=BB=E9=99=A4=20Priva?= =?UTF-8?q?cy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 3 --- layout/includes/footer.pug | 22 ++++++---------- source/css/_layout/footer.styl | 46 ---------------------------------- source/js/main.js | 11 +------- 4 files changed, 9 insertions(+), 73 deletions(-) diff --git a/_config.yml b/_config.yml index b9b4f5c1..cf1d92e7 100644 --- a/_config.yml +++ b/_config.yml @@ -441,9 +441,6 @@ footer: # Random link # 随机友链 randomlink: false # Random link - # Privacy policy - # 隐私政策 - privacy: # /privacy/ # License license: # https://creativecommons.org/licenses/by-nc-sa/4.0/deed.zh # License diff --git a/layout/includes/footer.pug b/layout/includes/footer.pug index ee654334..aca014a4 100644 --- a/layout/includes/footer.pug +++ b/layout/includes/footer.pug @@ -1,3 +1,5 @@ +- var { information , group } = theme.footer + if theme.post.footer.enable && is_post() div#st-footer-bar div.footer-logo @@ -11,24 +13,23 @@ if theme.post.footer.enable && is_post() if theme.post.footer.button.enable a.footer-bar-link(href=url_for(theme.post.footer.button.url))= theme.post.footer.button.name div#footer_deal - - var leftInfo = theme.footer && theme.footer.information && theme.footer.information.left || {} - - var rightInfo = theme.footer && theme.footer.information && theme.footer.information.right || {} + - var leftInfo = information.left + - var rightInfo = information.right each value, label in leftInfo - var array = value.split('||') a.deal_link(href=url_for(trim(array[0])), title=label) i.solitude(class=array[1]) - if theme.footer.information.author + if information.author div#footer_mini_logo.nolazyload.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()") - img(src=theme.site.icon, alt=_p('nav.backtop')) + img(src=information.author, alt=_p('nav.backtop')) each value, label in rightInfo - var array = value.split('||') a.deal_link(href=url_for(trim(array[0])), title=label) i.solitude(class=array[1]) div#st-footer - - var group = theme.footer && theme.footer.group ? theme.footer.group : {} each value, x in group div.footer-group @@ -57,17 +58,10 @@ div#footer-bar each item in theme.footer.links a.footer-bar-link(href=url_for(item.url), alt=item.name)!= item.name if theme.footer.license - a.footer-bar-link.cc(href=url_for(theme.footer.license), aria-label = 'copyright') + a.footer-bar-link.cc(href=url_for(theme.footer.license)) i.solitude.fa-solid.fa-copyright i.solitude.fa-brands.fa-creative-commons-by i.solitude.fa-brands.fa-creative-commons-nc i.solitude.fa-brands.fa-creative-commons-nd -if theme.footer.privacy - div.needEndHide#cookies-window - div.cookies-window-title= __('cookies.title') - div.cookies-window-content - span.cookies-tip= __('cookies.tip') - a.cookies-link(href=url_for(theme.footer.privacy), title=_p('cookies.privacy')) - i.solitude.fa-solid.fa-circle-chevron-right if theme.comment.use && theme.comment.commentBarrage - div.comment-barrage.needEndHide \ No newline at end of file + div.comment-barrage.needEndHide diff --git a/source/css/_layout/footer.styl b/source/css/_layout/footer.styl index 75c7a467..736065cf 100644 --- a/source/css/_layout/footer.styl +++ b/source/css/_layout/footer.styl @@ -230,49 +230,3 @@ > div > div.footer-bar-left > span margin-right 1rem - - #cookies-window - min-width 300px - background var(--efu-maskbgdeep) - color var(--efu-fontcolor) - padding 8px 16px - display flex - flex-direction column - bottom 20px - right 20px - position fixed - border-radius 12px - transition .3s - z-index 8 - user-select none - backdrop-filter saturate(180%) blur(20px) - transform translateZ(0) - border var(--style-border) - animation barrageIn .6s cubic-bezier(.42, 0, .3, 1.11) - - +maxWidth1300() - display none - - &.cw-hide - opacity 0 - animation barrageOut .6s cubic-bezier(.42, 0, .3, 1.11) - z-index -1 - - .cookies-window-title - padding-bottom 4px - border-bottom var(--style-border) - font-size 12px - font-weight 700 - - .cookies-window-content - font-size 14px - display flex - justify-content space-around - align-items center - - .cookies-link - margin-left: 10px - font-size: 16px - - i.solitude - font-size 16px diff --git a/source/js/main.js b/source/js/main.js index 5cb24219..47292fbc 100644 --- a/source/js/main.js +++ b/source/js/main.js @@ -134,15 +134,6 @@ const sco = { lastSayHello: "", wasPageHidden: false, musicPlaying: false, - hideCookie() { - const cookiesWindow = document.getElementById("cookies-window"); - if (cookiesWindow) { - setTimeout(() => { - cookiesWindow.classList.add("cw-hide"); - setTimeout(() => cookiesWindow.style.display = "none", 1000); - }, 3000); - } - }, scrollTo(elementId) { const targetElement = document.getElementById(elementId); if (targetElement) { @@ -673,7 +664,7 @@ window.refreshFn = () => { document.body.setAttribute('data-type', page); sco.changeTimeFormat(document.querySelectorAll(timeSelector)); runtime && sco.addRuntime(); - [scrollFn, sidebarFn, sco.hideCookie, sco.addPhotoFigcaption, sco.setTimeState, sco.tagPageActive, sco.categoriesBarActive, sco.listenToPageInputPress, sco.addNavBackgroundInit, sco.refreshWaterFall].forEach(fn => fn()); + [scrollFn, sidebarFn, sco.addPhotoFigcaption, sco.setTimeState, sco.tagPageActive, sco.categoriesBarActive, sco.listenToPageInputPress, sco.addNavBackgroundInit, sco.refreshWaterFall].forEach(fn => fn()); lazyload.enable && utils.lazyloadImg(); lightbox && utils.lightbox(document.querySelectorAll("#article-container img:not(.flink-avatar,.gallery-group img)")); randomlink && randomLinksList(); From 768f77d5533e36fadc506396d5420c6ae5004427 Mon Sep 17 00:00:00 2001 From: Ever Fu Date: Sun, 18 Aug 2024 22:10:59 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E2=9C=A8=20=E6=9B=B4=E6=96=B0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index cf1d92e7..c05b12a2 100644 --- a/_config.yml +++ b/_config.yml @@ -26,8 +26,8 @@ site: # Navigation bar # 导航栏 nav: - # Left button - # 左侧按钮 + # Left Box + # 左侧盒子 group: # project: # name # Solitude: https://github.com/everfu/hexo-theme-solitude || /img/pwa/favicon.ico # name: url || icon @@ -691,7 +691,7 @@ post_ai: key: talk: # 我是 Efu 开发的摘要生成助理EfuGPT，EfuGPT在静态部署时进行摘要的撰写，并且在访客访问时通过EfuCorrection转译后的文本摘要实现工具。我在这里只负责已经生成的摘要显示，你无法与我直接沟通，但我可以回答一些预设的问题。 randomPost: false - report: https://efu.me/ + report: https://solitude.js.org tips: # 此内容根据文章生成，并经过人工审核，仅用于文章内容的解释与总结 # --------------------------- end --------------------------- @@ -736,7 +736,6 @@ comment: # Number of hot comments count: 3 # Twikoo: https://solitude.js.org/comment/twikoo -# Twikoo: https://solitude.js.org/zh/comment/twikoo twikoo: # https://twikoo.js.org/ envId: # url: https://twikoo.sondy.top/ region: # Environment locale, default is ap-shanghai, Tencent cloud environment fill ap-shanghai or ap-guangzhou; Vercel environment do not fill the. @@ -744,13 +743,11 @@ twikoo: # https://twikoo.js.org/ accessToken: # AccessToken option: # twikoo option # Waline: https://solitude.js.org/comment/waline -# Waline: https://solitude.js.org/zh/comment/waline waline: # https://waline.js.org/ envId: # url: https://waline.wzsco.top pageview: false # Whether to enable page access statistics option: # waline configuration item # Valine: https://solitude.js.org/comment/valine -# Valine: https://solitude.js.org/zh/comment/valine valine: appId: # leancloud application app id appKey: # leancloud application app key @@ -766,7 +763,6 @@ artalk: site: # site name option: # options # Giscus: https://solitude.js.org/comment/giscus -# Giscus: https://solitude.js.org/zh/comment/giscus giscus: repo: # GitHub repository name repo_id: # GitHub repository ID @@ -964,6 +960,8 @@ background: # --------------------------- end --------------------------- # --------------------------- start --------------------------- +# Do not modify unless necessary +# 非必要请勿修改 CDN: internal: local # local / cdnjs / jsdelivr / unpkg / custom third_party: cdnjs # cdnjs / jsdelivr / unpkg / custom