From b8b198655538bb523fb7f034ceed7efc3b36f77d Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Tue, 5 Sep 2023 23:58:20 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/assets/js/main.js | 2 +- templates/modules/head.html | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/templates/assets/js/main.js b/templates/assets/js/main.js index fd42b62e..3a841f49 100644 --- a/templates/assets/js/main.js +++ b/templates/assets/js/main.js @@ -418,7 +418,7 @@ document.addEventListener('DOMContentLoaded', function () { const addPostOutdateNotice = function () { const data = GLOBAL_CONFIG.noticeOutdate - const diffDay = btf.diffDate(GLOBAL_CONFIG_SITE.postUpdate) + const diffDay = btf.diffDate("2022-11-04 20:08:15") if (diffDay >= data.limitDay) { const ele = document.createElement('div') ele.className = 'post-outdate-notice' diff --git a/templates/modules/head.html b/templates/modules/head.html index 4255a81a..292633fa 100644 --- a/templates/modules/head.html +++ b/templates/modules/head.html @@ -178,22 +178,17 @@ // 页面类型 index,page,post,tag,category htmlType: [[${ htmlType }]], postTitle: [[${ htmlType == 'post' ? post.spec.title : htmlType == 'page' ? singlePage.spec.title : ''}]], - isanchor: true, isPost: [[${htmlType == 'post'}]], isHome: [[${ htmlType == 'index'}]], - isHighlightShrink: false, - postUpdate: '2022-11-04 20:08:15', copyright: undefined, lightbox: 'fancybox', lazyload: {enable: [[${theme.config.other.vanillaLazyload.enable}]], error: [[@{${theme.config.other.vanillaLazyload.errorImg}}]] }, isFriendLinksInFooter: [[${theme.config.footer.footer_group.enable_footer_group}]], loadingBox: [[${theme.config.other.loadingBoxs.loadingBoxEnable}]], loadProgressBar: [[${theme.config.other.loadingBoxs.loadProgressBar}]], - allPlaylist: [[${theme.config.tool.nav_music.all_playlist}]], navMusicEnable:[[${theme.config.tool.nav_music.nav_musicEnable}]], isMusic: [[${ htmlType == 'music'}]], helloText: [[${#strings.listSplit(theme.config.sidebar.profile.helloText, ',')}]], - assetsLink: [[${assets_link}]], profileStyle: [[${theme.config.sidebar.profile.profileStyle}]], rightMenuEnable: [[${theme.config.tool.rightMenu.rightMenuEnable}]], source: { From f4dd2232dc00b22cab7fa479de451036941f3b76 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <17683872107czx> Date: Wed, 6 Sep 2023 11:31:05 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BA=86=E8=A7=A3=E6=9B=B4=E5=A4=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 44 ++++++++++++++++++- templates/assets/zhheo/zhheoblog.css | 56 +++++++++++++++++------- templates/modules/footer.html | 65 +++++++++++++++------------- 3 files changed, 119 insertions(+), 46 deletions(-) diff --git a/settings.yaml b/settings.yaml index c4463823..0782d8b0 100644 --- a/settings.yaml +++ b/settings.yaml @@ -875,6 +875,33 @@ spec: - group: footer label: 页脚 formSchema: + - $formkit: group + name: footer_bar + label: 了解更多 + value: + footer_bar_enable: false + logo: "困困鱼" + description: "来自 困困鱼 最新设计与科技的文章" + children: + - $formkit: radio + name: footer_bar_enable + id: footer_bar_enable + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: textarea + if: $get(footer_bar_enable).value + name: logo + label: logo + placeholder: + help: 支持 HTML 语法 + - $formkit: textarea + if: $get(footer_bar_enable).value + name: description + label: 描述 + placeholder: 请填写描述内容 - $formkit: group name: social_media label: 社交媒体 @@ -1079,6 +1106,7 @@ spec: name: footerContent label: 页脚内容 value: + default_enable: true style_one: owner_enable: false runtime_enable: true @@ -1086,11 +1114,11 @@ spec: work_description: "距离月入25k也就还差一个大佬带我~" offduty_img: "https://0206.ink/upload/%E5%9B%B0%E5%9B%B0%E9%B1%BC-%E4%B8%8B%E7%8F%AD%E5%95%A6-yellowgreen.svg" offduty_description: "下班了就该开开心心的玩耍，嘿嘿~" + bdageitem_enable: false bdageitem: - link: "https://halo.run/" shields: "https://npm.elemecdn.com/hao-theme-static@1.2.0/templates/images/Frame-Halo-blue.svg" message: "博客框架为halo2.x" - default_enable: true children: - $formkit: radio name: default_enable @@ -1124,27 +1152,41 @@ spec: value: false - $formkit: attachment if: $get(runtime_enable).value + key: work_img name: work_img label: 上班时间的徽标 placeholder: 请输入内容 - $formkit: text if: $get(runtime_enable).value + key: work_description name: work_description label: 上班时间的 title 描述 placeholder: 请输入内容 - $formkit: attachment if: $get(runtime_enable).value + key: offduty_img name: offduty_img label: 下班时间的徽标 placeholder: 请输入内容 - $formkit: text if: $get(runtime_enable).value + key: offduty_description name: offduty_description label: 下班时间的 title 描述 placeholder: 请输入内容 + - $formkit: radio + name: bdageitem_enable + id: bdageitem_enable + label: 徽标配置项 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false - $formkit: repeater name: bdageitem label: 徽标配置项 + if: $get(bdageitem_enable).value value: children: - $formkit: url diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css index 02ad355d..ff785f12 100644 --- a/templates/assets/zhheo/zhheoblog.css +++ b/templates/assets/zhheo/zhheoblog.css @@ -11601,12 +11601,6 @@ a.reward-main-btn:hover { margin: auto; height: 100%; } - - #pagination .prev-post a:hover, - #pagination .next-post a:hover { - background: var(--heo-main); - } - #pagination .prev-post a:hover div, #pagination .next-post a:hover div { color: var(--heo-white) !important; @@ -11693,13 +11687,6 @@ a.reward-main-btn:hover { #pagination .next_info { text-align: left; } - - .next-post.pull-right, - .prev-post.pull-left, - #pagination .prev-post, - #pagination .next-post { - background: var(--heo-card-bg); - } } /* 翻页 */ @@ -12157,8 +12144,9 @@ img.tk-avatar-img { @media screen and (max-width: 768px) { .el-textarea__inner { - border-radius: 4px !important; background: var(--card-bg) !important; + overflow: hidden; + resize: none!important; } } @@ -13717,7 +13705,6 @@ figure.gallery-group:hover .gallery-group-name::after { #workboard { font-size: 12px; } -/*页脚样式一*/ /* 页脚底层背景 */ #footer:before { @@ -13728,8 +13715,45 @@ figure.gallery-group:hover .gallery-group-name::after { z-index: -1; } -/* 404页面 */ +div#heo-footer-bar { + display: none +} + +.post div#heo-footer-bar { + display: flex; + flex-direction: column; + align-items: center; + margin-top: 16px +} + +div#heo-footer-bar a.footer-bar-link { + padding: 4px 16px; + background: var(--heo-secondbg); + border-radius: 20px; + margin-top: 8px; + font-size: 14px; + cursor: pointer; + border: var(--style-border-always) +} + +div#heo-footer-bar a.footer-bar-link:hover { + background: var(--heo-main); + color: var(--heo-white); + transform: scale(1.1); + border-color: var(--heo-main) +} + +div#heo-footer-bar .footer-logo { + font-size: 24px +} + +div#heo-footer-bar .footer-bar-description { + color: var(--heo-secondtext); + font-weight: 700 +} + +/* 404页面 */ #error-wrap .error-content { box-shadow: none !important; border-radius: 12px; diff --git a/templates/modules/footer.html b/templates/modules/footer.html index 641ddea1..9e2f5421 100644 --- a/templates/modules/footer.html +++ b/templates/modules/footer.html @@ -3,6 +3,12 @@