Merge branch 'fix/css-bug'

themes/next/LayoutSlug.js

@@ -19,32 +19,23 @@ export const LayoutSlug = (props) => {
     }} /></div>
     : null
 
-  if (!post) {
+  const rightAreaSlog = CONFIG_NEXT.RIGHT_LATEST_POSTS && <Card><LatestPostsGroup latestPosts={latestPosts} /></Card>
-    return <LayoutBase
-          {...props}
-          rightAreaSlot={
-            CONFIG_NEXT.RIGHT_LATEST_POSTS && <Card><LatestPostsGroup posts={latestPosts} /></Card>
-          }
-        />
-  }
 
   return (
     <LayoutBase
       {...props}
       floatSlot={floatSlot}
-      rightAreaSlot={
+      rightAreaSlot={rightAreaSlog}
-        CONFIG_NEXT.RIGHT_LATEST_POSTS && <Card><LatestPostsGroup posts={latestPosts} /></Card>
-      }
     >
 
-      {!lock && <ArticleDetail {...props} />}
+      {post && !lock && <ArticleDetail {...props} />}
 
-      {lock && <ArticleLock validPassword={validPassword} />}
+      {post && lock && <ArticleLock validPassword={validPassword} />}
 
       {/* 悬浮目录按钮 */}
-      <div className='block lg:hidden'>
+      {post && <div className='block lg:hidden'>
         <TocDrawer post={post} cRef={drawerRight} targetRef={targetRef} />
-      </div>
+      </div>}
 
     </LayoutBase>
   )

themes/next/components/ArticleDetail.js

@@ -30,7 +30,7 @@ export default function ArticleDetail(props) {
             data-aos="fade-down"
             data-aos-duration="300"
             data-aos-easing="ease-in-out"
-            data-aos-once="false"
+            data-aos-once="true"
             data-aos-anchor-placement="top-bottom"
 
             className="shadow md:hover:shadow-2xl overflow-x-auto flex-grow mx-auto w-screen md:w-full ">