From 7e8703517a9988af225b2dcebb5a4530d46d2ed0 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Tue, 8 Mar 2022 15:25:07 +0800
Subject: [PATCH] =?UTF-8?q?hexo=20=E4=B8=BB=E9=A2=98=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/Hexo/LayoutBase.js                                  | 2 +-
 themes/Hexo/components/FloatDarkModeButton.js              | 2 +-
 themes/Hexo/components/Footer.js                           | 7 ++++---
 themes/Hexo/components/InfoCard.js                         | 4 ++--
 themes/Hexo/components/JumpToCommentButton.js              | 2 +-
 themes/Hexo/components/JumpToTopButton.js                  | 6 +++---
 .../components/{MenuButtonGroup.js => MenuGroupCard.js}    | 4 ++--
 themes/Hexo/components/PaginationNumber.js                 | 2 +-
 themes/Hexo/components/TocDrawerButton.js                  | 4 ++--
 themes/Hexo/components/TopNav.js                           | 2 +-
 10 files changed, 18 insertions(+), 17 deletions(-)
 rename themes/Hexo/components/{MenuButtonGroup.js => MenuGroupCard.js} (95%)

diff --git a/themes/Hexo/LayoutBase.js b/themes/Hexo/LayoutBase.js
index 25163fcd..dd186e06 100644
--- a/themes/Hexo/LayoutBase.js
+++ b/themes/Hexo/LayoutBase.js
@@ -55,7 +55,7 @@ const LayoutBase = (props) => {
     </main>
 
      {/* 右下角悬浮 */}
-     <div className='bottom-12 right-2 fixed justify-end z-20 font-sans'>
+     <div className='bottom-12 right-0 fixed justify-end z-20 font-sans'>
         <div className={(show ? 'animate__animated ' : 'hidden') + ' animate__fadeInUp  justify-center duration-500  animate__faster flex flex-col items-center cursor-pointer '}>
           <FloatDarkModeButton/>
           {floatSlot}
diff --git a/themes/Hexo/components/FloatDarkModeButton.js b/themes/Hexo/components/FloatDarkModeButton.js
index f69d58f6..196a7875 100644
--- a/themes/Hexo/components/FloatDarkModeButton.js
+++ b/themes/Hexo/components/FloatDarkModeButton.js
@@ -21,7 +21,7 @@ export default function FloatDarkModeButton () {
   return (
     <div
       onClick={handleChangeDarkMode}
-      className={'justify-center items-center text-white bg-blue-400 w-7 h-7 text-center transform hover:scale-105 duration-200'
+      className={'justify-center items-center text-white bg-gray-400 w-7 h-7 text-center transform hover:scale-105 duration-200'
       }
     >
       <i id="darkModeButton" className={`${isDarkMode ? 'fa-sun' : 'fa-moon'} fas text-xs`}/>
diff --git a/themes/Hexo/components/Footer.js b/themes/Hexo/components/Footer.js
index 50aacc75..c8612410 100644
--- a/themes/Hexo/components/Footer.js
+++ b/themes/Hexo/components/Footer.js
@@ -7,14 +7,15 @@ const Footer = ({ title }) => {
   const startYear = BLOG.SINCE && BLOG.SINCE !== currentYear && BLOG.SINCE + '-'
   return (
     <footer
-      className='dark:bg-gray-900 flex-shrink-0 justify-center text-center m-auto w-full leading-6 text-gray-400 text-sm p-6'
+      className='font-sans dark:bg-gray-900 flex-shrink-0 bg-blue-400 justify-center text-center m-auto w-full leading-6 text-gray-100 text-sm p-6'
     >
-      <i className='fas fa-copyright' /> {`${startYear}${currentYear}`} <span><i className='mx-1 animate-pulse fas fa-heart'/> <a href={BLOG.LINK} className='underline font-bold text-gray-500 dark:text-gray-300 '>{BLOG.AUTHOR}</a>.
+      <i className='fas fa-copyright' /> {`${startYear}${currentYear}`} <span><i className='mx-1 animate-pulse fas fa-heart'/> <a href={BLOG.LINK} className='underline font-bold text-gray-50 dark:text-gray-300 '>{BLOG.AUTHOR}</a>.
       <br/>
 
-      <span>Powered by <a href='https://notion.so' className='underline font-bold text-gray-500 dark:text-gray-300'>Notion</a> & <a href='https://github.com/tangly1024/NotionNext' className='underline font-bold text-gray-500 dark:text-gray-300'>NotionNext</a>.</span></span>
+      <span>Powered by <a href='https://notion.so' className='underline font-bold text-gray-50 dark:text-gray-300'>Notion</a> & <a href='https://github.com/tangly1024/NotionNext' className='underline font-bold text-gray-50 dark:text-gray-300'>NotionNext</a>.</span></span>
 
       {BLOG.BEI_AN && <><br /><i className='fas fa-shield-alt' /> <a href='https://beian.miit.gov.cn/' className='mr-2'>{BLOG.BEI_AN}</a><br/></>}
+      <br/>
       <span className='hidden busuanzi_container_site_pv'>
             <i className='fas fa-eye'/><span className='px-1 busuanzi_value_site_pv'> </span>  </span>
       <span className='pl-2 hidden busuanzi_container_site_uv'>
diff --git a/themes/Hexo/components/InfoCard.js b/themes/Hexo/components/InfoCard.js
index 81e7b6ee..6836ad9f 100644
--- a/themes/Hexo/components/InfoCard.js
+++ b/themes/Hexo/components/InfoCard.js
@@ -3,7 +3,7 @@ import Image from 'next/image'
 import { useRouter } from 'next/router'
 import Card from './Card'
 import SocialButton from './SocialButton'
-import MenuButtonGroup from './MenuButtonGroup'
+import MenuGroupCard from './MenuGroupCard'
 export function InfoCard (props) {
   const router = useRouter()
   return <Card>
@@ -23,7 +23,7 @@ export function InfoCard (props) {
       />
     </div>
     <div className='text-center font-sans text-xl pb-4 dark:text-gray-300'>{BLOG.TITLE}</div>
-    <MenuButtonGroup {...props}/>
+    <MenuGroupCard {...props}/>
     <SocialButton />
   </Card>
 }
diff --git a/themes/Hexo/components/JumpToCommentButton.js b/themes/Hexo/components/JumpToCommentButton.js
index a793c3c7..736468d4 100644
--- a/themes/Hexo/components/JumpToCommentButton.js
+++ b/themes/Hexo/components/JumpToCommentButton.js
@@ -17,7 +17,7 @@ const JumpToCommentButton = () => {
     }
   }
 
-  return (<div className='flex space-x-1 items-center justify-center transform hover:scale-105 duration-200 text-white bg-blue-400 w-7 h-7 text-center' onClick={navToComment} >
+  return (<div className='flex space-x-1 items-center justify-center transform hover:scale-105 duration-200 text-white bg-gray-400 w-7 h-7 text-center' onClick={navToComment} >
           <i className='fas fa-comment text-xs' />
     </div>)
 }
diff --git a/themes/Hexo/components/JumpToTopButton.js b/themes/Hexo/components/JumpToTopButton.js
index 25a186d7..de1bce3d 100644
--- a/themes/Hexo/components/JumpToTopButton.js
+++ b/themes/Hexo/components/JumpToTopButton.js
@@ -15,9 +15,9 @@ const JumpToTopButton = ({ showPercent = true, percent }) => {
     return <></>
   }
   const { locale } = useGlobal()
-  return (<div className='flex space-x-1 items-center justify-center transform hover:scale-105 duration-200 text-white bg-blue-400 w-7 h-7 text-center' onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })} >
-        {!showPercent && <div title={locale.POST.TOP} ><i className='fas fa-arrow-up text-xs' /></div>}
-        {showPercent && (<div className='text-xs block lg:hidden'>{percent}</div>)}
+  return (<div className='space-x-1 items-center justify-center transform hover:scale-105 duration-200 text-white bg-gray-400 w-7 h-auto pb-1 text-center' onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })} >
+        <div title={locale.POST.TOP} ><i className='fas fa-arrow-up text-xs' /></div>
+        {showPercent && (<div className='text-xs hidden lg:block'>{percent}</div>)}
     </div>)
 }
 
