From a11220e51715391138bbd14b2b757a794c8c9acb Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sat, 14 Mar 2020 17:37:29 +0800 Subject: [PATCH 1/3] feat: require halo 1.3.0. --- archives.ftl | 32 +++++++++++++++++--------------- index.ftl | 32 +++++++++++++++++--------------- layout/category.ftl | 32 +++++++++++++++++--------------- layout/common/article.ftl | 8 ++++---- layout/layout.ftl | 2 +- layout/tag.ftl | 32 +++++++++++++++++--------------- search.ftl | 36 +++++++++++++++++------------------- theme.yaml | 2 +- 8 files changed, 91 insertions(+), 85 deletions(-) diff --git a/archives.ftl b/archives.ftl index 132ccb7a7..7768e1e2a 100644 --- a/archives.ftl +++ b/archives.ftl @@ -32,21 +32,23 @@ <#if posts.getTotalPages() gt 0>
diff --git a/index.ftl b/index.ftl index 820df5ab2..e1e460fa0 100644 --- a/index.ftl +++ b/index.ftl @@ -7,21 +7,23 @@ <#if posts.getTotalPages() gt 0>
diff --git a/layout/category.ftl b/layout/category.ftl index 682227471..c5e128dd5 100644 --- a/layout/category.ftl +++ b/layout/category.ftl @@ -14,21 +14,23 @@ <#if posts.getTotalPages() gt 0>
\ No newline at end of file diff --git a/layout/common/article.ftl b/layout/common/article.ftl index 02ec7324e..9d5b5e4cd 100644 --- a/layout/common/article.ftl +++ b/layout/common/article.ftl @@ -96,14 +96,14 @@ -<#if !index && nextPost?? && prePost??> +<#if !index && (nextPost?? || prevPost??)>
- <#if prePost??> + <#if prevPost??>
- + - ${prePost.title!} + ${prevPost.title!}
diff --git a/layout/layout.ftl b/layout/layout.ftl index ba7768d4b..956722816 100644 --- a/layout/layout.ftl +++ b/layout/layout.ftl @@ -29,7 +29,7 @@ <@global.head /> - + diff --git a/layout/tag.ftl b/layout/tag.ftl index 343f1b141..69beee30d 100644 --- a/layout/tag.ftl +++ b/layout/tag.ftl @@ -15,21 +15,23 @@ <#if posts.getTotalPages() gt 0>
\ No newline at end of file diff --git a/search.ftl b/search.ftl index 9871a3bdf..dc360f9b3 100644 --- a/search.ftl +++ b/search.ftl @@ -7,25 +7,23 @@ <#if posts.getTotalPages() gt 0>
diff --git a/theme.yaml b/theme.yaml index c90b675a9..7cae9b604 100644 --- a/theme.yaml +++ b/theme.yaml @@ -7,5 +7,5 @@ description: logo: website: https://github.com/ppoffice/hexo-theme-icarus repo: https://github.com/halo-dev/halo-theme-icarus -version: 2.6.1 +version: 2.6.2 require: 1.3.0 \ No newline at end of file From 223d75de085ecda08d011669dae9b3a0de290b04 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Mon, 23 Mar 2020 11:58:36 +0800 Subject: [PATCH 2/3] feat: completed require 1.3.0 --- layout/widget/tagcloud.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/widget/tagcloud.ftl b/layout/widget/tagcloud.ftl index 9837eee88..5b3562ff8 100644 --- a/layout/widget/tagcloud.ftl +++ b/layout/widget/tagcloud.ftl @@ -6,7 +6,7 @@ 标签云 <#list tags as tag> - ${tag.name!} + ${tag.name!}
From e0088b27120d9afffb35267f29df44f6699065b8 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Wed, 25 Mar 2020 17:56:40 +0800 Subject: [PATCH 3/3] require 1.3.0 --- layout/widget/profile.ftl | 2 +- layout/widget/recent_comments.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/widget/profile.ftl b/layout/widget/profile.ftl index b160acae2..2f7c15a39 100644 --- a/layout/widget/profile.ftl +++ b/layout/widget/profile.ftl @@ -54,7 +54,7 @@
- 关注我 + 关注我
<#if settings.social_github?? && settings.social_github!=''> diff --git a/layout/widget/recent_comments.ftl b/layout/widget/recent_comments.ftl index c66ee21f9..a0d664d2f 100644 --- a/layout/widget/recent_comments.ftl +++ b/layout/widget/recent_comments.ftl @@ -10,7 +10,7 @@
- ${comment.author!} : ${comment.content!} + ${comment.author!} : ${comment.content!}