From 9cc75c13760353e1b303c962414c3c27daca8589 Mon Sep 17 00:00:00 2001 From: 7Wate Date: Sat, 15 Jan 2022 01:02:47 +0800 Subject: [PATCH] pages(detail): Finishing the details one last time Trust me!!! --- category.ftl | 2 +- index.ftl | 4 +- journals.ftl | 16 ++++---- module/comment.ftl | 3 +- module/header.ftl | 17 ++++++--- module/macro.ftl | 31 ++++++++------- post.ftl | 6 +-- settings.yaml | 14 +++++-- sheet.ftl | 6 +-- source/css/Redemption.css | 48 ++++++++++++------------ source/css/Redemption.scss | 77 ++++++++++++++++---------------------- source/css/color.css | 18 +++++++++ source/css/color.scss | 27 +++++++++---- 13 files changed, 149 insertions(+), 120 deletions(-) diff --git a/category.ftl b/category.ftl index 30acb39..8dd9d6f 100644 --- a/category.ftl +++ b/category.ftl @@ -14,7 +14,7 @@ <#if posts.totalPages gt 1> - <@paginationTag method="categoryPosts" page="${posts.number}" total="${posts.totalPages}" display="3"> + <@paginationTag method="categoryPosts" slug="${category.slug!}" page="${posts.number}" total="${posts.totalPages}" display="3">
<#if pagination.hasPrev> diff --git a/index.ftl b/index.ftl index 011f4d5..92ee0b0 100644 --- a/index.ftl +++ b/index.ftl @@ -11,13 +11,13 @@
- ${post.createTime?string('yyyy.MM.dd')} + ${post.createTime?string('yyyy.MM.dd')} <#if post.tags?? && post.tags?size gt 0> <#list post.tags as tag> - ${tag.name!} + ${tag.name!} diff --git a/journals.ftl b/journals.ftl index 8884528..8e306bb 100644 --- a/journals.ftl +++ b/journals.ftl @@ -19,26 +19,26 @@
--> - <#--
- ${user.nickname!} +
+ <#-- ${user.nickname!} --> <#assign timeago = (.now?long - journal.createTime?long)> <#if timeago < 60000 > 刚刚发表哦 ~ <#elseif (timeago >= 60000) && (timeago < 3600000)> - 发表于 ${(timeago / 60000)?int} 分钟前 + 于 ${(timeago / 60000)?int} 分钟前发表 <#elseif (timeago >= 3600000) && (timeago < 86400000)> - 发表于 ${(timeago / 3600000)?int} 小时前 + 于 ${(timeago / 3600000)?int} 小时前发表 <#elseif (timeago >= 86400000) && (timeago < 604800000)> - 发表于 ${(timeago / 86400000)?int} 天前 + 于 ${(timeago / 86400000)?int} 天前发表 <#elseif (timeago >= 604800000) && (timeago < 3153600000)> - 发表于 ${(timeago / 604800000)?int} 周前 + 于 ${(timeago / 604800000)?int} 周前发表 <#elseif (timeago >= 3153600000) && (timeago < 94608000000)> - 发表于 ${(timeago / 3153600000)?int} 年前 + 于 ${(timeago / 3153600000)?int} 年前发表 <#elseif (timeago >= 94608000000)> 发表于很久很久以前 ~ -
--> +
diff --git a/module/comment.ftl b/module/comment.ftl index 4aa0373..c9b27dc 100644 --- a/module/comment.ftl +++ b/module/comment.ftl @@ -1,10 +1,9 @@ <#macro comment post,type> <#if !post.disallowComment!false> -
+
-
diff --git a/module/header.ftl b/module/header.ftl index e71d94c..a19b13c 100644 --- a/module/header.ftl +++ b/module/header.ftl @@ -5,19 +5,26 @@

${settings.sub_title!'the site subtitle'}

+ <#if settings.aboutme??> + + <#if settings.github??> - + <#if settings.wechat??> - + <#if settings.bilibili??> - + <#if settings.mail??> - + - + <#if settings.links??> + + + +
\ No newline at end of file diff --git a/module/macro.ftl b/module/macro.ftl index e3711cd..8a8558d 100644 --- a/module/macro.ftl +++ b/module/macro.ftl @@ -26,27 +26,26 @@ - <#-- 菜单 --> -
- - <#-- 主体 --> - <#nested > + <#-- 主体 --> + <#nested > - - - <#-- 脚注 --> - + <#-- 脚注 --> +
+ + <#-- 自定义JS代码 --> + + <#-- 公共JS代码 -->