From 2a4e7db47a46511652dc23cad32b2fe70d25f8d3 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sun, 25 Dec 2022 19:26:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?header-nav=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/matery/components/HeaderArticle.js | 22 ++++++++++------------ themes/matery/components/TopNav.js | 7 ++++--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/themes/matery/components/HeaderArticle.js b/themes/matery/components/HeaderArticle.js index b02376a2..71734eee 100644 --- a/themes/matery/components/HeaderArticle.js +++ b/themes/matery/components/HeaderArticle.js @@ -1,17 +1,15 @@ export default function HeaderArticle({ post, siteInfo }) { - const headerImage = post?.page_cover ? `url("${post?.page_cover}")` : `url("${siteInfo?.pageCover}")` + const headerImage = post?.page_cover ? post?.page_cover : siteInfo?.pageCover const title = post?.title return ( - +
+ {/* eslint-disable-next-line @next/next/no-img-element */} + {title} + {title} +
) } diff --git a/themes/matery/components/TopNav.js b/themes/matery/components/TopNav.js index f12f833d..89f0e94e 100644 --- a/themes/matery/components/TopNav.js +++ b/themes/matery/components/TopNav.js @@ -28,12 +28,13 @@ const TopNav = props => { const scrollTrigger = throttle(() => { const scrollS = window.scrollY const nav = document.querySelector('#sticky-nav') - const header = document.querySelector('#header') - const showNav = scrollS <= windowTop || scrollS < 5 || (header && scrollS <= header.clientHeight)// 非首页无大图时影藏顶部 滚动条置顶时隐藏 + // const header = document.querySelector('#header') + const showNav = scrollS <= windowTop || scrollS < 5 // 非首页无大图时影藏顶部 滚动条置顶时隐藏 // 是否将导航栏透明 const navTransparent = (scrollS < document.documentElement.clientHeight - 12 && router.route === '/') || scrollS < 300 // 透明导航条的条件 + console.log('导航栏透明', navTransparent) - if (header && navTransparent) { + if (navTransparent) { nav && nav.classList.replace('bg-indigo-700', 'bg-none') nav && nav.classList.replace('text-black', 'text-white') nav && nav.classList.replace('border', 'border-transparent') From 5678b89001055375c19ffdffc5e477b6aea7074b Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sun, 25 Dec 2022 19:29:05 +0800 Subject: [PATCH 2/3] align-center --- themes/matery/LayoutSlug.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/matery/LayoutSlug.js b/themes/matery/LayoutSlug.js index 85ef4ced..0d872286 100644 --- a/themes/matery/LayoutSlug.js +++ b/themes/matery/LayoutSlug.js @@ -17,7 +17,7 @@ export const LayoutSlug = props => { const scrollListener = () => { const scrollY = window.pageYOffset - const shouldShow = scrollY > 220 + const shouldShow = scrollY > 220 && post?.toc?.length > 0 if (shouldShow !== show) { switchShow(shouldShow) @@ -46,7 +46,7 @@ export const LayoutSlug = props => { >
-
+
{lock && } From 6ee7870847ae59cd113d4d92d084f11311f5c9c9 Mon Sep 17 00:00:00 2001 From: tangly1024 Date: Sun, 25 Dec 2022 19:39:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?matery-=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/matery/components/BlogPostCard.js | 10 +--------- themes/matery/components/HeaderArticle.js | 4 ++-- themes/matery/components/TopNav.js | 9 ++------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/themes/matery/components/BlogPostCard.js b/themes/matery/components/BlogPostCard.js index 0f58b1f2..fbe24de5 100644 --- a/themes/matery/components/BlogPostCard.js +++ b/themes/matery/components/BlogPostCard.js @@ -37,20 +37,12 @@ const BlogPostCard = ({ post, showSummary }) => { {/* 描述 */}
- {(!showPreview || showSummary) && !post.results && post.summary && ( + {(!showPreview || showSummary) && post.summary && (

{post.summary}

)} - {/* 搜索结果 */} - {post.results && ( -

- {post.results.map(r => ( - {r} - ))} -

- )}
+ diff --git a/themes/matery/components/TopNav.js b/themes/matery/components/TopNav.js index 89f0e94e..db358918 100644 --- a/themes/matery/components/TopNav.js +++ b/themes/matery/components/TopNav.js @@ -7,7 +7,6 @@ import Logo from './Logo' import SearchDrawer from './SearchDrawer' import TagGroups from './TagGroups' import MenuButtonGroupTop from './MenuButtonGroupTop' -import { useRouter } from 'next/router' import SideBarDrawer from '@/components/SideBarDrawer' import SideBar from './SideBar' @@ -23,27 +22,23 @@ const TopNav = props => { const { locale } = useGlobal() const searchDrawer = useRef() const { isDarkMode } = useGlobal() - const router = useRouter() const scrollTrigger = throttle(() => { const scrollS = window.scrollY const nav = document.querySelector('#sticky-nav') - // const header = document.querySelector('#header') + const header = document.querySelector('#header') const showNav = scrollS <= windowTop || scrollS < 5 // 非首页无大图时影藏顶部 滚动条置顶时隐藏 // 是否将导航栏透明 - const navTransparent = (scrollS < document.documentElement.clientHeight - 12 && router.route === '/') || scrollS < 300 // 透明导航条的条件 - console.log('导航栏透明', navTransparent) + const navTransparent = header && scrollS < 300 // 透明导航条的条件 if (navTransparent) { nav && nav.classList.replace('bg-indigo-700', 'bg-none') nav && nav.classList.replace('text-black', 'text-white') - nav && nav.classList.replace('border', 'border-transparent') nav && nav.classList.replace('shadow-sm', 'shadow-none') nav && nav.classList.replace('dark:bg-hexo-black-gray', 'transparent') } else { nav && nav.classList.replace('bg-none', 'bg-indigo-700') nav && nav.classList.replace('text-white', 'text-black') - nav && nav.classList.replace('border-transparent', 'border') nav && nav.classList.replace('shadow-none', 'shadow-sm') nav && nav.classList.replace('transparent', 'dark:bg-hexo-black-gray') }