diff --git a/themes/Hexo/components/MenuButtonGroup.js b/themes/Hexo/components/MenuGroupCard.js
similarity index 95%
rename from themes/Hexo/components/MenuButtonGroup.js
rename to themes/Hexo/components/MenuGroupCard.js
index e0e6946c..0ff25e37 100644
--- a/themes/Hexo/components/MenuButtonGroup.js
+++ b/themes/Hexo/components/MenuGroupCard.js
@@ -3,7 +3,7 @@ import Link from 'next/link'
 import { useGlobal } from '@/lib/global'
 import CONFIG_HEXO from '../config_hexo'
 
-const MenuButtonGroup = (props) => {
+const MenuGroupCard = (props) => {
   const { postCount, categories, tags } = props
   const { locale } = useGlobal()
   const archiveSlot = <div className='text-center'>{postCount}</div>
@@ -33,4 +33,4 @@ const MenuButtonGroup = (props) => {
       })}
     </nav>
 }
-export default MenuButtonGroup
+export default MenuGroupCard
diff --git a/themes/Hexo/components/PaginationNumber.js b/themes/Hexo/components/PaginationNumber.js
index 7224e078..56942531 100644
--- a/themes/Hexo/components/PaginationNumber.js
+++ b/themes/Hexo/components/PaginationNumber.js
@@ -48,7 +48,7 @@ const PaginationNumber = ({ page, totalPage }) => {
 
 function getPageElement (page, currentPage) {
   return <Link href={page === 1 ? '/' : `/page/${page}`} key={page} passHref>
-      <a className={(page + '' === currentPage + '' ? 'font-bold bg-blue-500 dark:bg-blue-400 text-white ' : 'border-t-2 duration-500 border-white hover:border-blue-400 ') +
+      <a className={(page + '' === currentPage + '' ? 'font-bold bg-blue-400 dark:bg-blue-500 text-white ' : 'border-t-2 duration-500 border-white hover:border-blue-400 ') +
       ' border-white dark:border-blue-700 dark:hover:border-blue-400 cursor-pointer pb-0.5 w-6 text-center font-light hover:font-bold'}>
       {page}
       </a>
diff --git a/themes/Hexo/components/TocDrawerButton.js b/themes/Hexo/components/TocDrawerButton.js
index 4554ca8c..a4bba1a4 100644
--- a/themes/Hexo/components/TocDrawerButton.js
+++ b/themes/Hexo/components/TocDrawerButton.js
@@ -14,8 +14,8 @@ const TocDrawerButton = (props) => {
     return <></>
   }
   const { locale } = useGlobal()
-  return (<div onClick={props.onClick} className='py-2 px-3 cursor-pointer text-white transform duration-200 flex justify-center items-center bg-blue-400 w-7 h-7 text-center' title={locale.POST.TOP} >
-    <i className='fas fa-list-ol'/>
+  return (<div onClick={props.onClick} className='py-2 px-3 cursor-pointer text-white transform duration-200 flex justify-center items-center bg-gray-400 w-7 h-7 text-center' title={locale.POST.TOP} >
+    <i className='fas fa-list-ol text-xs'/>
   </div>)
 }
 
diff --git a/themes/Hexo/components/TopNav.js b/themes/Hexo/components/TopNav.js
index 8936325a..b2b73433 100644
--- a/themes/Hexo/components/TopNav.js
+++ b/themes/Hexo/components/TopNav.js
@@ -27,7 +27,7 @@ const TopNav = (props) => {
     const scrollS = window.scrollY
     const nav = document.querySelector('#sticky-nav')
     const header = document.querySelector('#header')
-    const showNav = (scrollS > 10 && scrollS < windowTop) || (header && scrollS < 5) // 非首页无大图时影藏顶部 滚动条置顶时隐藏
+    const showNav = (scrollS > 0 && scrollS < windowTop) || (header && scrollS < 5) // 非首页无大图时影藏顶部 滚动条置顶时隐藏
 
     if (!showNav) {
       nav && nav.classList.replace('top-0', '-top-20')