From 807b0f04eff760fa059e3f04d11456ff3fe453c5 Mon Sep 17 00:00:00 2001
From: tangly1024 <tlyong1992@hotmail.com>
Date: Mon, 20 Dec 2021 17:23:25 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E7=BC=96=E8=AF=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ArticleDetail.js | 2 +-
 components/SideArea.js      | 8 ++++----
 components/SideAreaRight.js | 8 ++++----
 components/StickyBar.js     | 2 +-
 pages/tag/[tag].js          | 5 ++++-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/components/ArticleDetail.js b/components/ArticleDetail.js
index 010e8c15..c7f9a011 100644
--- a/components/ArticleDetail.js
+++ b/components/ArticleDetail.js
@@ -41,7 +41,7 @@ export default function ArticleDetail ({ post, blockMap, recommendPosts, prev, n
   return (<>
       <div id="article-wrapper" ref={targetRef} className="flex-grow mt-14 md:mt-0 max-w-5xl mx-auto w-screen md:w-full ">
           <article itemScope itemType="https://schema.org/Movie"
-            className="rounded-xl shadow-md duration-300 hover:shadow-2xl animate__fadeIn animate__animated subpixel-antialiased py-10 px-5 lg:pt-24 md:px-24 xl:px-48 dark:border-gray-700 bg-white dark:bg-gray-900"
+            className="rounded-xl shadow-md hover:shadow-2xl duration-300 animate__fadeIn animate__animated subpixel-antialiased py-10 px-5 lg:pt-24 md:px-24 xl:px-32 dark:border-gray-700 bg-white  dark:bg-gray-900"
           >
             <header>
                 {post.type && !post.type.includes('Page') && post?.page_cover && (
diff --git a/components/SideArea.js b/components/SideArea.js
index 7f945890..828a3ea1 100644
--- a/components/SideArea.js
+++ b/components/SideArea.js
@@ -28,12 +28,12 @@ const SideArea = ({ title, tags, currentTag, post, posts, categories, currentCat
 
     <div className={(!post ? 'sticky top-5' : '') + ' pb-4'}>
 
-      <section className='hidden lg:block bg-white dark:bg-gray-800 rounded-xl hover:shadow-2xl duration-200 py-8 shadow-lg'>
+      <section className='hidden lg:block bg-white dark:bg-gray-800 rounded-xl hover:shadow-2xl duration-200 py-8 shadow-md'>
         <InfoCard />
       </section>
 
       {/* 菜单 */}
-      <section className='hidden lg:block mt-5 py-5 rounded-xl shadow-lg bg-white dark:bg-gray-800  hover:shadow-2xl duration-200'>
+      <section className='hidden lg:block mt-5 py-5 rounded-xl shadow-md bg-white dark:bg-gray-800  hover:shadow-2xl duration-200'>
         <MenuButtonGroup allowCollapse={true} />
         <div className='px-5 pt-2'>
            <SearchInput currentTag={currentTag} currentSearch={currentSearch} />
@@ -42,7 +42,7 @@ const SideArea = ({ title, tags, currentTag, post, posts, categories, currentCat
 
       {/* 分类  */}
       {!post && categories && (
-        <section className='rounded-xl shadow-lg py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200'>
+        <section className='rounded-xl shadow-md py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200'>
           <div className='text-sm px-5 mb-2 flex flex-nowrap justify-between font-light'>
             <div className='pb-1 text-gray-600 dark:text-gray-200'><FontAwesomeIcon icon={faThList} className='mr-2' />{locale.COMMON.CATEGORY}</div>
             <Link href='/category' passHref>
@@ -58,7 +58,7 @@ const SideArea = ({ title, tags, currentTag, post, posts, categories, currentCat
     </div>
 
     {post && post.toc && post.toc.length > 1 && (
-      <section id='left-toc' className='sticky top-6 pb-20 rounded-xl shadow-lg bg-white dark:bg-gray-800 hover:shadow-2xl duration-200'>
+      <section id='left-toc' className='sticky top-6 pb-20 rounded-xl shadow-md bg-white dark:bg-gray-800 hover:shadow-2xl duration-200'>
         <div className='border-b text-2xl bg-white text-black rounded-t-xl dark:border-gray-700 dark:bg-gray-700 dark:text-white py-6 px-6'>
           {locale.COMMON.TABLE_OF_CONTENTS}
         </div>
diff --git a/components/SideAreaRight.js b/components/SideAreaRight.js
index 479505dd..4e7e84f2 100644
--- a/components/SideAreaRight.js
+++ b/components/SideAreaRight.js
@@ -38,7 +38,7 @@ const SideAreaRight = ({
 
   return (
     <>
-      <section className="rounded-xl shadow-lg py-4 px-2 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200">
+      <section className="rounded-xl shadow-md py-4 px-2 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200">
         {/* 展示广告  */}
         <ins
           className="adsbygoogle"
@@ -54,7 +54,7 @@ const SideAreaRight = ({
       <div className="sticky top-5">
         {/* 最新文章 */}
         {posts && (
-          <section className="rounded-xl shadow-lg py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200">
+          <section className="rounded-xl shadow-md py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200">
             <div className="text-sm pb-2 px-5  flex flex-nowrap justify-between">
               <div className="font-light text-gray-600  dark:text-gray-200">
                 <FontAwesomeIcon icon={faArchive} className="mr-2" />
@@ -68,7 +68,7 @@ const SideAreaRight = ({
 
         {/* 标签云  */}
         {tags && (
-          <section className="rounded-xl shadow-lg py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200">
+          <section className="rounded-xl shadow-md py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200">
             <div className="text-sm pb-1 px-5 flex flex-nowrap justify-between font-light dark:text-gray-200">
               <div className="text-gray-600 dark:text-gray-200">
                 <FontAwesomeIcon icon={faTags} className="mr-2" />
@@ -89,7 +89,7 @@ const SideAreaRight = ({
 
         {/* 分类  */}
         {post && categories && (
-          <section className='rounded-xl shadow-lg py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200'>
+          <section className='rounded-xl shadow-md py-4 mt-5 bg-white dark:bg-gray-800 hover:shadow-2xl duration-200'>
             <div className='text-sm px-5 mb-2 flex flex-nowrap justify-between font-light'>
               <div className='pb-1 text-gray-600 dark:text-gray-200'><FontAwesomeIcon icon={faThList} className='mr-2' />{locale.COMMON.CATEGORY}</div>
               <Link href='/category' passHref>
diff --git a/components/StickyBar.js b/components/StickyBar.js
index 18f10349..05b4c2c6 100644
--- a/components/StickyBar.js
+++ b/components/StickyBar.js
@@ -9,7 +9,7 @@ const StickyBar = ({ children }) => {
   if (!children) return <></>
   return (
     <div id='sticky-bar' className='sticky flex-grow justify-center top-14 md:top-0 duration-500 z-10 pb-16'>
-      <div className='bg-white dark:bg-gray-800 dark:border-gray-600 px-5 absolute rounded-none md:rounded-xl shadow-xl border w-full hidden-scroll'>
+      <div className='bg-white dark:bg-gray-800 dark:border-gray-600 px-5 mx-2 absolute rounded-none md:rounded-xl shadow-xl border w-full hidden-scroll'>
           <div id='tag-container' className="md:pl-3 overflow-x-auto">
               { children }
           </div>
diff --git a/pages/tag/[tag].js b/pages/tag/[tag].js
index 380f75ad..ecee3a7c 100644
--- a/pages/tag/[tag].js
+++ b/pages/tag/[tag].js
@@ -14,7 +14,10 @@ export default function Tag ({ tags, allPosts, filteredPosts, tag, categories })
   }
 
   // 将当前选中的标签置顶🔝
-  const newTags = [tags.find(r => r.name === tag)].concat(tags.filter(r => r.name !== tag))
+  if (!tags) tags = []
+  const currentTag = tags?.find(r => r?.name === tag)
+  const newTags = currentTag ? [currentTag].concat(tags.filter(r => r?.name !== tag)) : tags.filter(r => r?.name !== tag)
+
   return <BaseLayout meta={meta} tags={tags} currentTag={tag} categories={categories} totalPosts={allPosts}>
       <StickyBar>
           <TagList tags={newTags} currentTag={tag}/>