Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
1152958806@qq.com 2023-09-27 13:46:27 +08:00
commit d05a198faf
6 changed files with 33 additions and 240 deletions

View File

@ -631,84 +631,15 @@ spec:
max: 2
value: [ ]
children:
- $formkit: select
- $formkit: text
name: icon
label: 图标
options:
- label: 电子邮箱
value: hao-icon-envelope
- label: 微信
value: hao-icon-weixin
- label: 公众号
value: hao-icon-weixingongzhonghao
- label: rss
value: hao-icon-rss
- label: 腾讯 QQ
value: hao-icon-qq
- label: 新浪微博
value: hao-icon-weibo
- label: 知乎
value: hao-icon-29
- label: 豆瓣
value: hao-icon-douban
- label: 哔哩哔哩
value: hao-icon-bilibili
- label: GitHub
value: hao-icon-github
- label: GitLab
value: hao-icon-gitlab
- label: 百度
value: hao-icon-baidu
- label: 掘金
value: hao-icon-juejin
- label: 语雀
value: hao-icon-yuque
- label: 博客园
value: hao-icon-cnblogs
- label: CSDN
value: hao-icon-csdn
- label: LeetCode
value: hao-icon-leetcode
- label: 头条
value: hao-icon-toutiao
- label: 抖音 / TikTok
value: hao-icon-tiktok
- label: Telegram
value: hao-icon-telegram
- label: Facebook
value: hao-icon-facebook1
- label: Instagram
value: hao-icon-Instagram
- label: LinkedIn
value: hao-icon-linkedin
- label: Twitter
value: hao-icon-dove
- label: Slack
value: hao-icon-slack
- label: Discord
value: hao-icon-discord-line
- label: YouTube
value: hao-icon-youtube
- label: Steam
value: hao-icon-steam
- label: Dribbble
value: hao-icon-dribbble
- $formkit: text
name: name
label: 名称
- $formkit: url
name: url
label: 链接
- $formkit: radio
name: urlType
label: 链接类型
value: normal
help: 如果选择了图片类型,那么在访客点击之后会使用弹框的形式加载
options:
- label: 跳转链接
value: normal
- label: 图片
value: image
- $formkit: group
name: wechat
label: 公众号
@ -953,167 +884,29 @@ spec:
label: 左侧
value: [ ]
children:
- $formkit: select
- $formkit: text
name: icon
label: 图标
options:
- label: 电子邮箱
value: hao-icon-envelope
- label: 微信
value: hao-icon-weixin
- label: 公众号
value: hao-icon-weixingongzhonghao
- label: rss
value: hao-icon-rss
- label: 腾讯 QQ
value: hao-icon-qq
- label: 新浪微博
value: hao-icon-weibo
- label: 知乎
value: hao-icon-29
- label: 豆瓣
value: hao-icon-douban
- label: 哔哩哔哩
value: hao-icon-bilibili
- label: GitHub
value: hao-icon-github
- label: GitLab
value: hao-icon-gitlab
- label: 百度
value: hao-icon-baidu
- label: 掘金
value: hao-icon-juejin
- label: 语雀
value: hao-icon-yuque
- label: 博客园
value: hao-icon-cnblogs
- label: CSDN
value: hao-icon-csdn
- label: LeetCode
value: hao-icon-leetcode
- label: 头条
value: hao-icon-toutiao
- label: 抖音 / TikTok
value: hao-icon-tiktok
- label: Telegram
value: hao-icon-telegram
- label: Facebook
value: hao-icon-facebook1
- label: Instagram
value: hao-icon-Instagram
- label: LinkedIn
value: hao-icon-linkedin
- label: Twitter
value: hao-icon-dove
- label: Slack
value: hao-icon-slack
- label: Discord
value: hao-icon-discord-line
- label: YouTube
value: hao-icon-youtube
- label: Steam
value: hao-icon-steam
- label: Dribbble
value: hao-icon-dribbble
- $formkit: text
name: name
label: 名称
- $formkit: text
name: url
label: 链接
- $formkit: radio
name: urlType
label: 链接类型
value: normal
help: 如果选择了图片类型,那么在访客点击之后会使用弹框的形式加载
options:
- label: 跳转链接
value: normal
- label: 图片
value: image
- $formkit: repeater
name: socialMediaRight
label: 右侧
value: [ ]
children:
- $formkit: select
- $formkit: text
name: icon
label: 图标
options:
- label: 电子邮箱
value: hao-icon-envelope
- label: 微信
value: hao-icon-weixin
- label: 公众号
value: hao-icon-weixingongzhonghao
- label: rss
value: hao-icon-rss
- label: 腾讯 QQ
value: hao-icon-qq
- label: 新浪微博
value: hao-icon-weibo
- label: 知乎
value: hao-icon-29
- label: 豆瓣
value: hao-icon-douban
- label: 哔哩哔哩
value: hao-icon-bilibili
- label: GitHub
value: hao-icon-github
- label: GitLab
value: hao-icon-gitlab
- label: 百度
value: hao-icon-baidu
- label: 掘金
value: hao-icon-juejin
- label: 语雀
value: hao-icon-yuque
- label: 博客园
value: hao-icon-cnblogs
- label: CSDN
value: hao-icon-csdn
- label: LeetCode
value: hao-icon-leetcode
- label: 头条
value: hao-icon-toutiao
- label: 抖音 / TikTok
value: hao-icon-tiktok
- label: Telegram
value: hao-icon-telegram
- label: Facebook
value: hao-icon-facebook1
- label: Instagram
value: hao-icon-Instagram
- label: LinkedIn
value: hao-icon-linkedin
- label: Twitter
value: hao-icon-dove
- label: Slack
value: hao-icon-slack
- label: Discord
value: hao-icon-discord-line
- label: YouTube
value: hao-icon-youtube
- label: Steam
value: hao-icon-steam
- label: Dribbble
value: hao-icon-dribbble
- $formkit: text
name: name
label: 名称
- $formkit: text
name: url
label: 链接
- $formkit: radio
name: urlType
label: 链接类型
value: normal
help: 如果选择了图片类型,那么在访客点击之后会使用弹框的形式加载
options:
- label: 跳转链接
value: normal
- label: 图片
value: image
- $formkit: menuRadio
name: menu
label: 相关链接

