From c8c7769e9a183bdfb3c984d0771abcf5ded4bb9f Mon Sep 17 00:00:00 2001
From: Blackberry009 <765042894@qq.com>
Date: Fri, 13 Jun 2025 18:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E6=9A=97=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/dev.config.js                           |  2 +-
 themes/typography/components/BlogItem.js     |  7 ++-----
 themes/typography/components/BlogListPage.js |  2 +-
 themes/typography/components/Footer.js       | 10 +---------
 themes/typography/components/MenuItemDrop.js |  2 +-
 themes/typography/components/NavBar.js       | 12 ++++++------
 themes/typography/index.js                   |  2 +-
 themes/typography/style.js                   | 11 ++++++++++-
 8 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/conf/dev.config.js b/conf/dev.config.js
index c34a8c64..ea324f96 100644
--- a/conf/dev.config.js
+++ b/conf/dev.config.js
@@ -19,7 +19,7 @@ module.exports = {
   BUNDLE_ANALYZER: process.env.ANALYZE === 'true' || false, // 是否展示编译依赖内容与大小
   VERSION: (() => {
     try {
-      // 优先使用环境变量，否则从package.json中获取版本号
+      // 优先使用环境变量，否则从 package.json 中获取版本号
       return (
         process.env.NEXT_PUBLIC_VERSION || require('../package.json').version
       )
diff --git a/themes/typography/components/BlogItem.js b/themes/typography/components/BlogItem.js
index 195f9be2..4ce78a9a 100644
--- a/themes/typography/components/BlogItem.js
+++ b/themes/typography/components/BlogItem.js
@@ -15,9 +15,7 @@ export const BlogItem = props => {
   const showPreview =
     siteConfig('POST_LIST_PREVIEW', false, NOTION_CONFIG) && post.blockMap
   return (
-    <div
-      key={post.id}
-      className='h-42 my-6 pb-7'>
+    <div key={post.id} className='h-42 my-6 pb-7'>
       {/* 文章标题 */}
 
       <div className='flex'>
@@ -39,7 +37,7 @@ export const BlogItem = props => {
           <h2 className='mb-2'>
             <Link
               href={post.href}
-              className='text-xl underline decoration-2 font-bold text-[var(--primary-color)]'>
+              className='text-xl underline decoration-2 font-bold text-[var(--primary-color)] dark:text-white dark:hover:bg-white dark:hover:text-[var(--primary-color)] px-2 duration-200 transition-all rounded-sm'>
               {siteConfig('POST_TITLE_ICON') && (
                 <NotionIcon icon={post.pageIcon} />
               )}
@@ -99,7 +97,6 @@ export const BlogItem = props => {
           </main>
         </article>
       </div>
-
     </div>
   )
 }
diff --git a/themes/typography/components/BlogListPage.js b/themes/typography/components/BlogListPage.js
index f11d2cc2..e1172adb 100644
--- a/themes/typography/components/BlogListPage.js
+++ b/themes/typography/components/BlogListPage.js
@@ -35,7 +35,7 @@ export default function BlogListPage(props) {
     .replace('.html', '')
 
   return (
-    <div className='w-full md:pr-8 mb-12'>
+    <div className='w-full md:pr-8 mb-12 px-5'>
       <div id='posts-wrapper'>
         {posts?.map((p, index) => (
           <div key={p.id}>
diff --git a/themes/typography/components/Footer.js b/themes/typography/components/Footer.js
index b63bb7bb..8d03d7f2 100644
--- a/themes/typography/components/Footer.js
+++ b/themes/typography/components/Footer.js
@@ -18,19 +18,11 @@ export default function Footer(props) {
     <footer>
       <DarkModeButton className='pt-4' />
 
-      <div className='font-bold text-[var(--primary-color)] py-6 text-sm flex flex-col gap-2 items-center'>
+      <div className='font-bold text-[var(--primary-color)] dark:text-white py-6 text-sm flex flex-col gap-2 items-center'>
         <div>
           &copy;{`${copyrightDate}`} {siteConfig('AUTHOR')}.
         </div>
         <div>All rights reserved.</div>
-        <div>
-          Powered by
-          <a
-            href='https://github.com/tangly1024/NotionNext'
-            className=' hover:underline'>
-            NotionNext {siteConfig('VERSION')}
-          </a>
-        </div>
       </div>
     </footer>
   )
diff --git a/themes/typography/components/MenuItemDrop.js b/themes/typography/components/MenuItemDrop.js
index 6302e4f3..1f6d7a3a 100644
--- a/themes/typography/components/MenuItemDrop.js
+++ b/themes/typography/components/MenuItemDrop.js
@@ -13,7 +13,7 @@ export const MenuItemDrop = ({ link }) => {
       <Link
         href={link?.href}
         target={link?.target}
-        className=' menu-link underline decoration-2 hover:no-underline hover:bg-[#2E405B] hover:text-white text-[var(--primary-color)]  dark:text-gray-200 tracking-widest pb-1 font-bold'>
+        className='dark:hover:text-[var(--primary-color)] dark:hover:bg-white menu-link underline decoration-2 hover:no-underline hover:bg-[#2E405B] hover:text-white text-[var(--primary-color)]  dark:text-gray-200 tracking-widest pb-1 font-bold'>
         {link?.name}
       </Link>
     </div>
diff --git a/themes/typography/components/NavBar.js b/themes/typography/components/NavBar.js
index 31519d8e..215e427b 100644
--- a/themes/typography/components/NavBar.js
+++ b/themes/typography/components/NavBar.js
@@ -14,19 +14,19 @@ import Link from 'next/link'
 export default function NavBar(props) {
   return (
     <div className='flex flex-col justify-between md:mt-20 md:h-[70vh]'>
-      <header className='w-fit self-center md:self-start md:pb-8 md:border-l-2 md:border-[var(--primary-color)] text-[var(--primary-color)] md:[writing-mode:vertical-lr] px-4 hover:bg-[var(--primary-color)] hover:text-white ease-in-out duration-700 md:hover:pt-4 md:hover:pb-4'>
+      <header className='w-fit self-center md:self-start md:pb-8 md:border-l-2 dark:md:border-white dark:text-white md:border-[var(--primary-color)] text-[var(--primary-color)] md:[writing-mode:vertical-lr] px-4 hover:bg-[var(--primary-color)] dark:hover:bg-white hover:text-white dark:hover:text-[var(--primary-color)] ease-in-out duration-700 md:hover:pt-4 md:hover:pb-4 mb-2'>
         <Link href='/'>
           <div className='flex flex-col-reverse md:flex-col items-center md:items-start'>
             <div className='font-bold text-4xl text-center' id='blog-name'>
-              活版印字
-            </div>
-            <div className='font-bold text-xl text-center' id='blog-name-en'>
-              Typography
+              山野
             </div>
+            {/* <div className='font-bold text-xl text-center' id='blog-name-en'>
+              Blog
+            </div> */}
           </div>
         </Link>
       </header>
-      <nav className='md:pt-0  z-20  dark:border-hexo-black-gray dark:bg-black flex-shrink-0'>
+      <nav className='md:pt-0  z-20   flex-shrink-0'>
         <div id='nav-bar-inner' className='text-sm md:text-md'>
           <MenuList {...props} />
         </div>
diff --git a/themes/typography/index.js b/themes/typography/index.js
index 7e083473..80cdc71c 100644
--- a/themes/typography/index.js
+++ b/themes/typography/index.js
@@ -71,7 +71,7 @@ const LayoutBase = props => {
     <ThemeGlobalSimple.Provider value={{ searchModal }}>
       <div
         id='theme-typography'
-        className={`${siteConfig('FONT_STYLE')} font-typography h-screen flex flex-col dark:text-gray-300 bg-white dark:bg-black overflow-hidden`}>
+        className={`${siteConfig('FONT_STYLE')} font-typography h-screen flex flex-col dark:text-gray-300 bg-white dark:bg-[#232222] overflow-hidden`}>
         <Style />
 
         {siteConfig('SIMPLE_TOP_BAR', null, CONFIG) && <TopBar {...props} />}
diff --git a/themes/typography/style.js b/themes/typography/style.js
index 85b72369..a0f07085 100644
--- a/themes/typography/style.js
+++ b/themes/typography/style.js
@@ -27,7 +27,7 @@ const Style = () => {
       }
       // 底色
       .dark body {
-        background-color: black;
+        background-color: rgb(35, 34, 34);
       }
       // 文本不可选取
       .forbid-copy {
@@ -36,6 +36,15 @@ const Style = () => {
         -ms-user-select: none;
       }
 
+      .dark #theme-typography {
+        background-image: linear-gradient(
+              to right,
+              rgb(255 255 255 / 0.04) 1px,
+              transparent 1px
+            ),
+            linear-gradient(to bottom, rgb(255 255 255 / 0.04) 1px, transparent 1px);
+      }
+
       #theme-typography {
         --primary-color: #2e405b;
         background-color: rgb(255 255 255) / 1;