github
/
halo-theme-hao
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #292 from chengzhongxue/main 

版本号改为1.2.0
This commit is contained in:
困困鱼 2023-07-15 18:14:59 +08:00 committed by GitHub
parent 88e672b44e 46ccf401ae
commit 8935eb98b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "halo-theme-hao",
"version": "1.1.6",
"version": "1.2.0",
"dependencies": {
}
}

58
settings.yaml
View File

@ -107,6 +107,7 @@ spec:
bikan:
remen:
shiyong:
techStack:
children:
- $formkit: select
name: bannersBackground
@ -118,6 +119,22 @@ spec:
- label: 个人技术栈
value: techStack
help: 自定义技术栈需要在【个人】中配置
- $formkit: repeater
name: techStack
label: 个人技术栈
value: [ ]
children:
- $formkit: text
name: name
label: 名称
placeholder: 请输入名称
- $formkit: attachment
name: url
label: 路径
placeholder: 请输入图标路径
- $formkit: color
name: background
label: 背景色
- $formkit: textarea
name: bannersTitleBig
label: 大标题
@ -839,26 +856,29 @@ spec:
- $formkit: repeater
name: bdageitem
label: 徽标配置项
value: []
value:
- link: "https://halo.run/"
shields: "https://npm.elemecdn.com/hao-theme-static@1.2.0/templates/images/Frame-Halo-blue.svg"
message: "博客框架为halo2.x"
children:
- $formkit: url
name: link
label: 链接
placeholder: 请输入内容
value: "https://hexo.io/"
value: "https://halo.run/"
validation: required
- $formkit: attachment
name: shields
label: 徽标
placeholder: 请输入内容
validation: required
value: "https://npm.elemecdn.com/anzhiyu-blog@2.1.5/img/badge/Frame-Hexo.svg"
value: "https://npm.elemecdn.com/hao-theme-static@1.2.0/templates/images/Frame-Halo-blue.svg"
- $formkit: text
name: message
label: 徽标 title
placeholder: 请输入内容
validation: required
value: "博客框架为Hexo_v5.4.0"
value: "博客框架为halo2.x"
- group: post
@ -1097,7 +1117,7 @@ spec:
name: backgroundImg
validation: url
label: 图片
value: https://img.cdn.yzczi.com/img/64624940e3623.jpeg
value: https://npm.elemecdn.com/hao-theme-static@1.2.0/templates/images/64624940e3623.jpeg
placeholder: 请输入图片地址
- $formkit: text
name: smallTitle
@ -1188,23 +1208,6 @@ spec:
name: helloAbout
label: 我的问候
value: Hello there!
- $formkit: repeater
name: techStack
label: 个人技术栈
value: [ ]
children:
- $formkit: text
name: name
label: 名称
placeholder: 请输入名称
- $formkit: url
name: url
label: 路径
placeholder: 请输入图标路径
validation: url
- $formkit: color
name: background
label: 背景色
- $formkit: group
name: authorCareers
label: 职业生涯
@ -1329,7 +1332,7 @@ spec:
name: loading_bar
label: 爱好游戏logo
placeholder: 请输入内容
value: https://img.cdn.yzczi.com/img/64795eaece0fc.png
value: https://npm.elemecdn.com/hao-theme-static@1.2.0/templates/images/64795eaece0fc.png
- $formkit: group
name: game2
label: 爱好游戏 2
@ -1559,11 +1562,12 @@ spec:
- group: envelope_comment
label: 留言板
formSchema:
- $formkit: text
- $formkit: textarea
name: title
label: 标题
placeholder: 请输入内容
value: 留言板
value: <div align="center">留言板</div>
help: 支持 HTML 语法
- $formkit: group
name: custom_pic
label: 信笺图片
@ -1759,25 +1763,21 @@ spec:
value: false
- $formkit: text
name: id
if: $get(nav_musicEnable).value
label: 音乐的id
help: 歌单的id，可以从音乐歌单分享的链接中获取
value: "8668419170"
- $formkit: text
name: server
if: $get(nav_musicEnable).value
label: 服务
help: 歌单的服务商，例如netease（网易云音乐）,tencent（腾讯）,kugou（酷狗）,xiami（小米音乐）,baidu（百度音乐）
value: "tencent"
- $formkit: url
name: all_playlist
if: $get(nav_musicEnable).value
label: 播放列表地址
help: 用于右键查看所有歌曲
value: https://y.qq.com/n/ryqq/playlist/8668419170
- $formkit: url
name: meting_api
if: $get(nav_musicEnable).value
label: 音乐图片api
value: https://api.i-meto.com/meting/api?server=:server&type=:type&id=:id&r=:r
- $formkit: group

4
templates/comments.html
View File

