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

调整结构，fix 小问题

This commit is contained in:
liuzhihang 2022-10-22 15:38:38 +08:00
parent 06cfa58c23
commit d0365e9005
11 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings.yaml
View File

@ -125,8 +125,8 @@ spec:
- $formkit: textarea
name: widgets
label: 小部件（无效）
value: "profile,popular-posts,latest-comments,categories,tags"
help: "目前提供的小部件有：profile（站点资料）, popular-posts（热门文章）, latest-comments（最新评论）, categories（文章分类）, tags（文章标签）。你可以随意组合或排序，以逗号隔开。"
value: "profile,recent-posts,latest-comments,categories,tags"
help: "目前提供的小部件有：profile（站点资料）, recent-posts（近期文章）, latest-comments（最新评论）, categories（文章分类）, tags（文章标签）。你可以随意组合或排序，以逗号隔开。"
- $formkit: text
name: profile_name
label: 个人卡片名称

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

@ -10119,6 +10119,7 @@ blockquote p {
padding: 1rem 1.3rem;
overflow: hidden;
border-width: 1px;
border: var(--style-border);
transition: all 0.3s ease 0s;
}

6
templates/category.html
View File

@ -67,7 +67,7 @@
</div>
<div class="aside-content" id="aside-content">
<div th:replace="modules/widgets/profile :: profile"></div>
<div th:replace="modules/widgets/aside/profile :: profile"></div>
<div class="card-widget heo-right-widget" id="card-wechat" onclick='window.open("/wechat/")'>
<div id="flip-wrapper">
@ -79,11 +79,11 @@
</div>
<div class="sticky_layout">
<div class="card-widget card-tags card-archives card-webinfo card-allinfo">
<th:block th:replace="modules/widgets/tags :: tags"></th:block>
<th:block th:replace="modules/widgets/aside/tags :: tags"></th:block>
<hr>
<th:block th:replace="modules/widgets/statistics :: statistics"></th:block>
<th:block th:replace="modules/widgets/aside/stat :: statistics"></th:block>
</div>
</div>
</div>

17
templates/modules/aside.html
View File

@ -1,22 +1,29 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<div class="aside-content" id="aside-content" th:fragment="aside" th:if="${theme.config.sidebar.location != 'hide-aside'}">
<div class="aside-content" id="aside-content" th:fragment="aside"
th:if="${theme.config.sidebar.location != 'hide-aside'}"
th:with="widgets = ${#strings.listSplit(theme.config.sidebar.widgets,',')} ">
<!-- 侧栏部件不确定都有什么 -->
<!--<th:block th:each="widget : ${widgets}">-->
<!-- <th:block th:replace="'modules/widgets/aside/'+ ${widget} + '::' + ${widget}" />-->
<!--</th:block>-->
<!-- 个人信息卡片 -->
<div th:replace="modules/widgets/profile :: profile"></div>
<div th:replace="modules/widgets/aside/profile :: profile"></div>
<!-- 近期文章 -->
<div th:replace="modules/widgets/recent-posts :: recent-posts"></div>
<div th:replace="modules/widgets/aside/recent-posts :: recent-posts"></div>
<div class="sticky_layout">
<div class="card-widget card-tags card-archives card-webinfo card-allinfo">
<th:block th:replace="modules/widgets/tags :: tags"></th:block>
<th:block th:replace="modules/widgets/aside/tags :: tags"></th:block>
<hr>
<th:block th:replace="modules/widgets/statistics :: statistics"></th:block>
<th:block th:replace="modules/widgets/aside/stat :: stat"></th:block>
</div>
</div>

0
templates/modules/widgets/profile.html → templates/modules/widgets/aside/profile.html
View File

0
templates/modules/widgets/recent-posts.html → templates/modules/widgets/aside/recent-posts.html
View File

2
templates/modules/widgets/statistics.html → templates/modules/widgets/aside/stat.html
View File

@ -2,7 +2,7 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<!-- 侧边栏站点信息统计 -->
<th:block th:fragment="statistics">
<th:block th:fragment="stat">
<!-- 这里还需要换成动态的 -->
<div class="item-headline"><i class="fas fa-chart-line"></i><span>统计</span></div>

0
templates/modules/widgets/tags.html → templates/modules/widgets/aside/tags.html
View File

0
templates/modules/widgets/toc.html → templates/modules/widgets/aside/toc.html
View File

10
templates/post.html
View File

@ -15,7 +15,7 @@
<div class="meta-firstline">
<!-- 这里要跳转到版权页 -->
<a class="post-meta-original" th:href="@{/cc}" title="该文章为原创文章，注意版权协议">原创</a>
<span class="post-meta-categories">
<span class="post-meta-categories" th:if="${not #lists.isEmpty(post.categories)}">
<a class="post-meta-categories"
th:each="category : ${post.categories}"
th:href="${category.status.permalink}"
@ -23,7 +23,7 @@
th:title="${category.spec.displayName}">
</a>
</span>
<div class="tag_share">
<div class="tag_share" th:if="${not #lists.isEmpty(post.tags)}">
<div class="post-meta__tag-list">
<a class="post-meta__tags"
th:each="tag : ${post.tags}"
@ -232,11 +232,11 @@
<div class="aside-content" id="aside-content" th:if="${theme.config.sidebar.location != 'hide-aside'}">
<!-- 个人信息卡片 -->
<div th:replace="modules/widgets/profile :: profile"></div>
<div th:replace="modules/widgets/aside/profile :: profile"></div>
<div class="sticky_layout">
<!-- 目录 -->
<div th:replace="modules/widgets/toc :: toc"></div>
<div th:replace="modules/widgets/aside/toc :: toc"></div>
<!--<div class="card-widget" id="card-toc">-->
<!-- <div class="item-headline"><i class="fas fa-bars"></i><span>文章目录</span></div>-->
@ -259,7 +259,7 @@
</div>
</div>
<!-- 近期文章 -->
<div th:replace="modules/widgets/recent-posts :: recent-posts"></div>
<div th:replace="modules/widgets/aside/recent-posts :: recent-posts"></div>
</div>
</div>
</main>

6
templates/tag.html
View File

@ -53,7 +53,7 @@
</div>
<div class="aside-content" id="aside-content">
<div th:replace="modules/widgets/profile :: profile"></div>
<div th:replace="modules/widgets/aside/profile :: profile"></div>
<div class="card-widget heo-right-widget" id="card-wechat" onclick='window.open("/wechat/")'>
@ -66,11 +66,11 @@
</div>
<div class="sticky_layout">
<div class="card-widget card-tags card-archives card-webinfo card-allinfo">
<th:block th:replace="modules/widgets/tags :: tags"></th:block>
<th:block th:replace="modules/widgets/aside/tags :: tags"></th:block>
<hr>
<th:block th:replace="modules/widgets/statistics :: statistics"></th:block>
<th:block th:replace="modules/widgets/aside/stat :: statistics"></th:block>
</div>
</div>
</div>