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

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

This commit is contained in:
1152958806@qq.com 2023-09-11 11:11:41 +08:00
parent f3fb63ce09 fa6db8bc71
commit 2a91376fed
11 changed files with 141 additions and 54 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.3.5",
"version": "1.3.6",
"dependencies": {
}
}

5
templates/assets/css/post-copyright.css
View File

@ -16,12 +16,13 @@
position: absolute;
right: 22px;
top: -77px;
content: "\f25e";
content: "\e668";
font-family: "haofont" !important;
font-size: 180px;
font-family: "Font Awesome 5 Brands";
color: var(--heo-fontcolor);
opacity: 0.1;
filter: blur(7px);
/*filter: blur(7px);*/
}
@media screen and (max-width: 768px) {

15
templates/assets/js/main.js
View File

@ -159,6 +159,10 @@ document.addEventListener('DOMContentLoaded', function () {
// 没有 toc 目录，则直接移除
if (headers.length === 0) {
document.getElementById("card-toc").remove();
const $mobileTocButton = document.getElementById("mobile-toc-button")
if($mobileTocButton){
$('#mobile-toc-button').attr('style', 'display: none');
}
} else {
tocbot.init({
tocSelector: '.toc-content',
@ -218,7 +222,15 @@ document.addEventListener('DOMContentLoaded', function () {
? saveToLocal.set('aside-status', 'show', 2)
: saveToLocal.set('aside-status', 'hide', 2)
$htmlDom.toggle('hide-aside')
},
runMobileToc: () => {
const $cardToc = document.getElementById("card-toc")
if ($cardToc.classList.contains("open")) {
$cardToc.classList.remove("open");
} else {
$cardToc.classList.add("open");
}
},
}
document.getElementById('rightside').addEventListener('click', function (e) {
@ -230,6 +242,9 @@ document.addEventListener('DOMContentLoaded', function () {
case 'rightside-config':
rightSideFn.showOrHideBtn()
break
case "mobile-toc-button":
rightSideFn.runMobileToc();
break;
case 'readmode':
rightSideFn.switchReadMode()
break

95
templates/assets/libs/prism/code.css
View File

@ -8,7 +8,8 @@
}
#article-container .code-toolbar {
#article-container .code-toolbar,
#post-comment .code-toolbar{
margin: 18px 0;
overflow: hidden;
-webkit-box-shadow: var(--rl-code-bar-shadow);
@ -16,7 +17,8 @@
border-radius: 7px
}
#article-container .code-toolbar:before {
#article-container .code-toolbar:before,
#post-comment .code-toolbar:before{
content: "";
position: absolute;
top: 11px;
@ -30,7 +32,8 @@
box-shadow: 20px 0 #fdbc40,40px 0 #35cd4b
}
#article-container .code-toolbar .toolbar {
#article-container .code-toolbar .toolbar,
#post-comment .code-toolbar .toolbar{
position: absolute;
pointer-events: none;
opacity: 1;
@ -43,11 +46,13 @@
text-align: center
}
#article-container .code-toolbar .toolbar-item:first-child {
#article-container .code-toolbar .toolbar-item:first-child,
#post-comment .code-toolbar .toolbar-item:first-child{
display: none
}
#article-container .code-toolbar .toolbar-item:first-child span {
#article-container .code-toolbar .toolbar-item:first-child span,
#post-comment .code-toolbar .toolbar-item:first-child span{
background-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
@ -56,7 +61,8 @@
}
#article-container .code-toolbar .toolbar .custom-item {
#article-container .code-toolbar .toolbar .custom-item,
#post-comment .code-toolbar .toolbar .custom-item{
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@ -67,7 +73,8 @@
pointer-events: all
}
#article-container .code-toolbar .toolbar .custom-item>i {
#article-container .code-toolbar .toolbar .custom-item>i,
#post-comment .code-toolbar .toolbar .custom-item>i {
cursor: pointer;
margin-left: 8px;
-webkit-transition: -webkit-transform .2s;
@ -75,32 +82,39 @@
transition: transform .2s,-webkit-transform .2s
}
#article-container .code-toolbar .toolbar .custom-item>i:hover {
#article-container .code-toolbar .toolbar .custom-item>i:hover,
#post-comment .code-toolbar .toolbar .custom-item>i:hover{
-webkit-filter: brightness(1.2);
filter: brightness(1.2)
}
#article-container .toolbar .copy-button:hover,
#article-container .toolbar .code-expander:hover{
#article-container .toolbar .code-expander:hover,
#post-comment .toolbar .copy-button:hover,
#post-comment .toolbar .code-expander:hover{
color: var(--heo-main);
}
#article-container .code-toolbar .toolbar.c-expander i.code-expander {
#article-container .code-toolbar .toolbar.c-expander i.code-expander,
#post-comment .code-toolbar .toolbar.c-expander i.code-expander{
-webkit-transform: rotate(90deg);
transform: rotate(90deg)
}
#article-container .code-toolbar .toolbar.c-title .toolbar-item:first-child {
#article-container .code-toolbar .toolbar.c-title .toolbar-item:first-child,
#post-comment .code-toolbar .toolbar.c-title .toolbar-item:first-child{
display: block
}
#article-container .code-toolbar .toolbar.c-hr {
#article-container .code-toolbar .toolbar.c-hr ,
#post-comment .code-toolbar .toolbar.c-hr{
border-bottom: 1px solid #b2a8a84d
}
#article-container .code-toolbar pre[class*=language-] {
#article-container .code-toolbar pre[class*=language-],
#post-comment .code-toolbar pre[class*=language-]{
position: relative;
margin: 0;
padding: 35px 0 0;
@ -110,7 +124,8 @@
border-radius: 5px
}
#article-container .code-toolbar pre[class*=language-] .line-numbers-rows {
#article-container .code-toolbar pre[class*=language-] .line-numbers-rows,
#post-comment .code-toolbar pre[class*=language-] .line-numbers-rows{
border-right: none;
left: 0;
top: 0;
@ -119,7 +134,8 @@
width: 2.7em;
}
#article-container .code-toolbar pre[class*=language-] code[class*=language-] {
#article-container .code-toolbar pre[class*=language-] code[class*=language-],
#post-comment .code-toolbar pre[class*=language-] code[class*=language-]{
display: block;
margin-bottom: 0;
overflow-x: auto;
@ -128,16 +144,27 @@
text-shadow: none
}
#article-container .code-toolbar pre[class*=language-] code[class*=language-]::-webkit-scrollbar {
#article-container .code-toolbar pre[class*=language-] code[class*=language-]::-webkit-scrollbar,
#post-comment .code-toolbar pre[class*=language-] code[class*=language-]::-webkit-scrollbar{
width: 5px;
height: 5px
}
#article-container .code-toolbar pre[class*=language-] code[class*=language-] .style .token.string,#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.entity,#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.operator,#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.string,#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.url {
#article-container .code-toolbar pre[class*=language-] code[class*=language-] .style .token.string,
#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.entity,
#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.operator,
#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.string,
#article-container .code-toolbar pre[class*=language-] code[class*=language-] .token.url,
#post-comment .code-toolbar pre[class*=language-] code[class*=language-] .style .token.string,
#post-comment .code-toolbar pre[class*=language-] code[class*=language-] .token.entity,
#post-comment .code-toolbar pre[class*=language-] code[class*=language-] .token.operator,
#post-comment .code-toolbar pre[class*=language-] code[class*=language-] .token.string,
#post-comment .code-toolbar pre[class*=language-] code[class*=language-] .token.url {
background-color: transparent
}
#article-container .code-toolbar pre[class*=language-].line-numbers code[class*=language-] {
#article-container .code-toolbar pre[class*=language-].line-numbers code[class*=language-] ,
#post-comment .code-toolbar pre[class*=language-].line-numbers code[class*=language-]{
padding: 10px 20px 10px 48px;
}
@ -148,12 +175,14 @@
top: 0;
}
#article-container .code-toolbar pre[class*=language-] code[class*=language-].c-toggle{
#article-container .code-toolbar pre[class*=language-] code[class*=language-].c-toggle,
#post-comment .code-toolbar pre[class*=language-] code[class*=language-].c-toggle{
display: none;
}
/* 代码展开图标 */
#article-container .code-expand-btn {
#article-container .code-expand-btn ,
#post-comment .code-expand-btn{
transition: 0.3s;
backdrop-filter: saturate(180%) blur(500px);
-webkit-backdrop-filter: blur(20px);
@ -171,18 +200,21 @@
height: 32px;
}
#article-container .code-expand-btn:hover i {
#article-container .code-expand-btn:hover i,
#post-comment .code-expand-btn:hover i {
color: var(--heo-white);
}
#article-container .code-expand-btn i {
color: var(--hlnumber-color);
#article-container .code-expand-btn i ,
#post-comment .code-expand-btn i{
color: var(--heo-main);
font-size: 14px;
line-height: 1;
}
#article-container .code-expand-btn.expand-done {
#article-container .code-expand-btn.expand-done,
#post-comment .code-expand-btn.expand-done{
-webkit-transform: rotate(180deg);
-moz-transform: rotate(180deg);
-o-transform: rotate(180deg);
@ -190,22 +222,27 @@
transform: rotate(180deg);
}
#article-container pre{
#article-container pre,
#post-comment pre{
border:0px;
}
#article-container .code-expand-btn:hover {
#article-container .code-expand-btn:hover,
#post-comment .code-expand-btn:hover{
background: var(--heo-main);
}
#article-container .code-expand-btn:hover i {
#article-container .code-expand-btn:hover i ,
#post-comment .code-expand-btn:hover i {
color: var(--heo-white);
}
#article-container .code-toolbar pre.close.expand-done{
#article-container .code-toolbar pre.close.expand-done,
#post-comment .code-toolbar pre.close.expand-done{
height: 100%;
}
#article-container .code-toolbar pre.close.expand-done-expander{
#article-container .code-toolbar pre.close.expand-done-expander,
#post-comment .code-toolbar pre.close.expand-done-expander{
height: 100%;
}

