From 0e911f5ef3e4b7dd53c6b39bed41706084fc77df Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Wed, 13 Oct 2021 16:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F=E9=80=82?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Container.js  | 7 +++++--
 components/JumpToTop.js  | 2 +-
 components/Pagination.js | 2 +-
 layouts/ArticleLayout.js | 6 +-----
 layouts/DefaultLayout.js | 6 +-----
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/components/Container.js b/components/Container.js
index 90af14e8..018d3e39 100644
--- a/components/Container.js
+++ b/components/Container.js
@@ -3,6 +3,8 @@ import React, { useCallback, useEffect } from 'react'
 import CommonHead from '@/components/CommonHead'
 import TopNav from '@/components/TopNav'
 import throttle from 'lodash.throttle'
+import BLOG from '@/blog.config'
+import { useTheme } from '@/lib/theme'
 
 const Container = ({ children, layout, fullWidth, tags, meta, ...customMeta }) => {
   let windowTop = 0
@@ -28,12 +30,13 @@ const Container = ({ children, layout, fullWidth, tags, meta, ...customMeta }) =
       window.removeEventListener('scroll', scrollTrigger)
     }
   })
+  const { theme } = useTheme()
   return (
-    <>
+    <div className={[BLOG.font, theme].join(' ')}>
       <CommonHead meta={meta} />
       <TopNav tags={tags}/>
       {children}
-    </>
+    </div>
   )
 }
 
diff --git a/components/JumpToTop.js b/components/JumpToTop.js
index 8e03cc29..4b1415cd 100644
--- a/components/JumpToTop.js
+++ b/components/JumpToTop.js
@@ -35,7 +35,7 @@ const JumpToTop = ({ targetRef }) => {
       <div
         className='border dark:border-gray-500 dark:bg-gray-600 bg-white cursor-pointer hover:shadow-2xl'
         onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}>
-        <div className='absolute bg-white z-20 hover:opacity-0 w-11 py-2.5 text-center'>
+        <div className='absolute bg-white dark:text-gray-200 dark:bg-gray-600 z-20 hover:opacity-0 w-11 py-2.5 text-center'>
             {percent}%
         </div>
         <a className='dark:text-gray-200 fa fa-arrow-up p-4 transform hover:scale-150 duration-200'
diff --git a/components/Pagination.js b/components/Pagination.js
index 1a26bcd9..39b284f7 100644
--- a/components/Pagination.js
+++ b/components/Pagination.js
@@ -15,7 +15,7 @@ const Pagination = ({ page, showNext }) => {
   const router = useRouter()
   const currentPage = +page
   return (
-    <div className=' my-10 flex justify-between font-medium text-black dark:text-gray-100'>
+    <div className='my-10 flex justify-between font-medium text-black dark:text-gray-100 space-x-2'>
       <Link
         href={
           {
diff --git a/layouts/ArticleLayout.js b/layouts/ArticleLayout.js
index 326759f3..1b5e07cf 100644
--- a/layouts/ArticleLayout.js
+++ b/layouts/ArticleLayout.js
@@ -8,13 +8,10 @@ import Progress from '@/components/Progress'
 import { useRef } from 'react'
 import Image from 'next/image'
 import RewardButton from '@/components/RewardButton'
-import { useTheme } from '@/lib/theme'
 import BlogPostMini from '@/components/BlogPostMini'
 import { useRouter } from 'next/router'
 import ShareButton from '@/components/ShareButton'
 import JumpToTop from '@/components/JumpToTop'
-import CommonHead from '@/components/CommonHead'
-import TopNav from '@/components/TopNav'
 import SideBar from '@/components/SideBar'
 import Footer from '@/components/Footer'
 import Container from '@/components/Container'
@@ -38,11 +35,10 @@ const ArticleLayout = ({
     type: 'article'
   }
   const targetRef = useRef(null)
-  const { theme } = useTheme()
   const url = BLOG.link + useRouter().asPath
 
   return (
-    <Container className={`${BLOG.font} ${theme}`} meta={meta} tags={tags}>
+    <Container meta={meta} tags={tags}>
 
       {/* live2d 看板娘 */}
        <script async src='https://cdn.jsdelivr.net/gh/stevenjoezhang/live2d-widget@latest/autoload.js' />
diff --git a/layouts/DefaultLayout.js b/layouts/DefaultLayout.js
index b4f4c1b6..60e74e61 100644
--- a/layouts/DefaultLayout.js
+++ b/layouts/DefaultLayout.js
@@ -4,8 +4,6 @@ import Pagination from '@/components/Pagination'
 import BLOG from '@/blog.config'
 import { useRouter } from 'next/router'
 import { useTheme } from '@/lib/theme'
-import CommonHead from '@/components/CommonHead'
-import TopNav from '@/components/TopNav'
 import Tags from '@/components/Tags'
 import SideBar from '@/components/SideBar'
 import Footer from '@/components/Footer'
@@ -47,10 +45,8 @@ const DefaultLayout = ({ tags, posts, page, currentTag, ...customMeta }) => {
     showNext = page * BLOG.postsPerPage < totalPosts
   }
 
-  const { theme } = useTheme()
-
   return (
-    <Container id='wrapper' className={theme} meta={meta} tags={tags}>
+    <Container id='wrapper' meta={meta} tags={tags}>
 
       <div className={`${BLOG.font} flex justify-between bg-gray-100 dark:bg-black min-h-screen`}>
         {/* 侧边菜单 */}