From 62fd4fea9b1d886eb4e9298d3661bd823a36603e Mon Sep 17 00:00:00 2001
From: 7Wate <zhouzhongping@7wate.com>
Date: Fri, 14 Jan 2022 14:49:51 +0800
Subject: [PATCH] pages(detail): Completed details on all pages

---
 archives.ftl               |  4 ++--
 category.ftl               |  4 ++--
 index.ftl                  |  4 ++--
 journals.ftl               |  8 +++----
 module/comment.ftl         |  3 +++
 module/macro.ftl           |  5 ++--
 post.ftl                   | 11 +++++++--
 sheet.ftl                  | 13 +++++++---
 source/css/Redemption.css  | 25 +++++++++++++++----
 source/css/Redemption.scss | 25 +++++++++++++++----
 source/css/color.css       | 25 +++++++++++++------
 source/css/color.scss      | 49 ++++++++++++++++++++++++++++++++------
 tag.ftl                    |  4 ++--
 13 files changed, 137 insertions(+), 43 deletions(-)

diff --git a/archives.ftl b/archives.ftl
index 598a75d..75300f4 100644
--- a/archives.ftl
+++ b/archives.ftl
@@ -22,12 +22,12 @@
                     <div class="pagenav">
                     <#if pagination.hasPrev>
                         <a href="${pagination.prevPageFullPath!}" class="pre">
-                            返回上页
+                            退回上页
                         </a>
                     </#if>
                     <#if pagination.hasNext>
                         <a href="${pagination.nextPageFullPath!}" class="next">
-                            更多文章
+                            阅览更多
                         </a>
                     </#if>
                     </div>
diff --git a/category.ftl b/category.ftl
index d5c6c7f..30acb39 100644
--- a/category.ftl
+++ b/category.ftl
@@ -18,12 +18,12 @@
                     <div class="pagenav">
                     <#if pagination.hasPrev>
                         <a href="${pagination.prevPageFullPath!}" class="pre">
-                            返回上页
+                            退回上页
                         </a>
                     </#if>
                     <#if pagination.hasNext>
                         <a href="${pagination.nextPageFullPath!}" class="next">
-                            更多文章
+                            阅览更多
                         </a>
                     </#if>
                     </div>
diff --git a/index.ftl b/index.ftl
index 300a8b3..011f4d5 100644
--- a/index.ftl
+++ b/index.ftl
@@ -29,12 +29,12 @@
                     <div class="pagenav">
                     <#if pagination.hasPrev>
                         <a href="${pagination.prevPageFullPath!}" class="pre">
-                            返回上页
+                            退回上页
                         </a>
                     </#if>
                     <#if pagination.hasNext>
                         <a href="${pagination.nextPageFullPath!}" class="next">
-                            更多文章
+                            阅览更多
                         </a>
                     </#if>
                     </div>
diff --git a/journals.ftl b/journals.ftl
index be1d2b8..8884528 100644
--- a/journals.ftl
+++ b/journals.ftl
@@ -12,13 +12,13 @@
                         <div class="content">
                             ${journal.content!}
                         </div>
-                        <div class="option">
+                        <#--  <div class="option">
 
                         <i class="ri-thumb-up-line"></i>
                         <i class="ri-chat-3-line"></i>
                         <i class="ri-share-forward-line"></i>
 
-                        </div>
+                        </div>  -->
                         <#--  <div class="info">
                         ${user.nickname!}
                         <#assign timeago = (.now?long - journal.createTime?long)>
@@ -50,12 +50,12 @@
                     <div class="pagenav">
                     <#if pagination.hasPrev>
                         <a href="${pagination.prevPageFullPath!}" class="pre">
-                            返回上页
+                            退回上页
                         </a>
                     </#if>
                     <#if pagination.hasNext>
                         <a href="${pagination.nextPageFullPath!}" class="next">
-                            更多日志
+                            阅览更多
                         </a>
                     </#if>
                     </div>
diff --git a/module/comment.ftl b/module/comment.ftl
index b27512a..4aa0373 100644
--- a/module/comment.ftl
+++ b/module/comment.ftl
@@ -1,7 +1,10 @@
 <#macro comment post,type>
     <#if !post.disallowComment!false>
+    <div class="comment">
         <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}"/>
+
+    </div>
     </#if>
 </#macro>
diff --git a/module/macro.ftl b/module/macro.ftl
index a129647..e3711cd 100644
--- a/module/macro.ftl
+++ b/module/macro.ftl
@@ -8,7 +8,7 @@
         <meta name="keywords" content="${meta_keywords!}"/>
         <meta name="description" content="${meta_description!}" />
         <@global.head />