2
templates/assets/libs/twikoo/twikoo.all.min.js vendored
View File

File diff suppressed because one or more lines are too long

56
templates/assets/zhheo/zhheoblog.css
View File

@ -2240,19 +2240,55 @@ blockquote footer cite::before {
}
}
@media screen and (max-width: 900px) {
@media screen and (max-width: 1200px) {
#aside-content #card-toc {
position: fixed;
right: -100%;
position:fixed;
right: 55px;
bottom: 30px;
z-index: 100;
max-width: 380px;
max-height: calc(100% - 60px);
width: 300px;
opacity: 0;
transform-origin: right bottom;
width: calc(100% - 80px);
-webkit-transition: -webkit-transform .3s;
-moz-transition: -moz-transform .3s;
-o-transition: -o-transform .3s;
-ms-transition: -ms-transform .3s;
transition: transform .3s;
-webkit-transform: scale(0);
-moz-transform: scale(0);
-o-transform: scale(0);
-ms-transform: scale(0);
transform: scale(0);
-webkit-transform-origin: right bottom;
-moz-transform-origin: right bottom;
-o-transform-origin: right bottom;
-ms-transform-origin: right bottom;
transform-origin: right bottom
}
#aside-content #card-toc.open {
-webkit-transform: scale(1);
-moz-transform: scale(1);
-o-transform: scale(1);
-ms-transform: scale(1);
transform: scale(1)
}
}
/*@media screen and (max-width: 900px) {*/
/* #aside-content #card-toc {*/
/* position: fixed;*/
/* right: -100%;*/
/* bottom: 30px;*/
/* z-index: 100;*/
/* max-height: calc(100% - 60px);*/
/* width: 300px;*/
/* opacity: 0;*/
/* transform-origin: right bottom;*/
/* }*/
/*}*/
#aside-content #card-toc .toc-content {
overflow-y: auto;
max-height: calc(100vh - 120px);
@ -6494,7 +6530,7 @@ a.console_switchbutton {
width: 35px;
height: 35px;
border-radius: 5px;
background-color: var(--btn-bg);
background-color: var(--heo-main);
color: var(--btn-color);
text-align: center;
font-size: 16px;
@ -6543,7 +6579,7 @@ a.console_switchbutton {
#footer {
background: linear-gradient(180deg, var(--heo-background) 0%, var(--heo-card-bg) 25%);
margin-top: 0;
z-index: 999;
z-index: 3;
}
}
@ -10249,7 +10285,7 @@ a.extend.prev {
}
#aside-content {
z-index: 2;
z-index: 99;
background: var(--heo-background);
padding: 0 1rem;
display: flex;
@ -12624,7 +12660,7 @@ button.el-button.tk-cancel.el-button--default.el-button--small {
margin: 0px !important;
}
.tk-replies .tk-content span:first-child {
.tk-replies .tk-content span:first-child:not(.token) {
font-size: 0.5rem;
color: var(--heo-secondtext);
}

2
templates/modules/comment/twikoo.html
View File

@ -18,6 +18,8 @@
region: '',
onCommentLoaded: function () {
btf.loadLightbox(document.querySelectorAll('#twikoo .tk-content img:not(.tk-owo-emotion)'))
typeof hljs === 'object' && hljs.highlightAll()
typeof Prism === 'object' && Prism.highlightAll()
$("input").focus(function () {
heo_intype = true;
});

1
templates/modules/common/rightside.html
View File

@ -10,6 +10,7 @@
</div>
<div id="rightside-config-show">
<button id="rightside-config" type="button" title="设置"><i class="haofont hao-icon-gear"></i></button>
<button th:if="${htmlType == 'post'}" class="close" id="mobile-toc-button" type="button" title="目录"><i class="haofont hao-icon-list-ul"></i></button>
<a id="to_comment" href="javascript:heo.scrollTo('post-comment')" title="直达评论" ><i class="haofont hao-icon-comments"></i></a>
<a id="switch-commentBarrage" href="javascript:heo.switchCommentBarrage();" rel="external nofollow noreferrer" title="开关弹幕" draggable="false" data-pjax-state="external"><i class="haofont hao-icon-danmu"></i></a>
<button id="go-up" type="button" title="回到顶部"><i class="haofont hao-icon-arrow-up"></i></button>

7
templates/modules/footer.html
View File

@ -153,13 +153,8 @@
</div>
<div id="quit-box" onclick="RemoveRewardMask()"></div>
<!--评论弹幕弹窗 -->
<div th:if="${theme.config.comments.twikooEnable && #strings.equals(theme.config.comments.use, 'Twikoo') && not #strings.isEmpty(theme.config.comments.twikoos.envId)
&& not #strings.isEmpty(theme.config.comments.twikoos.accessToken)}" class="comment-barrage needEndHide"
style="display: none;"></div>
<div class="comment-barrage needEndHide" style="display: none;"></div>
</footer>

2
templates/music.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"
th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'music',title = '音乐馆' + ' | ' + site.title)}">
th:replace="~{modules/layouts/layout :: layout(content = ~{::content}, htmlType = 'music',title = ${singlePage.spec.title + ' | ' + site.title})}">
<th:block th:fragment="content">

2
theme.yaml
View File

@ -47,5 +47,5 @@ spec:
repo: https://github.com/liuzhihang/halo-theme-hao
settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap"
version: "1.3.5"
version: "1.3.6"
require: ">=2.8.0"