From 15a6a2cb51b698f81dbbc1ca8ee8b7cc93b03026 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Thu, 7 Oct 2021 17:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=E6=96=87=E7=AB=A0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Pagination.js |  2 +-
 layouts/DefaultLayout.js | 26 ++++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/components/Pagination.js b/components/Pagination.js
index 78f1c91e..d853a1a1 100644
--- a/components/Pagination.js
+++ b/components/Pagination.js
@@ -8,7 +8,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 mx-5'>
+    <div className=' my-10 flex justify-between font-medium text-black dark:text-gray-100'>
       <Link
         href={
           {
diff --git a/layouts/DefaultLayout.js b/layouts/DefaultLayout.js
index f4441502..7996ba85 100644
--- a/layouts/DefaultLayout.js
+++ b/layouts/DefaultLayout.js
@@ -77,15 +77,13 @@ const DefaultLayout = ({ tags, posts, page, currentTag, ...customMeta }) => {
 
   return (
     <div id='wrapper' className={theme}>
-      <CommonHead meta={meta}/>
+      <CommonHead meta={meta} />
       <div className={`${BLOG.font} flex bg-gray-100 dark:bg-black min-h-screen`}>
         {/* 侧边菜单 */}
         <SideBar tags={tags} currentTag={currentTag} />
         <main className='md:px-24 p-5 flex-grow'>
-          {(!page || page === 1) && (
-            <div className='py-5' />
-          )
-          }
+          {(!page || page === 1) && (<div className='py-5' />)}
+
           {/* 标签 */}
           {currentTag && (
             <div className='pb-5 dark:text-gray-200'>
@@ -93,35 +91,31 @@ const DefaultLayout = ({ tags, posts, page, currentTag, ...customMeta }) => {
               <hr />
             </div>
           )}
+
           {/* 当前搜索 */}
           {(currentSearch || (page && page !== 1)) && (
             <div className='pb-5'>
               <div className='dark:text-gray-200 flex justify-between py-1'>
-                {currentSearch && (
-                  <span>搜索关键词: {currentSearch}</span>
-                )}
-                {page && page !== 1 && (
-                  <span>页 {page} / {totalPages}</span>
-                )}
+                {currentSearch && (<span>搜索关键词: {currentSearch}</span>)}
+                {page && page !== 1 && (<span>页 {page} / {totalPages}</span>)}
               </div>
               <hr />
             </div>
           )}
 
-          {/* 文章列表 */}
           <div className='mx-auto'>
-            {/* <div className='col-4 grid md:grid-cols-2 grid-cols-1 gap-6'> */}
+            {/* 文章列表 */}
             <div style={{ columnCount: column }}>
               {!postsToShow.length && (
                 <p className='text-gray-500 dark:text-gray-300'>No posts found.</p>
               )}
               {postsToShow.map(post => (
-                  <BlogPost key={post.id} post={post} tags={tags} />
+                <BlogPost key={post.id} post={post} tags={tags} />
               ))}
             </div>
-          </div>
 
-          <Pagination page={page} showNext={showNext} />
+            <Pagination page={page} showNext={showNext} />
+          </div>
 
         </main>
       </div>