Merge remote-tracking branch 'origin/main'

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:

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))

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()

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))

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,

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;
 }
@@ -8027,8 +8027,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;
@@ -8051,7 +8051,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;
@@ -8152,8 +8152,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 {
@@ -8365,7 +8365,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;
@@ -8376,6 +8376,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) {