From 3e0213975e8689d47b3addaf2e890a59359e6347 Mon Sep 17 00:00:00 2001
From: jinqilin721 <jinqilin721@163.com>
Date: Fri, 27 Mar 2020 13:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=82=B9=E7=82=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/common/article.ftl     | 36 +++++++++++++++++++++--------------
 layout/common/module.ftl      |  2 +-
 layout/common/widget.ftl      | 25 ++++++++++++++++--------
 layout/plugin/style.theme.ftl |  2 +-
 4 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/layout/common/article.ftl b/layout/common/article.ftl
index fca02a0..283904f 100644
--- a/layout/common/article.ftl
+++ b/layout/common/article.ftl
@@ -109,7 +109,7 @@
                     <#if post.summary?? && post.summary!=''>
                         <div class="level-end">
                             <div class="level-item">
-                                <a class="button is-size-7 is-light" href="${context!}/archives/${post.url!}#more">阅读更多</a>
+                                <a class="button is-size-7 is-light" target="_blank" href="${context!}/archives/${post.url!}#more">阅读更多</a>
                             </div>
                         </div>
                     </#if>
@@ -149,27 +149,35 @@
         </#if>
     </#if>
 
-    <#if !index && nextPost?? && prePost??>
+    <#if !index && (nextPost?? || prePost??)>
         <div class="card card-transparent">
             <div class="level post-navigation is-flex-wrap is-mobile">
-                <#if prePost??>
-                    <div class="level-start">
-                        <a class="level level-item has-link-grey article-nav-prev"
-                           href="${context!}/archives/${prePost.url}">
+                <div class="level-start">
+                    <#if prePost??>
+                        <a class="level level-item has-link-grey article-nav-prev" href="${context!}/archives/${prePost.url!}">
                             <i class="level-item fas fa-chevron-left"></i>
                             <span class="level-item">${prePost.title!}</span>
                         </a>
-                    </div>
-                </#if>
-                <#if nextPost??>
-                    <div class="level-end">
-                        <a class="level level-item has-link-grey article-nav-next"
-                           href="${context!}/archives/${nextPost.url}">
+                    <#else>
+                        <a class="level level-item has-link-grey article-nav-prev" href="${context!}/">
+                            <i class="level-item fas fa-chevron-left"></i>
+                            <span class="level-item">没有了</span>
+                        </a>
+                    </#if>
+                </div>
+                <div class="level-end">
+                    <#if nextPost??>
+                        <a class="level level-item has-link-grey article-nav-next" href="${context!}/archives/${nextPost.url!}">
                             <span class="level-item">${nextPost.title!}</span>
                             <i class="level-item fas fa-chevron-right"></i>
                         </a>
-                    </div>
-                </#if>
+                    <#else>
+                        <a class="level level-item has-link-grey article-nav-next" href="${context!}/">
+                            <span class="level-item">没有了</span>
+                            <i class="level-item fas fa-chevron-right"></i>
+                        </a>
+                    </#if>
+                </div>
             </div>
         </div>
     </#if>
diff --git a/layout/common/module.ftl b/layout/common/module.ftl
index 7986490..e351747 100644
--- a/layout/common/module.ftl
+++ b/layout/common/module.ftl
@@ -23,7 +23,7 @@
                                 <span class="blog-slider__code">${post.createTime?string["yyyy-MM-dd EE"]}</span>
                                 <div class="blog-slider__title "><a class="title is-5" href="${context!}/archives/${post.url!}">${post.title!}</a></div>
                                 <div class="blog-slider__text" content="">${post.summary!}</div>
-                                <a href="${context!}/archives/${post.url!}" class="blog-slider__button">阅读更多</a>
+                                <a href="${context!}/archives/${post.url!}" target="_blank" class="blog-slider__button">阅读更多</a>
                             </div>
                         </div>
                     </#if>
diff --git a/layout/common/widget.ftl b/layout/common/widget.ftl
index e2c8c8f..c25fc7b 100644
--- a/layout/common/widget.ftl
+++ b/layout/common/widget.ftl
@@ -32,17 +32,26 @@
         </#if>
     </#if>
     <#if position == 'right'>
-        <#if post??>
-            <#include "../widget/cate_posts.ftl">
-            <#include "../widget/tag_posts.ftl">
-            <#include "../widget/toc-post.ftl">
-        <#else>
+        <#if is_sheet??>
             <#if settings.sidebar_recentpost!true>
                 <#include "../widget/recent_posts.ftl">
             </#if>
-        </#if>
-        <#if settings.sidebar_recentcomment!true>
-            <#include "../widget/recent_comments.ftl">
+            <#if settings.sidebar_recentcomment!true>
+                <#include "../widget/recent_comments.ftl">
+            </#if>
+        <#else>
+            <#if post??>
+                <#include "../widget/cate_posts.ftl">
+                <#include "../widget/tag_posts.ftl">
+                <#include "../widget/toc-post.ftl">
+            <#else>
+                <#if settings.sidebar_recentpost!true>
+                    <#include "../widget/recent_posts.ftl">
+                </#if>
+            </#if>
+            <#if settings.sidebar_recentcomment!true>
+                <#include "../widget/recent_comments.ftl">
+            </#if>
         </#if>
     </#if>
     <#if position == 'left'>
diff --git a/layout/plugin/style.theme.ftl b/layout/plugin/style.theme.ftl
index f47ef85..c3f6319 100644
--- a/layout/plugin/style.theme.ftl
+++ b/layout/plugin/style.theme.ftl
@@ -224,7 +224,7 @@
 
     code {
         color: var(--color);
-        background-color: var(--code-bg-color)
+        /*background-color: var(--code-bg-color)*/
     }
 
     code[class*="language-"],