d0zingcat/NotionNext
1
0
Fork 0
mirror of https://github.com/d0zingcat/NotionNext.git synced 2026-05-21 15:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #639 from tangly1024/main

Browse Source 
tangly1024.com
This commit is contained in:
tangly1024
2022-12-25 20:58:23 +08:00
committed by GitHub
parent b068f7af46 f712108455
commit 4d2e4256f9
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
themes/matery/LayoutBase.js
View File

@@ -50,7 +50,7 @@ const LayoutBase = props => {
} }
return ( return (
<div id="outer-wrapper" className="min-h-screen flex flex-col justify-between bg-hexo-background-gray dark:bg-black w-full overflow-hidden"> <div id="outer-wrapper" className="min-h-screen flex flex-col justify-between bg-hexo-background-gray dark:bg-black w-full">
<CommonHead meta={meta} siteInfo={siteInfo} /> <CommonHead meta={meta} siteInfo={siteInfo} />

23
themes/matery/LayoutSlug.js
View File

@@ -18,7 +18,6 @@ export const LayoutSlug = props => {
const scrollListener = () => { const scrollListener = () => {
const scrollY = window.pageYOffset const scrollY = window.pageYOffset
const shouldShow = scrollY > 220 && post?.toc?.length > 0 const shouldShow = scrollY > 220 && post?.toc?.length > 0
if (shouldShow !== show) { if (shouldShow !== show) {
switchShow(shouldShow) switchShow(shouldShow)
} }
@@ -45,12 +44,12 @@ export const LayoutSlug = props => {
showTag={false} showTag={false}
> >
<div id='inner-wrapper' className='flex'> <div id='inner-wrapper'>
<div className={'drop-shadow-xl max-w-4xl 2xl:ml-36'}> <div className={'drop-shadow-xl max-w-4xl'}>
<div className="-mt-32 rounded-md mx-3 lg:border lg:rounded-xl lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black"> <div className="-mt-32 rounded-md mx-3 lg:border lg:rounded-xl lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black">
{lock && <ArticleLock validPassword={validPassword} />} {lock && <ArticleLock validPassword={validPassword} />}
{!lock && <div id="container" className="overflow-x-auto flex-grow md:w-full "> {!lock && <div id="container" className="overflow-x-auto md:w-full px-3 ">
{post?.type === 'Post' && <> {post?.type === 'Post' && <>
<div className='px-10'> <div className='px-10'>
<ArticleInfo post={post} /> <ArticleInfo post={post} />
@@ -91,17 +90,23 @@ export const LayoutSlug = props => {
</div>} </div>}
</div> </div>
{post.type === 'Post' && <ArticleAdjacent {...props} />} {post.type === 'Post' && <ArticleAdjacent {...props} />}
{post?.toc?.length > 0 && <div id='toc-wrapper' className='absolute top-0 w-full h-full xl:block hidden' >
<div className='relative h-full'>
<div className='float-right -mr-72 h-full mt-40'>
<div className='sticky top-24'>
<Catalog toc={post.toc} />
</div>
</div>
</div>
</div>}
</div> </div>
<div className='fixed bottom-28 right-4'> <div className='fixed bottom-28 right-4'>
<JumpToCommentButton /> <JumpToCommentButton />
</div> </div>
<div id='toc-widget' className='w-60 hidden xl:block '>
<div className='fixed top-24 overflow-auto'>
{show && <Catalog toc={post.toc} />}
</div>
</div>
</div> </div>
</LayoutBase> </LayoutBase>