diff --git a/settings.yaml b/settings.yaml
index 9236de73..d68e3cb9 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -509,8 +509,6 @@ spec:
value: col2
- label: 三列
value: col3
- - label: 四列
- value: col4
- $formkit: select
name: postLocation
label: 封面位置
@@ -933,29 +931,56 @@ spec:
label: 左侧
value: [ ]
children:
- - $formkit: text
+ - $formkit: radio
+ name: option_social_data
+ label: 类型
+ value: icon
+ help: "icon图标选择icon图标，svg代码或者图片(如果使用图片请输入完整img标签)选择自定义"
+ options:
+ - value: icon
+ label: icon图标
+ - value: custom
+ label: 自定义
+ - $formkit: textarea
name: icon
+ help: "icon图标，svg代码，图片(如果使用图片请输入完整img标签)"
label: 图标
+ validation: "required"
- $formkit: text
name: name
label: 名称
+ validation: "required"
- $formkit: text
name: url
label: 链接
+ validation: "required"
- $formkit: repeater
name: socialMediaRight
label: 右侧
value: [ ]
children:
- - $formkit: text
+ - $formkit: radio
+ name: option_social_data
+ label: 类型
+ value: icon
+ options:
+ - value: icon
+ label: icon图标
+ - value: custom
+ label: 自定义
+ - $formkit: textarea
name: icon
+ help: "icon图标或svg代码或者图片(如果使用图片请输入完整img标签)"
label: 图标
+ validation: "required"
- $formkit: text
name: name
label: 名称
+ validation: "required"
- $formkit: text
name: url
label: 链接
+ validation: "required"
- $formkit: menuRadio
name: menu
label: 相关链接
diff --git a/templates/archives.html b/templates/archives.html
index 2cf06a58..7c325b6e 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -53,7 +53,7 @@
-
+
diff --git a/templates/assets/css/fullPage.css b/templates/assets/css/fullPage.css
index a03839ac..5f26b2bd 100644
--- a/templates/assets/css/fullPage.css
+++ b/templates/assets/css/fullPage.css
@@ -11,14 +11,18 @@
}
-.back-home-button {
+.page .back-home-button {
color: rgba(255, 255, 255, 0.7);
}
-#nav #site-name {
+.page #nav #site-name span {
color: var(--light-grey);
}
+.nav-fixed #nav #site-name span{
+ color: var(--heo-fontcolor);
+}
+
#nav .site-page {
color: rgba(255, 255, 255, 0.7);
}
diff --git a/templates/assets/js/heo.js b/templates/assets/js/heo.js
index aba709ba..48a7d40a 100644
--- a/templates/assets/js/heo.js
+++ b/templates/assets/js/heo.js
@@ -484,9 +484,23 @@ var heo = {
, o = document.getElementById("toPageText")
, n = parseInt(o.value);
if (!isNaN(n) && n > 0 && "0" !== ("" + n)[0] && n <= t) {
- var a, l = window.location.href.replace(/\/page\/\d$/, "");
- a = 1 === n ? l : l + (l.endsWith("/") ? "" : "/") + "page/" + n,
- document.getElementById("toPageButton").href = a
+ var url = window.location.href;
+
+ var photosIndexOf = url.indexOf("?group") >= 0 ? url.indexOf("?group") : -1;
+ if (photosIndexOf >= 0) {//图库页面
+ var new_url = url.substr(0,photosIndexOf);
+ var group = url.substr(photosIndexOf)
+ var a, l = new_url.replace(/\/page\/\d$/, "");
+ a = 1 === n ? l : l + (l.endsWith("/") ? "" : "/") + "page/" + n,
+ document.getElementById("toPageButton").href = a + group
+ }else{
+ var a, l = url.replace(/\/page\/\d$/, "");
+ a = 1 === n ? l : l + (l.endsWith("/") ? "" : "/") + "page/" + n,
+ document.getElementById("toPageButton").href = a
+ }
+ //首页有第一屏就跳转指定位置
+ scrollToPost();
+
}
},
changeSayHelloText: function() {
diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css
index bc69aa6e..a8f72422 100644
--- a/templates/assets/zhheo/zhheoblog.css
+++ b/templates/assets/zhheo/zhheoblog.css
@@ -5362,10 +5362,11 @@ html {
}
}
-.nav-fixed #nav .back-home-button {
+.nav-fixed #nav .back-home-button{
color: var(--heo-fontcolor);
}
+
.back-home-button:hover {
background: var(--heo-main);
color: var(--heo-white);
@@ -6276,6 +6277,22 @@ a.deal_link:hover {
transform: scale(1.1)
}
+a.custom_socials {
+ display: flex;
+ margin: 1rem 27px;
+ border-radius: 3rem;
+ width: 32px;
+ height: 32px;
+ justify-content: center;
+ align-items: center;
+ transition: 0.3s;
+}
+
+a.custom_socials:hover {
+ transform: scale(1.1)
+}
+
+
img.footer_mini_logo {
width: 50px;
height: 50px;
@@ -6440,8 +6457,8 @@ img.footer_mini_logo:hover {
}
#rightMenu .rightMenu-group .rightMenu-item:hover {
- background-color: var(--heo-main);
- color: var(--heo-white);
+ background-color: var(--heo-lighttext);
+ color: var(--heo-card-bg);
box-shadow: var(--heo-shadow-main);
}
@@ -8818,6 +8835,7 @@ li {
}
.ai-btn-item:hover {
background: var(--heo-theme);
+ color: var(--heo-card-bg);
}
.ai-recommend {
display: -webkit-box;
@@ -11482,7 +11500,7 @@ blockquote p {
/* 文章数字头 */
#article-container ol li:before,
#article-container ul li:before {
- background: var(--heo-theme);
+ background: var(--heo-main);
cursor: default;
}
diff --git a/templates/category.html b/templates/category.html
index befcf3b1..cbf6c5d0 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -32,85 +32,8 @@
更多
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+