From 8cb7861da3690fe109a792f49fd08fbf2bf37818 Mon Sep 17 00:00:00 2001
From: XPoet <i@xpoet.cn>
Date: Sat, 5 Sep 2020 23:08:03 +0800
Subject: [PATCH] pref: change back2top position

---
 layout/_partial/tools.ejs             |  5 +++++
 layout/page.ejs                       | 12 +-----------
 source/css/layout/_partial/tools.styl | 11 +++++++----
 source/css/layout/page.styl           |  4 ++--
 source/js/scroll-to-top.js            |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/layout/_partial/tools.ejs b/layout/_partial/tools.ejs
index c168ab3..a59ccfe 100644
--- a/layout/_partial/tools.ejs
+++ b/layout/_partial/tools.ejs
@@ -17,5 +17,10 @@
         <li class="page-aside-toggle">
             <i class="fa fa-bars"></i>
         </li>
+        <% if (theme.back2top.enable) { %>
+            <li class="scroll-to-top">
+                <i class="fa fa-caret-up"></i>
+            </li>
+        <% } %>
     </ul>
 </div>
diff --git a/layout/page.ejs b/layout/page.ejs
index c16d7ea..f5ac7f3 100644
--- a/layout/page.ejs
+++ b/layout/page.ejs
@@ -59,17 +59,7 @@
         <%- partial('_partial/tools') %>
     </div>
 
-    <% if (theme.back2top.enable) { %>
-        <div class="scroll-to-top">
-            <ul>
-                <li>
-                        <span class="scroll-percent">
-                            <i class="fa fa-caret-up"></i>
-                        </span>
-                </li>
-            </ul>
-        </div>
-    <% } %>
+
 
     <!-- page aside -->
     <aside class="page-aside">
diff --git a/source/css/layout/_partial/tools.styl b/source/css/layout/_partial/tools.styl
index cf2e2ed..98892ca 100644
--- a/source/css/layout/_partial/tools.styl
+++ b/source/css/layout/_partial/tools.styl
@@ -20,6 +20,10 @@ $li-margin-bottom = 12px;
       margin-bottom: $li-margin-bottom;
       background: var(--background-color);
 
+      &:last-child {
+        margin-bottom: 0;
+      }
+
       if (hexo-config('magic.enable') == true) {
         magic-style(1.1, 1.1);
       } else {
@@ -32,7 +36,6 @@ $li-margin-bottom = 12px;
         background: var(--primary-color);
       }
 
-
       &.rss {
 
         a {
@@ -52,11 +55,11 @@ $li-margin-bottom = 12px;
       }
 
 
-      &:last-child {
-        margin-bottom: 0;
+      &.scroll-to-top {
+        display: none;
       }
 
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/source/css/layout/page.styl b/source/css/layout/page.styl
index 169dbe4..da0f3eb 100644
--- a/source/css/layout/page.styl
+++ b/source/css/layout/page.styl
@@ -151,7 +151,7 @@ $page-aside-width = 248px;
   }
 
 
-  .scroll-to-top {
+  /*.scroll-to-top {
     display: none;
     position: fixed;
 
@@ -186,6 +186,6 @@ $page-aside-width = 248px;
       }
     }
   }
-
+*/
 
 }
diff --git a/source/js/scroll-to-top.js b/source/js/scroll-to-top.js
index 66991e1..6512160 100644
--- a/source/js/scroll-to-top.js
+++ b/source/js/scroll-to-top.js
@@ -33,7 +33,7 @@
             scrollToTopDom.style.display = 'none';
             headerProgressDom.style.display = 'none';
         } else {
-            scrollToTopDom.style.display = 'block';
+            scrollToTopDom.style.display = 'flex';
             // scrollPercentDom.innerHTML = parseInt(percent) < 10 ? `0${percent}` : percent;
 
             headerProgressDom.style.display = 'block';