diff --git a/settings.yaml b/settings.yaml index 9ad40450..b13cc453 100644 --- a/settings.yaml +++ b/settings.yaml @@ -464,7 +464,32 @@ spec: profileName: profileDesc: socialMedia: + profileStyle: + desc: + stickerImg: children: + - $formkit: select + name: profileStyle + id: profileStyle + key: profileStyle + label: 样式 + value: default + options: + - value: default + label: 默认 + - value: one + label: 样式一 + - $formkit: attachment + name: stickerImg + if: $get(profileStyle).value == 'one' + label: 贴纸 + value: https://0206.ink/upload/omxo3N22290781690363822143.png + placeholder: 请输入图片地址 + - $formkit: text + if: $get(profileStyle).value == 'one' + name: desc + value: "分享设计与科技生活" + label: 卡片名称下面的描述 - $formkit: text name: helloText label: 作者打招呼 @@ -1063,6 +1088,41 @@ spec: label: 运营模式与责任地址 placeholder: 请输入运营模式与责任地址 value: /rss + - $formkit: group + name: share_right + label: 分享按钮 + value: + mobile_edit: + weibo_edit: + copyurl_edit: + children: + - $formkit: radio + name: mobile_edit + help: 启用分享手机访问二维码 + value: true + options: + - label: 启用 + value: true + - label: 禁用 + value: false + - $formkit: radio + name: weibo_edit + help: 启用分享到微博 + value: true + options: + - label: 启用 + value: true + - label: 禁用 + value: false + - $formkit: radio + name: copyurl_edit + help: 启用复制链接 + value: true + options: + - label: 启用 + value: true + - label: 禁用 + value: false - $formkit: group name: copyrights label: 版权声明 diff --git a/templates/assets/css/post-copyright-one.css b/templates/assets/css/post-copyright-one.css index 04a72cda..6535e35f 100644 --- a/templates/assets/css/post-copyright-one.css +++ b/templates/assets/css/post-copyright-one.css @@ -305,3 +305,13 @@ img.post-copyright__author_img_front { background:var(--heo-card-bg); } +.post-tools .post-tools-left .rewardLeftButton,.post-tools .post-tools-left .shareRight { + display: -webkit-box; + display: -moz-box; + display: -webkit-flex; + display: -ms-flexbox; + display: box; + display: flex; + margin: 10px +} + diff --git a/templates/assets/zhheo/blogex.js b/templates/assets/zhheo/blogex.js index 97375a0f..e2c2fa79 100644 --- a/templates/assets/zhheo/blogex.js +++ b/templates/assets/zhheo/blogex.js @@ -223,28 +223,40 @@ function showcopy() { // 早上好问好 // 获取时间 var getTimeState = () => { - // 获取当前时间 - var timeNow = new Date(); - // 获取当前小时 - var hours = timeNow.getHours(); - // 设置默认文字 - var text = ``; - // 判断当前时间段 - if (hours >= 0 && hours <= 5) { - text = `晚安`; - } else if (hours > 5 && hours <= 10) { - text = `早上好`; - } else if (hours > 10 && hours <= 14) { - text = `中午好`; - } else if (hours > 14 && hours <= 18) { - text = `下午好`; - } else if (hours > 18 && hours <= 24) { - text = `晚上好`; + + if (GLOBAL_CONFIG.profileStyle == 'default') { + // 获取当前时间 + var timeNow = new Date(); + // 获取当前小时 + var hours = timeNow.getHours(); + // 设置默认文字 + var text = ``; + // 判断当前时间段 + if (hours >= 0 && hours <= 5) { + text = `晚安`; + } else if (hours > 5 && hours <= 10) { + text = `早上好`; + } else if (hours > 10 && hours <= 14) { + text = `中午好`; + } else if (hours > 14 && hours <= 18) { + text = `下午好`; + } else if (hours > 18 && hours <= 24) { + text = `晚上好`; + } + //    console.log(`hours >>>>>`, hours); + //    console.log(`text >>>>`, text); + // 返回当前时间段对应的状态 + return text; + } - //    console.log(`hours >>>>>`, hours); - //    console.log(`text >>>>`, text); - // 返回当前时间段对应的状态 - return text; + + if (GLOBAL_CONFIG.profileStyle == 'one') { + var e = (new Date).getHours() + , t = ""; + return e >= 0 && e <= 5 ? t = "睡个好觉，保证精力充沛" : e > 5 && e <= 10 ? t = "一日之计在于晨" : e > 10 && e <= 14 ? t = "吃饱了才有力气干活" : e > 14 && e <= 18 ? t = "集中精力，攻克难关" : e > 18 && e <= 24 && (t = "不要太劳累了，早睡更健康"), + t + } + }; function fly_to_top() { diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css index b6e69278..8023c6b6 100644 --- a/templates/assets/zhheo/zhheoblog.css +++ b/templates/assets/zhheo/zhheoblog.css @@ -2098,24 +2098,14 @@ blockquote footer cite::before { } } -#aside-content .card-info img { - width: 28px; - right: 24px; - top: 20px; - border-radius: 500px; - transition: all 0.5s ease 0s; - position: absolute; -} + .author-info__top-group { display: flex; height: 28px; } -#aside-content .card-info .author-info__name { - font-weight: 500; - font-size: 1.57em; -} + #aside-content .card-info .author-info__description { margin-top: -0.3rem; @@ -10230,15 +10220,6 @@ div#author-info__sayhi:hover { color: var(--heo-fontcolor); } -#aside-content .card-info .author-info__name { - text-align: left; - font-weight: bold; - color: var(--heo-white); - font-size: 28px; - line-height: 1.1; - margin-top: 0.8rem; - margin-bottom: 0.4rem; -} /* 作者卡片背景 */ #aside-content > .card-widget:first-child { @@ -10417,62 +10398,7 @@ div#author-info__sayhi:hover { } } -/* 社交按钮 */ -#aside-content .card-info #card-info-btn { - display: none; -} -#aside-content .card-info .card-info-social-icons { - margin: 0; - padding-top: 10px; - display: flex; - justify-content: flex-start; - flex-direction: row; - flex-wrap: wrap; - cursor: pointer; - position: absolute; - bottom: 1rem; - left: 1rem; -} - -#aside-content .card-info .card-info-social-icons .social-icon { - margin: 0; - margin-right: 8px; -} - -#aside-content .card-info .card-info-social-icons i { - background: var(--heo-white-op); - color: var(--heo-white); - font-size: 1.2rem; - width: 40px; - height: 40px; - display: flex; - align-items: center; -} - -#aside-content .card-info .card-info-social-icons i:hover { - background: var(--heo-secondbg); - transform: scale(0.97); - color: var(--heo-main); - box-shadow: none; -} - -#aside-content .card-info .banner-button { - height: 40px; - width: 124px; - border-radius: 20px; - justify-content: center; -} - -@media screen and (min-width: 1300px) { - #aside-content .card-info .card-info-social-icons i { - color: var(--heo-white); - } - - [data-theme=dark] #aside-content .card-info .card-info-social-icons i { - color: var(--heo-white); - } -} #aside-content .card-info .card-info-data > .card-info-data-item:hover { background: var(--heo-post-blockquote-bg); diff --git a/templates/modules/head.html b/templates/modules/head.html index c5b19d66..62a2e8dd 100644 --- a/templates/modules/head.html +++ b/templates/modules/head.html @@ -201,6 +201,7 @@ isMusic: [[${ htmlType == 'music'}]], helloText: [[${#strings.listSplit(theme.config.sidebar.profile.helloText, ',')}]], assetsLink: [[${assets_link}]], + profileStyle: [[${theme.config.sidebar.profile.profileStyle}]], source: { links:{ randomfriendurl: [[${theme.config.link.randomfriendurl}]], diff --git a/templates/modules/post/copyright/copyright-default.html b/templates/modules/post/copyright/copyright-default.html index 0fdc2188..76274a48 100644 --- a/templates/modules/post/copyright/copyright-default.html +++ b/templates/modules/post/copyright/copyright-default.html @@ -42,7 +42,7 @@ -
+
-
+
-
+ diff --git a/templates/modules/post/copyright/copyright-one.html b/templates/modules/post/copyright/copyright-one.html index a1d836ac..e22d99d4 100644 --- a/templates/modules/post/copyright/copyright-one.html +++ b/templates/modules/post/copyright/copyright-one.html @@ -7,51 +7,72 @@
+ th:src="@{${#strings.isEmpty(site.logo) ? assets_link + '/images/hao-logo.jpg' : site.logo}}">
[[${site.title}]]
[[${theme.config.post.desc}]]
-
-
打赏作者
-
-
+
+
订阅
+
+
+ + +
-
订阅
-
+
diff --git a/templates/modules/widgets/aside/friend-link.html b/templates/modules/widgets/aside/friend-link.html index bc7e84d8..a09a67a5 100644 --- a/templates/modules/widgets/aside/friend-link.html +++ b/templates/modules/widgets/aside/friend-link.html @@ -1,6 +1,6 @@ - +
通讯录
diff --git a/templates/modules/widgets/aside/profile.html b/templates/modules/widgets/aside/profile.html index c2919fa1..705031c6 100644 --- a/templates/modules/widgets/aside/profile.html +++ b/templates/modules/widgets/aside/profile.html @@ -3,45 +3,411 @@
- -
-
-
-
你好啊！我是
- -
-
-
-
+ + + +
+
+
+
你好啊！我是 +
+ +
+
+
+
+ +
-
- - + + -
+
+ + +
+ + + + + + + + + + +
+
+
+
你好啊！ +
+
+
+
avatar +
avatar
+
+
+
+
+ +
[[${theme.config.sidebar.profile.profileName}]]
+
[[${theme.config.sidebar.profile.desc}]]
+ +
+ +
+
+
+ + + + + + + - -
\ No newline at end of file