-
+        
 
         <#--  公共样式表  -->
         <link rel="stylesheet" href="${theme_base!}/source/plugins/normalize.css"/>
@@ -27,7 +27,7 @@
     </head>
     <body>
             <#--  菜单  -->
-        <#include "menu.ftl">
+        
         <div class="container animate__animated animate__fadeInDown">
 
         
@@ -38,6 +38,7 @@
 
         <#-- 脚注   -->
         <footer>
+        <#include "menu.ftl">
             <div class="copyright">
                 <a href="https://www.7wate.com">Designed by Zeuk&7Wate,</a>
                 <a href="https://halo.run">Proudly published with Halo</a>
diff --git a/post.ftl b/post.ftl
index 79c355d..e23c535 100644
--- a/post.ftl
+++ b/post.ftl
@@ -50,8 +50,15 @@
                 ${post.formatContent!}
             </div>
         </div>
-        
+        <div class="commentButton">
+            <a href="${blog_url!}">
+                退回首页
+            </a>
+            <a href="">
+                留下一言
+            </a>
+        </div>
     </main>
-    <#include "module/comment.ftl">
+    <#include "module/comment.ftl"> 
     <@comment post=post type="post" />
 </@layout>
diff --git a/sheet.ftl b/sheet.ftl
index 7623d11..9aeb37c 100644
--- a/sheet.ftl
+++ b/sheet.ftl
@@ -44,8 +44,15 @@
                 ${sheet.formatContent!}
             </div>
         </div>
-        <#include "module/comment.ftl">
-        <@comment post=sheet type="sheet" />
-        
+        <div class="commentButton">
+            <a href="${blog_url!}">
+                退回首页
+            </a>
+            <a href="">
+                留下一言
+            </a>
+        </div>
     </main>
+    <#include "module/comment.ftl">
+    <@comment post=sheet type="sheet" />
 </@layout>