@ -12,7 +12,9 @@
</header>
<main class="layout hide-aside" id="content-inner">
<div id="page">
<h1 >[[${theme.config.envelope_comment.title}]]</h1>
<th:block th:if="${not #strings.isEmpty(theme.config.envelope_comment.title)}"
th:utext="${theme.config.envelope_comment.title}">
</th:block>
<div id="article-container">
<style>
@media screen and (max-width:600px) {

84
templates/modules/widgets/about-widgets/authorCareers.html
View File

@ -13,51 +13,51 @@
<div class="tags-group-all">
<!-- banners 使用默认值-->
<div class="tags-group-wrapper"
th:if="${#strings.equals(theme.config.top.bannersBackground, 'default')}">
th:if="${#strings.equals(theme.config.top.BannerLeft.bannersBackground, 'default')}">
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#989bf8">
<img th:src="${assets_link + '/images/icons/AfterEffect.png'}"
title="AfterEffect">
title="AfterEffect">
</div>
<div class="tags-group-icon" style="background:#fff">
<img th:src="${assets_link + '/images/icons/Sketch.png'}"
title="Sketch">
title="Sketch">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#57b6e6">
<img th:src="${assets_link + '/images/icons/Docker.png'}"
title="Docker">
title="Docker">
</div>
<div class="tags-group-icon" style="background:#4082c3">
<img th:src="${assets_link + '/images/icons/Photoshop.png'}"
title="Photoshop">
title="Photoshop">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#fff">
<img th:src="${assets_link + '/images/icons/FinalCutPro.png'}"
title="FinalCutPro">
title="FinalCutPro">
</div>
<div class="tags-group-icon" style="background:#fff">
<img th:src="${assets_link + '/images/icons/Python.png'}"
title="Python">
title="Python">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#eb6840">
<img th:src="${assets_link + '/images/icons/Swift.png'}"
title="Swift">
title="Swift">
</div>
<div class="tags-group-icon" style="background:#8f55ba">
<img th:src="${assets_link + '/images/icons/Principle.png'}"
title="Principle">
title="Principle">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#f29e39">
<img th:src="${assets_link + '/images/icons/illustrator.png'}"
title="illustrator">
title="illustrator">
</div>
<div class="tags-group-icon" style="background:#2c51db">
<img th:src="${assets_link + '/images/icons/CSS3.png'}" title="CSS3">
@ -77,53 +77,53 @@
</div>
<div class="tags-group-icon" style="background:#e65164">
<img th:src="${assets_link + '/images/icons/Apifox.webp'}"
title="Apifox">
title="Apifox">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#989bf8">
<img th:src="${assets_link + '/images/icons/AfterEffect.png'}"
title="AfterEffect">
title="AfterEffect">
</div>
<div class="tags-group-icon" style="background:#fff">
<img th:src="${assets_link + '/images/icons/Sketch.png'}"
title="Sketch">
title="Sketch">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#57b6e6">
<img th:src="${assets_link + '/images/icons/Docker.png'}"
title="Docker">
title="Docker">
</div>
<div class="tags-group-icon" style="background:#4082c3">
<img th:src="${assets_link + '/images/icons/Photoshop.png'}"
title="Photoshop">
title="Photoshop">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#fff">
<img th:src="${assets_link + '/images/icons/FinalCutPro.png'}"
title="FinalCutPro">
title="FinalCutPro">
</div>
<div class="tags-group-icon" style="background:#fff">
<img th:src="${assets_link + '/images/icons/Python.png'}"
title="Python">
title="Python">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#eb6840">
<img th:src="${assets_link + '/images/icons/Swift.png'}"
title="Swift">
title="Swift">
</div>
<div class="tags-group-icon" style="background:#8f55ba">
<img th:src="${assets_link + '/images/icons/Principle.png'}"
title="Principle">
title="Principle">
</div>
</div>
<div class="tags-group-icon-pair">
<div class="tags-group-icon" style="background:#f29e39">
<img th:src="${assets_link + '/images/icons/illustrator.png'}"
title="illustrator">
title="illustrator">
</div>
<div class="tags-group-icon" style="background:#2c51db">
<img th:src="${assets_link + '/images/icons/CSS3.png'}" title="CSS3">
@ -143,29 +143,29 @@
</div>
<div class="tags-group-icon" style="background:#e65164">
<img th:src="${assets_link + '/images/icons/Apifox.webp'}"
title="Apifox">
title="Apifox">
</div>
</div>
</div>
<!-- banners 使用默认值-->
<div class="tags-group-wrapper"
th:if="${#strings.equals(theme.config.top.bannersBackground, 'techStack')}"
th:with="techs = ${theme.config.about.techStack}">
th:if="${#strings.equals(theme.config.top.BannerLeft.bannersBackground, 'techStack')}"
th:with="techs = ${theme.config.top.BannerLeft.techStack}">
<th:block th:each="tech,iterStat : ${techs}">
<div class="tags-group-icon-pair" th:if="${iterStat.odd}">
<div class="tags-group-icon"
th:style="'background:' + ${techOdd.background}"
th:with="techOdd = ${techs.get(iterStat.index - 1)}">
th:style="'background:' + ${techOdd.background}"
th:with="techOdd = ${techs.get(iterStat.index - 1)}">
<img th:src="@{${techOdd.url}}"
th:title="${techOdd.name}">
th:title="${techOdd.name}">
</div>
<div class="tags-group-icon"
th:style="'background:' + ${techEven.background}"
th:with="techEven = ${tech}">
th:style="'background:' + ${techEven.background}"
th:with="techEven = ${tech}">
<img th:src="@{${techEven.url}}"
th:title="${techEven.name}">
th:title="${techEven.name}">
</div>
</div>
</th:block>
@ -176,13 +176,13 @@
<!-- banners 使用默认值-->
<div class="skills-list"
th:if="${#strings.equals(theme.config.top.bannersBackground, 'default')}"
th:with="techs = ${theme.config.about.techStack}">
th:if="${#strings.equals(theme.config.top.BannerLeft.bannersBackground, 'default')}"
th:with="techs = ${theme.config.top.BannerLeft.techStack}">
<div class="skill-info">
<div class="skill-icon" style="background:#989bf8">
<img th:src="${assets_link + '/images/icons/AfterEffect.png'}"
title="AfterEffect">
title="AfterEffect">
</div>
<div class="skill-name"><span>AfterEffect</span></div>
</div>
@ -211,7 +211,7 @@
<div class="skill-info">
<div class="skill-icon" style="background:#ffffff">
<img th:src="${assets_link + '/images/icons/FinalCutPro.png'}"
title="FinalCutPro">
title="FinalCutPro">
</div>
<div class="skill-name"><span>FinalCutPro</span></div>
</div>
@ -240,7 +240,7 @@
<div class="skill-info">
<div class="skill-icon" style="background:#f29e39">
<img th:src="${assets_link + '/images/icons/illustrator.png'}"
title="illustrator">
title="illustrator">
</div>
<div class="skill-name"><span>illustrator</span></div>
</div>
@ -283,14 +283,16 @@
<div class="etc">...</div>
</div>
<div class="skills-list"
th:if="${#strings.equals(theme.config.top.bannersBackground, 'techStack')}"
th:with="techs = ${theme.config.about.techStack}">
th:if="${#strings.equals(theme.config.top.BannerLeft.bannersBackground, 'techStack')}"
th:with="techs = ${theme.config.top.BannerLeft.techStack}">
<th:block th:each="tech : ${techs}">
<div class="skill-info">
<div class="skill-icon" th:style="'background:' + ${tech.background}">
<img th:src="@{${tech.url}}" th:title="${tech.name}">
</div>
<div class="skill-name"><span th:title="${tech.name}"></span></div>
<div class="skill-name">
<span>[[${tech.name}]]</span>
</div>
</div>
</th:block>
</div>
@ -302,17 +304,17 @@
<div class="card-content">
<div class="author-content-item-tips">生涯</div>
<span class="author-content-item-title"
th:text="${theme.config.about.authorCareers.authorCareersTitle}">无限进步</span>
th:text="${theme.config.about.authorCareers.authorCareersTitle}">无限进步</span>
<div class="careers-group"
th:if="${not #lists.isEmpty(theme.config.about.authorCareers.authorCareersTags)}"
th:with="careersTags = ${theme.config.about.authorCareers.authorCareersTags}">
th:if="${not #lists.isEmpty(theme.config.about.authorCareers.authorCareersTags)}"
th:with="careersTags = ${theme.config.about.authorCareers.authorCareersTags}">
<div class="careers-item" th:each="tag : ${careersTags}">
<div class="circle" th:style="'background:' + ${tag.background}"></div>
<div class="name" th:text="${tag.desc}"></div>
</div>
</div>
<img alt="生涯" class="author-content-img"
th:src="@{${#strings.isEmpty(theme.config.about.authorCareers.authorCareersBackground) ? assets_link + '/images/hao-logo.jpg' : theme.config.about.authorCareers.authorCareersBackground}}">
th:src="@{${#strings.isEmpty(theme.config.about.authorCareers.authorCareersBackground) ? assets_link + '/images/hao-logo.jpg' : theme.config.about.authorCareers.authorCareersBackground}}">
</div>
</div>
</div>

2
templates/modules/widgets/banner-group.html
View File

@ -134,7 +134,7 @@
<!-- banners 使用默认值-->
<div class="tags-group-wrapper"
th:if="${#strings.equals(theme.config.top.BannerLeft.bannersBackground, 'techStack')}"
th:with="techs = ${theme.config.about.techStack}">
th:with="techs = ${theme.config.top.BannerLeft.techStack}">
<th:block th:each="tech,iterStat : ${techs}">
<div class="tags-group-icon-pair" th:if="${iterStat.odd}">
<div class="tags-group-icon"

4
theme.yaml
View File

@ -35,5 +35,5 @@ spec:
repo: https://github.com/liuzhihang/halo-theme-hao
settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap"
version: "1.1.5"
require: ">=2.0.0"
version: "1.2.0"
require: ">=2.6.0"