From cc2317c2e42da9484d26c81fd74033cfe8bd5338 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <17683872107czx> Date: Thu, 19 Oct 2023 11:17:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=BC=E8=88=AA=E6=9D=A1=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 3 +++ templates/assets/zhheo/zhheoblog.css | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/settings.yaml b/settings.yaml index a1b3117e..f5d91012 100644 --- a/settings.yaml +++ b/settings.yaml @@ -446,6 +446,7 @@ spec: - $formkit: repeater if: $get(nav).value === 'custom-category' name: navCustomCategory + key: navCustomCategory label: 自定义分类 value: [ ] children: @@ -455,6 +456,7 @@ spec: - $formkit: repeater if: $get(nav).value === 'custom-tag' name: navCustomTag + key: navCustomTag label: 自定义标签 value: [ ] children: @@ -464,6 +466,7 @@ spec: - $formkit: repeater if: $get(nav).value === 'custom-url' name: navCustomUrl + key: navCustomUrl label: 自定义路径 value: [ ] children: diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css index a8f72422..7f8c145b 100644 --- a/templates/assets/zhheo/zhheoblog.css +++ b/templates/assets/zhheo/zhheoblog.css @@ -3107,7 +3107,7 @@ ul { #pagination .page-number.current { background: rgb(0, 121, 255); - color: var(--white); + color: var(--heo-card-bg); cursor: default; border-radius: 5px; } @@ -8023,8 +8023,8 @@ div#banners { height: 100%; top: 0; left: 0; - background: var(--heo-theme); - color: var(--heo-white); + background: var(--heo-lighttext); + color: var(--heo-card-bg); padding-left: 0.5rem; display: flex; flex-direction: column; @@ -8047,7 +8047,7 @@ div#banners { #banners:hover #banner-hover { opacity: 1; padding-left: 2rem; - background: #4259efc9; + background: var(--heo-theme-op-deep); backdrop-filter: blur(15px); -webkit-backdrop-filter: blur(15px); -webkit-backface-visibility: hidden; @@ -8148,8 +8148,8 @@ div#banners { } .topGroup .banner-button:hover { - background: var(--heo-theme); - color: var(--heo-white); + background: var(--heo-lighttext); + color: var(--heo-card-bg); } .topGroup .banner-button i { @@ -8361,7 +8361,7 @@ a.categoryButton:hover { /* 首页分类条展示 */ #category-bar { - padding: 0.4rem 1rem 0.4rem 0.5rem; + padding: 0.4rem 1rem 0.4rem 0.7rem; background: var(--heo-card-bg); border-radius: 12px; display: flex; @@ -8372,6 +8372,9 @@ a.categoryButton:hover { transition: 0.3s; width: 100%; justify-content: space-between; + -webkit-user-select: none; + display: flex; + align-items: center } @media screen and (min-width: 1300px) { From 41614091a7132966c87739d8b870f00898ebdd87 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <17683872107czx> Date: Thu, 19 Oct 2023 14:26:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=87=B4=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E8=B7=AF=E7=94=B1=E4=B8=8D=E5=AF=B9=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=AF=84=E8=AE=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/assets/js/comment/artalk.js | 2 +- templates/assets/js/comment/twikoo.js | 1 + templates/assets/js/comment/waline.js | 2 +- templates/assets/zhheo/commentBarrage.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/assets/js/comment/artalk.js b/templates/assets/js/comment/artalk.js index b1306148..88eaf6cb 100644 --- a/templates/assets/js/comment/artalk.js +++ b/templates/assets/js/comment/artalk.js @@ -6,7 +6,7 @@ el: '#artalk-wrap', server: GLOBAL_CONFIG.source.artalk.artalkUrl, site: GLOBAL_CONFIG.source.artalk.siteName, - pageKey: location.pathname, + pageKey: location.pathname.replace(/\/page\/\d$/, ""), darkMode: false, countEl: '#ArtalkCount' }, null)) diff --git a/templates/assets/js/comment/twikoo.js b/templates/assets/js/comment/twikoo.js index 9ee2a9ff..21d958b7 100644 --- a/templates/assets/js/comment/twikoo.js +++ b/templates/assets/js/comment/twikoo.js @@ -5,6 +5,7 @@ el: '#twikoo-wrap', envId: GLOBAL_CONFIG.source.twikoo.twikooUrl, region: '', + path: location.pathname.replace(/\/page\/\d$/, ""), onCommentLoaded: function () { btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)')) typeof hljs === 'object' && hljs.highlightAll() diff --git a/templates/assets/js/comment/waline.js b/templates/assets/js/comment/waline.js index c7a9717e..94cc7b40 100644 --- a/templates/assets/js/comment/waline.js +++ b/templates/assets/js/comment/waline.js @@ -6,7 +6,7 @@ serverURL: GLOBAL_CONFIG.source.waline.serverURL, pageview: false, dark: 'html[data-theme="dark"]', - path: window.location.pathname, + path: window.location.pathname.replace(/\/page\/\d$/, ""), comment: false, locale:GLOBAL_CONFIG.source.waline.locale }, null)) diff --git a/templates/assets/zhheo/commentBarrage.js b/templates/assets/zhheo/commentBarrage.js index f011d00a..21fb74be 100644 --- a/templates/assets/zhheo/commentBarrage.js +++ b/templates/assets/zhheo/commentBarrage.js @@ -12,7 +12,7 @@ if(GLOBAL_CONFIG.htmlType!='comments' && document.querySelector('#post-comment') //token获取见上方 accessToken: GLOBAL_CONFIG.source.twikoo.accessToken, mailMd5: GLOBAL_CONFIG.source.comments.mailMd5, - pageUrl: window.location.pathname, + pageUrl: window.location.pathname.replace(/\/page\/\d$/, ""), barrageTimer: [], barrageList: [], siteName: GLOBAL_CONFIG.source.artalk.siteName,