Skip to content

Commit

Permalink
Merge pull request #50 from jiewenhuang/dev
Browse files Browse the repository at this point in the history
update:v1.0.7
  • Loading branch information
jiewenhuang committed Aug 27, 2023
2 parents 4047dc6 + 2b5377c commit 59a8ed7
Show file tree
Hide file tree
Showing 24 changed files with 430 additions and 87 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "halo-theme-joe3.0",
"version": "1.0.6",
"version": "1.0.7",
"description": "Theme of Halo2",
"devDependencies": {
"uglify-js": "^3.17.4"
Expand Down
68 changes: 67 additions & 1 deletion settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,19 @@ spec:
label: 开启
- value: false
label: 关闭
- $formkit: radio
name: option_social_data
id: option_social_data
label: 社交信息来源
value: "default"
help: "是否在移动端展示社交账号,默认关闭"
options:
- value: default
label: 默认
- value: custom
label: 自定义
- $formkit: repeater
if: "$get(option_social_data).value === 'default'"
name: socials
id: socials
key: socials
Expand Down Expand Up @@ -912,14 +924,58 @@ spec:
value: qq
- label: 微博
value: weibo
- label: 豆瓣
value: douban
- label: 抖音 / TikTok
value: tiktok
- label: Facebook
value: facebook
- label: Instagram
value: instagram
- label: LinkedIn
value: linkedin
- label: Twitter
value: twitter
- label: Slack
value: slack
- label: Discord
value: discord
- label: YouTube
value: youtube
- label: Steam
value: steam
- label: GitLab
value: gitlab
- $formkit: text
name: socialUrl
label: 链接
help: "邮箱填邮箱号,QQ填QQ号,其他填跳转链接"
validation: "required"
- $formkit: repeater
if: "$get(option_social_data).value === 'custom'"
name: custom_socials
id: custom_socials
key: custom_socials
label: 自定义社交信息
children:
- $formkit: text
name: socials_name
label: 名称
validation: "required"
- $formkit: url
name: socials_url
label: 跳转链接
validation: "required"
- $formkit: text
name: socials_icon
label: svg代码或者图片(如果使用图片请输入完整img标签)
validation: "required"


- $formkit: radio
name: enable_weather
id: enable_weather
label: 展示博主信息
label: 展示天气信息
value: false
help: "是否展示简约版天气信息,必须配置正确的appKey后才可生效"
options:
Expand Down Expand Up @@ -1434,6 +1490,11 @@ spec:
label:
- value: false
label:
- $formkit: text
name: post_author_link
label: 文章页作者跳转链接
value: ""
help: "留空则不跳转"


- $formkit: radio
Expand Down Expand Up @@ -2301,6 +2362,11 @@ spec:
label: 开启
- value: false
label: 关闭
- $formkit: text
name: baidu_token
label: 百度推送Token
value: ""
help: "文章页未收录时会自动将当前链接推送给百度加快收录,Token在百度收录平台注册账号获取(必须启用“检查百度收录”并填入token才生效),https://ziyuan.baidu.com/linksubmit"
- $formkit: select
name: enable_console_theme
label: 控制台输出主题信息
Expand Down
5 changes: 5 additions & 0 deletions templates/assets/css/global.less
Original file line number Diff line number Diff line change
Expand Up @@ -5974,9 +5974,14 @@ body {

.joe_comment_box {
text-align: revert;
.box_title{
text-align: center;

}

h2 {
display: inline-block;
text-align: center !important;
padding: 28px 110px;
font-size: 18px;
color: var(--routine);
Expand Down
2 changes: 1 addition & 1 deletion templates/assets/css/min/global.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion templates/assets/js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ const commonContext = {
} else {
htmlStr = `
<div class="joe_pdf">
<iframe src="/themes/theme-Joe3/assets/lib/pdfjs/web/viewer.html?file=${options.src}" style="width:${options.width};height:${options.height}"></iframe>
<iframe src="${ThemeConfig.blog_url}/themes/theme-Joe3/assets/lib/pdfjs/web/viewer.html?file=${options.src}" style="width:${options.width};height:${options.height}"></iframe>
</div>`;
}
$(item).replaceWith(htmlStr);
Expand Down
2 changes: 1 addition & 1 deletion templates/assets/js/min/common.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion templates/assets/js/min/photos.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 59a8ed7

Please sign in to comment.