Merge branch 'main' of https://github.com/tangly1024/NotionNext

expoli · Feb 5, 2025 · 4610035 · 4610035
2 parents 7d8c4e4 + 98b4d27
commit 4610035
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/styles/notion.css b/styles/notion.css
@@ -958,6 +958,12 @@ code[class*='language-'] {
   overflow: hidden;
 }
 
+.notion-callout-text .notion-text{
+  padding: 0px 0px !important;
+  margin: 0px 0px !important;
+  line-height: normal !important;
+}
+
 .notion-toggle {
   padding: 3px 2px;
   width: 100%;
@@ -1682,7 +1688,7 @@ code[class*='language-'] {
   color: inherit;
 }
 
-notion-callout svg.notion-page-icon {
+.notion-callout svg.notion-page-icon {
   @apply hidden;
 }
 

diff --git a/themes/magzine/components/Header.js b/themes/magzine/components/Header.js
@@ -148,7 +148,7 @@ export default function Header(props) {
           <>
             {/* 左侧图标Logo */}
             <div className='flex gap-x-2 lg:gap-x-4 h-full'>
-              <LogoBar className={'text-sm md:text-md lg:text-lg'} />
+              <LogoBar {...props} className={'text-sm md:text-md lg:text-lg'} />
               {/* 桌面端顶部菜单 */}
               <ul className='hidden md:flex items-center gap-x-4 py-1 text-sm md:text-md'>
                 {links &&

diff --git a/themes/magzine/components/LogoBar.js b/themes/magzine/components/LogoBar.js
@@ -1,22 +1,24 @@
+import LazyImage from '@/components/LazyImage'
 import { siteConfig } from '@/lib/config'
 import Link from 'next/link'
 
-export default function LogoBar({ className }) {
+export default function LogoBar({ siteInfo, className }) {
   return (
     <div
       id='top-wrapper'
       className={`w-full flex items-center ${className || ''}`}>
       <Link
         href='/'
-        className='logo flex font-semibold hover:bg-black hover:text-white p-2 rounded-xl duration-200 dark:text-gray-200'>
-        {/* <LazyImage
+        className='inline-flex items-center whitespace-nowrap logo font-semibold hover:bg-black hover:text-white p-2 rounded-xl duration-200 dark:text-gray-200'>
+        <LazyImage
+          priority
           src={siteInfo?.icon}
           width={24}
           height={20}
           alt={siteConfig('AUTHOR')}
-          className='mr-2 hidden md:block rounded-full'
-        /> */}
-        {siteConfig('TITLE')}
+          className='mr-2 hidden md:inline-block'
+        />
+        <span>{siteConfig('TITLE')}</span>
       </Link>
     </div>
   )