From ec90211520e16d438bc313b89f1a208a4d82fa2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=91=E8=8B=8D=E7=8B=97?= Date: Mon, 9 Oct 2023 17:05:16 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=F0=9F=8C=88=20style:=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E6=96=87=E7=AB=A0=E6=91=98=E8=A6=81=E6=B7=B1=E8=89=B2?= =?UTF-8?q?=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/css/_components/publication.less | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/hexo-theme-async/source/css/_components/publication.less b/packages/hexo-theme-async/source/css/_components/publication.less index cc27b5b9..12063cbf 100644 --- a/packages/hexo-theme-async/source/css/_components/publication.less +++ b/packages/hexo-theme-async/source/css/_components/publication.less @@ -1,10 +1,6 @@ .trm-publication { word-break: break-all; - - >p:first-of-type { - color : var(--theme-color, #00283a) !important; - opacity: 1 !important; - } + // color : var(--theme-color, #00283a); p { margin-bottom: 20px; From ac7f42e02600e083b06ce1b4a951d273f5818cec Mon Sep 17 00:00:00 2001 From: wangshunda Date: Mon, 9 Oct 2023 12:26:50 +0800 Subject: [PATCH 02/11] Update sites.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 请求站点展示 --- docs/.vitepress/assets/sites.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/.vitepress/assets/sites.json b/docs/.vitepress/assets/sites.json index 6c25b001..353be79a 100644 --- a/docs/.vitepress/assets/sites.json +++ b/docs/.vitepress/assets/sites.json @@ -59,5 +59,11 @@ "url": "https://blog.shawn404.top/", "avatar": "https://blog.shawn404.top/img/logo.svg", "desc": "Strive hard and work novelty" + }, + { + "name": "Hexagon", + "url": "https://dracewang.github.io/", + "avatar": "https://s2.loli.net/2023/10/09/XwlqZH67cJo2NC5.jpg", + "desc": "江湖险恶,不行就撤" } ] \ No newline at end of file From 6a322e447a3676d05c4d3ebc50c400eb01b8412b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=91=E8=8B=8D=E7=8B=97?= Date: Mon, 9 Oct 2023 18:01:10 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=F0=9F=8C=88=20style:=20=E5=8A=A0?= =?UTF-8?q?=E6=B7=B1=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hexo-theme-async/source/css/_components/toc.less | 1 + packages/hexo-theme-async/source/css/_variables/index.less | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/hexo-theme-async/source/css/_components/toc.less b/packages/hexo-theme-async/source/css/_components/toc.less index 3b1a936b..207a6e76 100644 --- a/packages/hexo-theme-async/source/css/_components/toc.less +++ b/packages/hexo-theme-async/source/css/_components/toc.less @@ -59,6 +59,7 @@ -o-text-overflow: ellipsis; text-overflow : ellipsis; max-width : calc(100vw - 30px - 8rem); + padding-left : 0.5em; } .trm-toc-level-1 { diff --git a/packages/hexo-theme-async/source/css/_variables/index.less b/packages/hexo-theme-async/source/css/_variables/index.less index 225b5c2b..448a6873 100644 --- a/packages/hexo-theme-async/source/css/_variables/index.less +++ b/packages/hexo-theme-async/source/css/_variables/index.less @@ -7,7 +7,7 @@ --primary-weak-50: fade(@primary-weak, 50%); } -.var-theme(@body-color: #7B7B7D; @body-bg-color: #00151f; @theme-color: #00283a; @theme-bg-color: #fcfcfe; @theme-bg2-color: #f4f5f7) { +.var-theme(@body-color: #5d5d5e; @body-bg-color: #00151f; @theme-color: #00283a; @theme-bg-color: #fcfcfe; @theme-bg2-color: #f4f5f7) { --body-color : @body-color; --body-color-5 : fade(@body-color, 5%); --body-bg-color : @body-bg-color; @@ -82,7 +82,7 @@ .dark() { // base .var-primary(); - .var-theme(#cccdcfb3, #00151f, #dedee0, #00283a, #02162b); + .var-theme(#d1d9e9b3, #00151f, #dedee0, #00283a, #02162b); --box-shadow : 0 2px 4px -2px rgba(0, 0, 0, 0.6); --box-shadow2 : inset 0 0 4px -1px rgba(0, 0, 0, 0.6); From 2a277a253d3c8bbbb5fef672b44ef8ec95d11118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=91=E8=8B=8D=E7=8B=97?= Date: Tue, 10 Oct 2023 14:19:13 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=F0=9F=8C=88=20style:=20firefox=20?= =?UTF-8?q?=E4=B8=8B=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/css/_components/base.less | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/packages/hexo-theme-async/source/css/_components/base.less b/packages/hexo-theme-async/source/css/_components/base.less index 5315a4cc..b051f6bf 100644 --- a/packages/hexo-theme-async/source/css/_components/base.less +++ b/packages/hexo-theme-async/source/css/_components/base.less @@ -1,7 +1,10 @@ *, ::after, ::before { - box-sizing: border-box; + box-sizing : border-box; + // firefox scroll bar + scrollbar-width: thin; + scrollbar-color: var(--primary-50, #afb42b) transparent; } body { @@ -100,7 +103,6 @@ p { margin: 0 } - .trm-text-sm { font-size: 12px } @@ -114,7 +116,6 @@ p { opacity: 1 !important } - .trm-accent-color { color: var(--primary, #afb42b) } @@ -222,23 +223,6 @@ html { transition: opacity .6s; } -// scroll bar - -.c-scrollbar { - width : 10px; - top : 8px; - bottom: 10px; - height: calc(100vh - 20px) -} - -.c-scrollbar_thumb { - width : 4px; - right : 1px; - border-radius : 10px; - background-color: var(--primary, #afb42b); - opacity : 1 -} - // incofont symbol .symbol-icon { width : 1em; From e7d773f220405a1f40ccbfc57d2255f6f74656e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=91=E8=8B=8D=E7=8B=97?= Date: Tue, 10 Oct 2023 19:21:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E2=9C=A8=20feat:=20toc=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BD=AE=E9=A1=B6=E5=8F=AF=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- .prettierrc.json | 10 ++++ docs/.vitepress/components/IconList.vue | 49 ++++++++----------- docs/.vitepress/components/InfoToast.vue | 33 +++++++++++-- docs/about/icon.md | 1 - docs/about/index.md | 8 +-- packages/hexo-theme-async-ts/global.d.ts | 4 +- packages/hexo-theme-async-ts/src/global.ts | 4 +- packages/hexo-theme-async-ts/src/init.ts | 47 +++++++++++++++++- .../layout/_widget/post-toc.ejs | 1 + .../hexo-theme-async/scripts/helper/toc.js | 2 +- .../source/css/_components/toc.less | 27 ++++++++-- 12 files changed, 139 insertions(+), 49 deletions(-) create mode 100644 .prettierrc.json diff --git a/.editorconfig b/.editorconfig index eb3fa204..65a990df 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,6 @@ tab_width = 2 [*.{js,ts}] quote_type = single -[*.{json,less,js}] +[*.{json,less,js,vue}] indent_style = space indent_size = 4 \ No newline at end of file diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 00000000..ae7a1ff3 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,10 @@ +{ + "printWidth": 200, + "semi": true, + "vueIndentScriptAndStyle": false, + "trailingComma": "all", + "proseWrap": "preserve", + "htmlWhitespaceSensitivity": "strict", + "endOfLine": "auto", + "arrowParens": "avoid" +} \ No newline at end of file diff --git a/docs/.vitepress/components/IconList.vue b/docs/.vitepress/components/IconList.vue index f9d4dacf..0614a762 100644 --- a/docs/.vitepress/components/IconList.vue +++ b/docs/.vitepress/components/IconList.vue @@ -1,50 +1,42 @@ - +