View File

@ -16614,29 +16614,6 @@ span.hexo-douban-pagenum {
}
@media screen and (max-width: 867px) {
#console .close-btn {
display:none
}
#console .console-card-group {
display: none
}
#consoleHideAside {
display: none
}
.console-card-group-reward .reward-all .reward-item img {
width: 130px;
height: 130px
}
#console #consoleKeyboard {
display: none
}
}
#console .console-card {
background: var(--heo-maskbg);
border-radius: 12px;
@ -16954,6 +16931,29 @@ span.hexo-douban-pagenum {
margin: .625rem;
}
@media screen and (max-width: 867px) {
#console .close-btn {
display:none
}
#console .console-card-group {
display: none
}
#consoleHideAside {
display: none
}
.console-card-group-reward .reward-all .reward-item img {
width: 130px;
height: 130px
}
#console #consoleKeyboard {
display: none
}
}
/* 快捷键窗口 */

View File

@ -14,7 +14,7 @@
<th:block th:with="socialMedias = ${theme.config.footer.social_media.socialMediaLeft}">
<a class="deal_link" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
th:href="${socialMedia.url}" th:title="${socialMedia.name}">
<i class="haofont " th:classappend="${socialMedia.icon}"></i>
<i th:class="${socialMedia.icon}"></i>
</a>
</th:block>
@ -24,7 +24,7 @@
<th:block th:with="socialMedias = ${theme.config.footer.social_media.socialMediaRight}">
<a class="deal_link" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
th:href="${socialMedia.url}" th:title="${socialMedia.name}">
<i class="haofont " th:classappend="${socialMedia.icon}"></i>
<i th:class="${socialMedia.icon}"></i>
</a>
</th:block>
</div>

View File

@ -42,7 +42,7 @@
<a class="social-icon" rel="external nofollow" target="_blank" th:each="socialMedia : ${socialMedias}"
th:href="${socialMedia.url}" th:title="${socialMedia.name}">
<i class="haofont " th:classappend="${socialMedia.icon}"></i>
<i th:class="${socialMedia.icon}"></i>
</a>
</div>
@ -171,7 +171,7 @@
<a class="social-icon" rel="external nofollow" target="_blank"
th:each="socialMedia : ${socialMedias}" th:href="${socialMedia.url}"
th:title="${socialMedia.name}">
<i class="haofont " th:classappend="${socialMedia.icon}"></i>
<i th:class="${socialMedia.icon}"></i>
</a>
</div>
</div>

View File

@ -20,7 +20,7 @@
buttonTitle = ${theme.config.moment.buttonTitle})}" ></div>
<div id="bber">
<section class="timeline page-1">
<ul class="list" id="waterfall">
<ul class="list" id="waterfall" th:with="moments = ${momentFinder.list(1, 30)}">
<li class="item" th:each="moment : ${moments.items}"
th:with="content=${moment.spec.content}">
<div class="bber-content">
@ -57,11 +57,11 @@
</a>
</div>
</li>
</ul>
</section>
<!-- 分页还没写 -->
</div>
<div id="bber-tips" style="color: var(--heo-secondtext);">- 只展示最近30条短文 -</div>
<script>heo.reflashEssayWaterFall();</script>
<hr/>
<!--/* 评论组件 */-->

View File

@ -106,7 +106,7 @@
<span class="post-meta-commentcount" sec:authorize="isAuthenticated()"
data-flag-title="编辑文章"
title="编辑文章"
th:attr="onclick='javascript:window.open(\''+ '/console/posts/editor?name='+${post.metadata.name}+'&returnToView=true' +'\')'">
th:attr="onclick='javascript:window.open(\''+ '/console/posts/editor?name='+${post.metadata.name}+'&returnToView=true\''+ ',' +'\'_self'+'\')'">
<i style="margin-top: 2px;" class="haofont hao-icon-bianji post-meta-icon"></i>
<span>编辑</span>
</span>