From 4d6df0ef683cd983bb711c093a79d26ea0cf371e Mon Sep 17 00:00:00 2001
From: kitety <aizaizuori@foxmail.com>
Date: Thu, 25 May 2023 21:31:44 +0800
Subject: [PATCH 1/3] fix: wrapper style paddingTop

---
 themes/hexo/LayoutBase.js   | 5 ++++-
 themes/matery/LayoutBase.js | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/themes/hexo/LayoutBase.js b/themes/hexo/LayoutBase.js
index 27c8e1a9..21f2cffd 100644
--- a/themes/hexo/LayoutBase.js
+++ b/themes/hexo/LayoutBase.js
@@ -12,6 +12,7 @@ import { useGlobal } from '@/lib/global'
 import BLOG from '@/blog.config'
 import dynamic from 'next/dynamic'
 import { isBrowser, loadExternalResource } from '@/lib/utils'
+import CONFIG_HEXO from './config_hexo'
 
 const FacebookPage = dynamic(
   () => {
@@ -65,6 +66,8 @@ const LayoutBase = props => {
   if (isBrowser()) {
     loadExternalResource('/css/theme-hexo.css', 'css')
   }
+
+  const fixStyleObject = !CONFIG_HEXO.HOME_BANNER_ENABLE ? { paddingTop: '4rem' }:{}
   return (
     <div id='theme-hexo'>
       <CommonHead meta={meta} siteInfo={siteInfo}/>
@@ -73,7 +76,7 @@ const LayoutBase = props => {
 
       {headerSlot}
 
-      <main id="wrapper" className="bg-hexo-background-gray dark:bg-black w-full py-8 md:px-8 lg:px-24 min-h-screen relative">
+      <main id="wrapper" className="bg-hexo-background-gray dark:bg-black w-full py-8 md:px-8 lg:px-24 min-h-screen relative" style={fixStyleObject}>
         <div id="container-inner" className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' w-full mx-auto lg:flex lg:space-x-4 justify-center relative z-10'} >
           <div className={'w-full max-w-4xl h-full ' + props.className}>
             {onLoading ? <LoadingCover /> : children}
diff --git a/themes/matery/LayoutBase.js b/themes/matery/LayoutBase.js
index 5e699117..6dbac0d6 100644
--- a/themes/matery/LayoutBase.js
+++ b/themes/matery/LayoutBase.js
@@ -12,6 +12,7 @@ import FloatDarkModeButton from './components/FloatDarkModeButton'
 import throttle from 'lodash.throttle'
 import { isBrowser, loadExternalResource } from '@/lib/utils'
 import SocialButton from './components/SocialButton'
+import CONFIG_MATERY from './config_matery'
 
 /**
  * 基础布局 采用左右两侧布局，移动端使用顶部导航栏
@@ -41,6 +42,7 @@ const LayoutBase = props => {
   if (isBrowser()) {
     loadExternalResource('/css/theme-matery.css', 'css')
   }
+  const fixStyleObject = !CONFIG_MATERY.HOME_BANNER_ENABLE ? { paddingTop: '4rem' } : {}
 
   return (
         <div id='theme-matery' className="min-h-screen flex flex-col justify-between bg-hexo-background-gray dark:bg-black w-full">
@@ -51,7 +53,7 @@ const LayoutBase = props => {
 
             {headerSlot}
 
-            <main id="wrapper" className="flex-1 w-full py-8 md:px-8 lg:px-24 relative">
+            <main id="wrapper" className="flex-1 w-full py-8 md:px-8 lg:px-24 relative" style={fixStyleObject}>
                 {/* 嵌入区域 */}
                                <div id="container-slot" className={`w-full max-w-6xl ${props?.post && ' lg:max-w-3xl 2xl:max-w-4xl '} mt-6 px-3 mx-auto lg:flex lg:space-x-4 justify-center relative z-10`}>
                    {props.containerSlot}

From bc6b64ed21c21b121e4ea6251bba0baf71eb08b1 Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Mon, 29 May 2023 12:04:54 +0800
Subject: [PATCH 2/3] tailwindCSS

---
 themes/hexo/LayoutBase.js   | 3 +--
 themes/matery/LayoutBase.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/themes/hexo/LayoutBase.js b/themes/hexo/LayoutBase.js
index 21f2cffd..8c2d72f2 100644
--- a/themes/hexo/LayoutBase.js
+++ b/themes/hexo/LayoutBase.js
@@ -67,7 +67,6 @@ const LayoutBase = props => {
     loadExternalResource('/css/theme-hexo.css', 'css')
   }
 
-  const fixStyleObject = !CONFIG_HEXO.HOME_BANNER_ENABLE ? { paddingTop: '4rem' }:{}
   return (
     <div id='theme-hexo'>
       <CommonHead meta={meta} siteInfo={siteInfo}/>
@@ -76,7 +75,7 @@ const LayoutBase = props => {
 
       {headerSlot}
 
-      <main id="wrapper" className="bg-hexo-background-gray dark:bg-black w-full py-8 md:px-8 lg:px-24 min-h-screen relative" style={fixStyleObject}>
+      <main id="wrapper" className={`${CONFIG_HEXO.HOME_BANNER_ENABLE ? '' : 'pt-16'} bg-hexo-background-gray dark:bg-black w-full py-8 md:px-8 lg:px-24 min-h-screen relative`}>
         <div id="container-inner" className={(BLOG.LAYOUT_SIDEBAR_REVERSE ? 'flex-row-reverse' : '') + ' w-full mx-auto lg:flex lg:space-x-4 justify-center relative z-10'} >
           <div className={'w-full max-w-4xl h-full ' + props.className}>
             {onLoading ? <LoadingCover /> : children}
diff --git a/themes/matery/LayoutBase.js b/themes/matery/LayoutBase.js
index 6dbac0d6..282cc44b 100644
--- a/themes/matery/LayoutBase.js
+++ b/themes/matery/LayoutBase.js
@@ -42,7 +42,6 @@ const LayoutBase = props => {
   if (isBrowser()) {
     loadExternalResource('/css/theme-matery.css', 'css')
   }
-  const fixStyleObject = !CONFIG_MATERY.HOME_BANNER_ENABLE ? { paddingTop: '4rem' } : {}
 
   return (
         <div id='theme-matery' className="min-h-screen flex flex-col justify-between bg-hexo-background-gray dark:bg-black w-full">
@@ -53,7 +52,7 @@ const LayoutBase = props => {
 
             {headerSlot}
 
-            <main id="wrapper" className="flex-1 w-full py-8 md:px-8 lg:px-24 relative" style={fixStyleObject}>
+            <main id="wrapper" className={`${CONFIG_MATERY.HOME_BANNER_ENABLE ? '' : 'pt-16'} flex-1 w-full py-8 md:px-8 lg:px-24 relative`}>
                 {/* 嵌入区域 */}
                                <div id="container-slot" className={`w-full max-w-6xl ${props?.post && ' lg:max-w-3xl 2xl:max-w-4xl '} mt-6 px-3 mx-auto lg:flex lg:space-x-4 justify-center relative z-10`}>
                    {props.containerSlot}

From 4a88c462c137befb790d16fdc9005fcd106e2974 Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Mon, 29 May 2023 12:07:08 +0800
Subject: [PATCH 3/3] new contributor

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index f2c9a2e0..93e8de48 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,10 @@
     <a href="https://github.com/emengweb" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/31469739" width="64px;"  alt="emengweb"/><br/><sub><b>emengweb</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=emengweb" title="emengweb" >🔧 🐛</a>
   </td>
 
+  <td align="center">
+    <a href="https://github.com/kitety" style="display:inline-block;width:80px"><img src="https://avatars.githubusercontent.com/u/22906933" width="64px;"  alt="kitety"/><br/><sub><b>kitety</b></sub></a><br/><a href="https://github.com/tangly1024/NotionNext/commits?author=kitety" title="kitety" >🔧 🐛</a>
+  </td>
+
 
 </tr>
 </table>