diff --git a/source/css/Redemption.css b/source/css/Redemption.css
index f2a324a..5a9e595 100644
--- a/source/css/Redemption.css
+++ b/source/css/Redemption.css
@@ -178,7 +178,6 @@ main .post > .title {
   margin-top: 4rem;
 }
 main .post > .title > h1 > a {
-  color: black;
   letter-spacing: 0.0625rem;
   font-size: 2rem;
   line-height: 2rem;
@@ -186,18 +185,15 @@ main .post > .title > h1 > a {
 main .post > .title > .info {
   padding-bottom: 1rem;
   margin-bottom: 1rem;
-  border-bottom: 1px solid #f3f3f3;
 }
 main .post > .title > .info > span {
   margin: 0 0.25rem;
   font-weight: 400;
   font-size: 0.75rem;
-  color: rgba(0, 0, 0, 0.65);
 }
 main .post > .title > .info > span i {
   position: relative;
   top: 0.125rem;
-  color: rgba(0, 0, 0, 0.85);
 }
 main .journals > .name {
   font-size: 1.5rem;
@@ -215,7 +211,6 @@ main .journals > ul > li > .content {
 main .journals > ul > li > .option {
   display: flex;
   justify-content: flex-end;
-  color: rgba(0, 0, 0, 0.65);
   font-weight: 400;
   font-size: 0.75rem;
   margin: 0 0.5rem;
@@ -233,6 +228,26 @@ main .pagenav > a {
   margin: 0 2rem;
 }
 
+.comment {
+  width: 47rem;
+  margin: 1rem 0rem;
+  padding: 1rem 2.5rem;
+  background: #ffffff;
+  box-shadow: 0 0.375rem 1rem -0.5rem rgba(0, 0, 0, 0.08);
+}
+
+.commentButton {
+  display: flex;
+  justify-content: space-around;
+  margin-top: 2rem;
+  padding-top: 2rem;
+  width: 40rem;
+  border-top: 1px solid #f3f3f3;
+}
+.commentButton > a {
+  color: black;
+}
+
 footer {
   padding: 2rem 0;
 }
diff --git a/source/css/Redemption.scss b/source/css/Redemption.scss
index 95a996d..e90ac5e 100644
--- a/source/css/Redemption.scss
+++ b/source/css/Redemption.scss
@@ -236,7 +236,6 @@ main {
             margin-top: 4rem;
             > h1 {
                 > a {
-                    color: rgba(0, 0, 0, 1);
                     letter-spacing: 0.0625rem;
                     font-size: 2rem;
                     line-height: 2rem;
@@ -246,17 +245,14 @@ main {
             > .info {
                 padding-bottom: 1rem;
                 margin-bottom: 1rem;
-                border-bottom: 1px solid #f3f3f3;
     
                 > span{
                     margin: 0 0.25rem;
                     font-weight: 400;
                     font-size: 0.75rem;
-                    color: rgb(0, 0, 0, 0.65);
                     i {
                         position: relative;
                         top:0.125rem;
-                        color: rgb(0, 0, 0, 0.85);
                     }
                 }
             }
@@ -264,6 +260,7 @@ main {
     }
 
     .journals{
+        
         > .name{
             font-size: 1.5rem;
             font-weight: bold;
@@ -280,7 +277,6 @@ main {
                 > .option{
                     display: flex;
                     justify-content: flex-end;
-                    color: rgb(0, 0, 0, 0.65);
                     font-weight: 400;
                     font-size: 0.75rem;
                     margin: 0 0.5rem;
@@ -307,6 +303,25 @@ main {
 
 }
 
+.comment
+{
+    width: 47rem;
+    margin: 1rem 0rem;
+    padding: 1rem 2.5rem;
+    background: #ffffff;
+    box-shadow: 0 0.375rem 1rem -0.5rem rgba(0, 0, 0, 0.08);
+}
+.commentButton{
+    display: flex;
+    justify-content: space-around;
+    margin-top: 2rem;
+    padding-top: 2rem;
+    width: 40rem;
+    border-top: 1px solid #f3f3f3;
+    >a{
+        color: rgba(0, 0, 0, 1);
+    }
+}
 footer {
     padding: 2rem 0;
 
diff --git a/source/css/color.css b/source/css/color.css
index 03431ce..9f5cee1 100644
--- a/source/css/color.css
+++ b/source/css/color.css
@@ -15,13 +15,6 @@ html::-webkit-scrollbar-thumb:hover {
   background: #0095ff1a;
 }
 
-body {
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: column;
-  align-items: center;
-}
-
 .header > .title > a > span {
   color: black;
 }
@@ -81,6 +74,24 @@ main .pagenav a {
 main .pagenav a:hover {
   color: rgba(0, 0, 0, 0.65);
 }
+main .post > .title > h1 {
+  color: black;
+}
+main .post > .title > h1 > a {
+  color: black;
+}
+main .post > .title > .info {
+  border-bottom: 1px solid #f3f3f3;
+}
+main .post > .title > .info > span {
+  color: rgba(0, 0, 0, 0.65);
+}
+main .post > .title > .info > span i {
+  color: rgba(0, 0, 0, 0.85);
+}
+main .journals > ul > li > .option {
+  color: rgba(0, 0, 0, 0.65);
+}
 
 footer .copyright a {
   color: rgba(0, 0, 0, 0.25);
diff --git a/source/css/color.scss b/source/css/color.scss
index 7bb0c01..ce90fa4 100644
--- a/source/css/color.scss
+++ b/source/css/color.scss
@@ -17,13 +17,13 @@ html::-webkit-scrollbar-thumb:hover {
     background: #0095ff1a;
 }
 
-// Body
-body {
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: column;
-    align-items: center;
-}
+// // Body
+// body {
+//     display: flex;
+//     flex-wrap: nowrap;
+//     flex-direction: column;
+//     align-items: center;
+// }
 
 // Header 头部
 .header {
@@ -120,6 +120,41 @@ main {
             }
         }
     }
+
+    // 文章
+    .post{
+        > .title{
+            > h1 {
+                color: rgba(0, 0, 0, 1);
+                > a {
+                    color: rgba(0, 0, 0, 1);
+                }
+            }
+
+            > .info {
+                border-bottom: 1px solid #f3f3f3;
+                > span{
+                    color: rgb(0, 0, 0, 0.65);
+                    i {
+
+                        color: rgb(0, 0, 0, 0.85);
+                    }
+                }
+            }
+        }
+    }
+
+    // 日志
+    .journals{
+        > ul{
+            > li{
+                > .option{
+                    color: rgb(0, 0, 0, 0.65);
+                }
+            }
+        }
+        
+    }
 }
 
 // 脚注
diff --git a/tag.ftl b/tag.ftl
index 2198658..05bf8cd 100644
--- a/tag.ftl
+++ b/tag.ftl
@@ -20,12 +20,12 @@
                     <div class="pagenav">
                     <#if pagination.hasPrev>
                         <a href="${pagination.prevPageFullPath!}" class="pre">
-                            返回上页
+                            退回上页
                         </a>
                     </#if>
                     <#if pagination.hasNext>
                         <a href="${pagination.nextPageFullPath!}" class="next">
-                            更多文章
+                            阅览更多
                         </a>
                     </#if>
                     </div>