fix(bug): some bug

This commit is contained in:
周中平 2022-11-01 16:39:08 +08:00
parent d06fe9a07e
commit 6129d498da
No known key found for this signature in database
GPG Key ID: B1DF9DD42D8E00DC
7 changed files with 103 additions and 18 deletions

View File

@ -7,10 +7,14 @@
<div class="description"> <div class="description">
<p>${settings.sub_title!}</p> <p>${settings.sub_title!}</p>
<div class="socials"> <div class="socials">
<a href="\about" title="关于我" target="_blank"><i class="ri-footprint-line"></i></a> <#if settings.about??>
<a href="\photos" title="摄影集" target="_blank"><i class="ri-camera-line"></i></a> <a href="${settings.about}" title="关于我" target="_blank"><i class="ri-footprint-line"></i></a>
<a href="\journals" title="日志" target="_blank"><i class="ri-message-3-line"></i></a> </#if>
<a href="\archives" title="文章归档" target="_blank"><i class="ri-archive-line"></i></a> <#if settings.open_photos!true>
<a href="${photos_url!}" title="摄影" target="_blank"><i class="ri-camera-line"></i></a>
</#if>
<a href="${journals_url!}" title="日志" target="_blank"><i class="ri-message-3-line"></i></a>
<a href="${archives_url!}" title="归档" target="_blank"><i class="ri-archive-line"></i></a>
<#if settings.github??> <#if settings.github??>
<a href="${settings.github}" title="Github" target="_blank"><i class="ri-github-line"></i></a> <a href="${settings.github}" title="Github" target="_blank"><i class="ri-github-line"></i></a>
</#if> </#if>
@ -20,8 +24,10 @@
<#if settings.mail??> <#if settings.mail??>
<a href="mailto:${settings.mail}" title="邮箱" target="_blank"><i class="ri-mail-line"></i></a> <a href="mailto:${settings.mail}" title="邮箱" target="_blank"><i class="ri-mail-line"></i></a>
</#if> </#if>
<a href="https://travellings.link" title="开往" target="_blank"><i class="ri-train-line"></i></a> <#if settings.open_kaiwang!true>
<a href="\links" title="友链" target="_blank"><i class="ri-links-line"></i></a> <a href="https://travellings.link" title="开往" target="_blank"><i class="ri-train-line"></i></a>
</#if>
<a href="${links_url!}" title="友链" target="_blank"><i class="ri-links-line"></i></a>
<a href="${sitemap_html_url!}" type="application/sitemap" title="站点地图" target="_blank"><i class="ri-map-2-line"></i></a> <a href="${sitemap_html_url!}" type="application/sitemap" title="站点地图" target="_blank"><i class="ri-map-2-line"></i></a>
<a href="${rss_url!}" type="application/rss+xml" title="RSS 订阅" target="_blank"><i class="ri-rss-line"></i></a> <a href="${rss_url!}" type="application/rss+xml" title="RSS 订阅" target="_blank"><i class="ri-rss-line"></i></a>
</div> </div>

View File

@ -28,10 +28,14 @@
<#-- 脚注 --> <#-- 脚注 -->
<footer> <footer>
<div class="copyright"> <div class="copyright">
<#if settings.open_foreverblog!true>
<a href="https://www.foreverblog.cn/" target="_blank" > <a href="https://www.foreverblog.cn/" target="_blank" >
<img src="${theme_base!}/source/images/logo_en_default.png" alt="" style="width:auto;height:1.25rem;"> <img src="${theme_base!}/source/images/logo_en_default.png" alt="" style="width:auto;height:1.25rem;">
</a> </a>
<a href="https://halo.run">Designed by 7Wate . Proudly published with Halo</a> </#if>
<#if settings.footer_title??>
<a href="https://halo.run">${settings.footer_title}</a>
</#if>
<@global.footer /> <@global.footer />
</div> </div>
</footer> </footer>

View File

@ -54,9 +54,11 @@
<a href="${blog_url!}" > <a href="${blog_url!}" >
退回首页 退回首页
</a> </a>
<a href="javascript:document.getElementById('comment').classList.remove('close')"> <#if settings.open_comment!false>
留下一言 <a href="javascript:document.getElementById('comment').classList.remove('close')">
</a> 留下一言
</a>
</#if>
</div> </div>
</main> </main>
<#include "module/comment.ftl"> <#include "module/comment.ftl">

View File

@ -5,15 +5,46 @@ general:
name: title name: title
label: 标题 label: 标题
type: text type: text
default: 'the site' default: '救赎之路'
sub_title: sub_title:
name: sub_title name: sub_title
label: 二级标题 label: 短语
type: text type: text
default: 'the site subtitle' default: 'Always For Freedom'
footer_title:
name: footer_title
label: 脚注
type: text
default: 'Designed by 7Wate . Proudly published with Halo'
open_kaiwang:
name: open_kaiwang
label: 是否显示开往
type: radio
data-type: bool
default: true
options:
- value: true
label: 显示
- value: false
label: 关闭
open_foreverblog:
name: open_foreverblog
label: 是否显示十年之约
type: radio
data-type: bool
default: true
options:
- value: true
label: 显示
- value: false
label: 关闭
sns: sns:
label: 社交资料 label: 社交链接
items: items:
about:
name: github
label: 关于
type: text
github: github:
name: github name: github
label: Github label: Github
@ -26,14 +57,42 @@ sns:
name: mail name: mail
label: 邮箱 label: 邮箱
type: text type: text
comment:
label: 评论设置
items:
open_comment:
name: open_comment
label: 是否开启评论
type: radio
data-type: bool
default: false
options:
- value: true
label: 显示
- value: false
label: 关闭
description: '开启评论需要编辑 /source/plugins/comment/halo-comment.min.js 搜索 baseUrl 关键字.
{baseUrl:"https://blog.7wate.com/"} 并将双引号内地址改为自己博客地址即可正常开启评论。
'
photos: photos:
label: 图库设置 label: 图库设置
items: items:
open_photos:
name: open_photos
label: 是否显示图库
type: radio
data-type: bool
default: true
options:
- value: true
label: 显示
- value: false
label: 关闭
photoTitle: photoTitle:
name: photoTitle name: photoTitle
label: 标题 label: 标题
type: text type: text
photodes: photodes:
name: photodes name: photodes
label: 简述 label: 短语
type: textarea type: textarea

View File

@ -337,7 +337,14 @@ footer .copyright a:hover {
margin: 5% 0; margin: 5% 0;
} }
} }
@media (min-width: 870px) { @media (min-width: 870px) and (max-width: 1440px) {
.comment {
width: 71.8vw;
margin-top: 18.48vh;
padding-bottom: 7vh;
}
}
@media (min-width: 1440px) {
.comment { .comment {
margin-top: 2rem; margin-top: 2rem;
width: 61.8vw; width: 61.8vw;

View File

@ -7,8 +7,15 @@
margin: 5% 0; margin: 5% 0;
} }
// =========== 适配端 ===========
@media (min-width: 870px) and (max-width: 1440px) {
width: 71.8vw;
margin-top: 18.48vh;
padding-bottom: 7vh;
}
// =========== 桌面端 =========== // =========== 桌面端 ===========
@media (min-width: 870px){ @media (min-width: 1440px){
margin-top: 2rem; margin-top: 2rem;
width: 61.8vw; width: 61.8vw;
} }

File diff suppressed because one or more lines are too long