master
julylies 2 years ago
parent 457d3269ba
commit e7abfbdd03

@ -32,8 +32,8 @@
<link href="${theme_base!}/source/css/kico.css" rel="stylesheet" type="text/css"/>
<link href="${theme_base!}/source/css/single.css" rel="stylesheet" type="text/css"/>
<link href="${theme_base!}/source/css/font-awesome-animation.min.css" rel="stylesheet" type="text/css"/>
<#--<link href="https://fastly.jsdelivr.net/gh/FortAwesome/Font-Awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>-->
<link href="https://fastly.jsdelivr.net/gh/FortAwesome/Font-Awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<link rel="preload stylesheet" as="style" href="${theme_base!}/source/plugins/prism/prism.css">
<link rel="preload stylesheet" as="style" href="${theme_base!}/source/plugins/prism/themes/prism-${settings.Code_highlighting!}.css">
<@global.head />
<#if !(options.blog_favicon?? && options.blog_favicon!='')>

@ -1,7 +1,7 @@
<#macro comment post,type>
<#macro comment target,type>
<#if !post.disallowComment!false>
<script src="//cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js"></script>
<script src="${options.comment_internal_plugin_js!'//cdn.jsdelivr.net/gh/halo-dev/halo-comment@latest/dist/halo-comment.min.js'}"></script>
<halo-comment id="${post.id?c}" type="${type}"/>
- <script src="${options.comment_internal_plugin_js!'//cdn.jsdelivr.net/gh/halo-dev/halo-comment@latest/dist/halo-comment.min.js'}"></script>
- <halo-comment id="${post.id?c}" type="${type}"/>
</#if>
</#macro>

@ -4,7 +4,6 @@
<section class="home-title">
<h1>${blog_title!}</h1>
<span>${user.description!}</span>
<#---->
<div class="home-social">
<#if settings.home_social?? && settings.home_social != ''>
${settings.home_social!}

@ -5,14 +5,7 @@
<section class="post-title">
<h2>${post.title!}</h2>
<div class="post-meta">
<time class="date">${post.createTime?string('yyyy-MM-dd')}</time>
<span class="category">
<#list post.categories as category>
<a href="${category.fullPath!}" >
${category.name!}
</a>
</#list>
</span>
<time class="date">发布于${post.createTime?string('yyyy-MM-dd')}&nbsp;最后修改于${post.editTime?string('yyyy-MM-dd')}</time>
<span class="comments">${post.commentCount!}</span>
<#--计数问题-->
<span class="visits">${post.visits!0}</span>
@ -42,7 +35,15 @@
</li>
</ul>
</section>
<section class="post-tags">
<div class="post-footer">
<span class="post-category">
<#list post.categories as category>
<a href="${category.fullPath!}" >
${category.name!}
</a>
</#list>
</span>
<span class="post-tags">
<#list post.tags as tag>
<a href="${tag.fullPath}" class="tag">${tag.name}</a>
<#--<#if 1+2 >3 >
@ -52,19 +53,21 @@
</#if>
-->
</#list>
</section>
<#if settings.author_text?? && settings.author_text!=''>
</span>
</div>
<section class="post-author">
<figure class="author-avatar">
<img src="https://www.huangdf.xyz/upload/2021/08/logo-4d5e052dd4074b078ba3f982423435d8.jpg" alt="${user.nickname!}" width="200" height="200">
</figure>
<div class="author-info">
<h4>${user.nickname!}</h4>
<p>${settings.author_text!}</p>
<span>版权归属:${user.nickname!}</span><br>
<#if settings.author_text?? && settings.author_text!=''><span>作者信息:${settings.author_text!}</span><br></#if>
<span>本文链接:<a href="${post.fullPath!}">${post.fullPath!}</a></span><br>
<span>许可协议:本文使用<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">《署名-非商业性使用-相同方式共享 4.0 国际 (CC BY-NC-SA 4.0)》</a>协议授权</span><br>
<#--<p>${settings.author_text!}</p>-->
</div>
</section>
</#if>
<@global.comment target=post type="post" />
</div>
</main>
<#include "footer.ftl">

File diff suppressed because one or more lines are too long

@ -1,5 +1,4 @@
@charset "UTF-8";
/* ----
# Single Theme
@ -531,7 +530,7 @@ article img{
}
.post-content, .page-content{ animation: fade-in-top .3s .2s backwards; -webkit-animation: fade-in-top .3s .2s backwards; }
.post-content, .page-content, .post-near, .post-tags, .post-author{ margin-bottom: 3em }
.post-content, .page-content, .post-near, .post-footer, .post-author{ margin-bottom: 2em }
article h1, article h2, article h3,article h4,article h5,article h6{
margin-top: 0rem;
@ -572,23 +571,28 @@ article ul p:first-child{
.post-near{
animation: fade-in-top .3s .3s backwards; -webkit-animation: fade-in-top .3s .3s backwards;
}
/* - 阅读页文章标签 */
.post-tags{
display: flex;
flex-wrap: wrap;
margin-bottom: 2.5em;
animation: fade-in-top .3s .3s backwards; -webkit-animation: fade-in-top .3s .3s backwards;
.post-footer{
overflow: auto;
white-space: nowrap;
}
.post-footer::-webkit-scrollbar{ height: 0 }
.post-footer a{ margin: 0 .75em .5em 0;}
.post-footer span{
/*transition: border 0.3s;*/
transition: all 0.3s;
}
/* - 阅读页文章标签 */
.post-tags:before{
content: "\f02c";
margin-right: .75em;
/*margin-right: .75em;*/
font-family: "FontAwesome";
}
.post-tags a{
margin: 0 .75em .5em 0;
}
.post-category:before{
content: "\f07b";
font-family: "FontAwesome";
}
/* - 阅读页作者信息 */
.post-author{
display: table;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save