From 057ca44de6c607a1bd8e1483f928bd0bdd5b1984 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Tue, 21 Dec 2021 16:45:44 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E6=96=87=E7=AB=A0=E6=BA=A2=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ArticleDetail.js    | 2 +-
 components/BlogPostCard.js     | 6 +++---
 components/LoadingCover.js     | 2 +-
 components/ThirdPartyScript.js | 7 -------
 layouts/BaseLayout.js          | 6 ++----
 lib/busuanzi.js                | 2 +-
 pages/archive/index.js         | 2 +-
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/components/ArticleDetail.js b/components/ArticleDetail.js
index d9fd7703..e00fa544 100644
--- a/components/ArticleDetail.js
+++ b/components/ArticleDetail.js
@@ -102,7 +102,7 @@ export default function ArticleDetail ({ post, blockMap, recommendPosts, prev, n
             </header>
 
             {/* Notion文章主体 */}
-            <section id='notion-article'>
+            <section id='notion-article' className='overflow-x-auto'>
               {blockMap && (
                 <NotionRenderer
                   className={`${BLOG.font}`}
diff --git a/components/BlogPostCard.js b/components/BlogPostCard.js
index 2a1f5dbf..0a87e6c9 100644
--- a/components/BlogPostCard.js
+++ b/components/BlogPostCard.js
@@ -8,7 +8,7 @@ import TagItemMini from './TagItemMini'
 
 const BlogPostCard = ({ post, tags }) => {
   return (
-    <div key={post.id} className='flex 2xl:flex-row flex-col-reverse justify-between hover:shadow-2xl shadow-md mb-8 duration-300 rounded-xl
+    <div key={post.id} className='flex xl:flex-row flex-col-reverse justify-between hover:shadow-2xl shadow-md mb-8 duration-300 rounded-xl
       w-full mx-2 bg-white dark:bg-gray-800 dark:hover:bg-gray-700 dark:border-gray-600'>
 
       <div className='p-8 flex flex-col justify-between w-full'>
@@ -41,8 +41,8 @@ const BlogPostCard = ({ post, tags }) => {
 
       {post?.page_cover && (
         <Link href={`${BLOG.path}/article/${post.slug}`} passHref>
-        <div className='h-60 w-full 2xl:max-w-sm relative rounded-t-xl 2xl:rounded-t-none 2xl:rounded-r-xl 2xl:h-full duration-200 cursor-pointer transform overflow-hidden'>
-          <Image className='hover:scale-105 transform duration-500 rounded-t-xl 2xl:rounded-t-none 2xl:rounded-r-xl' src={post?.page_cover} alt={post.title} layout='fill' objectFit='cover' loading='lazy' />
+        <div className='h-60 w-full xl:max-w-sm relative rounded-t-xl xl:rounded-t-none xl:rounded-r-xl xl:h-full duration-200 cursor-pointer transform overflow-hidden'>
+          <Image className='hover:scale-105 transform duration-500 rounded-t-xl xl:rounded-t-none xl:rounded-r-xl' src={post?.page_cover} alt={post.title} layout='fill' objectFit='cover' loading='lazy' />
         </div>
       </Link>
       )}
diff --git a/components/LoadingCover.js b/components/LoadingCover.js
index 1bbc0de1..b00a8317 100644
--- a/components/LoadingCover.js
+++ b/components/LoadingCover.js
@@ -2,7 +2,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faSpinner } from '@fortawesome/free-solid-svg-icons'
 
 export default function LoadingCover () {
-  return (<div id="loading-cover" className={'md:-mt-20 flex-grow dark:text-white text-black animate__animated animate__fadeIn flex-grow flex flex-col justify-center z-10 w-full h-screen container mx-auto'}>
+  return (<div id="loading-cover" className={'md:-mt-20 flex-grow dark:text-white text-black animate__animated animate__fadeIn flex flex-col justify-center z-10 w-full h-screen container mx-auto'}>
   <div className="mx-auto">
     <FontAwesomeIcon icon={faSpinner} spin size='2x'/>
   </div>
diff --git a/components/ThirdPartyScript.js b/components/ThirdPartyScript.js
index 37ae0f19..c30d3c2e 100644
--- a/components/ThirdPartyScript.js
+++ b/components/ThirdPartyScript.js
@@ -37,13 +37,6 @@ const ThirdPartyScript = () => {
       />
     </>)}
 
-    {/* 不蒜子
-    {BLOG.analytics.busuanzi && (
-      <script async
-              src={'//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js'}
-      />
-    )} */}
-
     {/* 代码统计 */}
     {BLOG.isProd && (<>
 
diff --git a/layouts/BaseLayout.js b/layouts/BaseLayout.js
index 8738af70..1985be52 100644
--- a/layouts/BaseLayout.js
+++ b/layouts/BaseLayout.js
@@ -71,14 +71,13 @@ const BaseLayout = ({
       {/* 顶部导航栏 */}
       <TopNav tags={tags} post={post} posts={totalPosts} currentSearch={currentSearch} categories={categories} currentCategory={currentCategory} />
 
-      <div className='flex justify-center px-5'>
-        <div className='mx-auto flex md:pt-8 pb-12'>
+      <div className='flex justify-center px-5 flex-1 mx-auto md:pt-8 pb-12'>
 
           <div id='left' className='hidden lg:block flex-col w-72'>
             <SideAreaLeft title={meta.title} post={post} posts={totalPosts} tags={tags} currentSearch={currentSearch} currentTag={currentTag} categories={categories} currentCategory={currentCategory} />
           </div>
 
-          <div id='center' className='flex max-w-4xl min-h-screen md:mx-10' ref={targetRef}>
+          <div id='center' className='flex-grow max-w-4xl min-h-screen md:mx-10' ref={targetRef}>
             {onLoading
               ? <LoadingCover/>
               : <>
@@ -91,7 +90,6 @@ const BaseLayout = ({
             <SideAreaRight post={post} posts={totalPosts} tags={tags} currentSearch={currentSearch} currentTag={currentTag} categories={categories} currentCategory={currentCategory}/>
           </div>
 
-        </div>
       </div>
 
       <Footer title={meta.title}/>
diff --git a/lib/busuanzi.js b/lib/busuanzi.js
index a7b854fa..9295a418 100644
--- a/lib/busuanzi.js
+++ b/lib/busuanzi.js
@@ -55,7 +55,7 @@ bszCaller = {
 const fetch = () => {
   bszTag && bszTag.hides()
   bszCaller.fetch('//busuanzi.ibruce.info/busuanzi?jsonpCallback=BusuanziCallback', function (t) {
-    console.log('不蒜子请求结果',t)
+    // console.log('不蒜子请求结果',t)
     bszTag.texts(t), bszTag.shows()
   })
 }
diff --git a/pages/archive/index.js b/pages/archive/index.js
index e9e779cd..634e2714 100644
--- a/pages/archive/index.js
+++ b/pages/archive/index.js
@@ -69,7 +69,7 @@ const Index = ({ allPosts, tags, categories }) => {
 
   return (
     <BaseLayout meta={meta} tags={tags} categories={categories}>
-        <div className='mb-10 pb-20 bg-white md:p-12 p-3 dark:bg-gray-800 rounded-xl shadow-md '>
+        <div className='mb-10 pb-20 bg-white md:p-12 p-3 dark:bg-gray-800 rounded-xl shadow-md min-h-full'>
           {Object.keys(archivePosts).map(archiveTitle => (
              <BlogPostArchive key={archiveTitle} posts={archivePosts[archiveTitle]} archiveTitle={archiveTitle}/>
           ))}