diff --git a/themes/hexo/components/Card.js b/themes/hexo/components/Card.js index feda0330..3b53cc33 100644 --- a/themes/hexo/components/Card.js +++ b/themes/hexo/components/Card.js @@ -1,7 +1,7 @@ const Card = ({ children, headerSlot, className }) => { return
<>{headerSlot} -
+
{children}
diff --git a/themes/hexo/components/Header.js b/themes/hexo/components/Header.js index eb811550..e1fbd29a 100644 --- a/themes/hexo/components/Header.js +++ b/themes/hexo/components/Header.js @@ -1,4 +1,3 @@ -import { useGlobal } from '@/lib/global' import { useEffect, useState } from 'react' import Typed from 'typed.js' import CONFIG_HEXO from '../config_hexo' @@ -13,12 +12,10 @@ let autoScroll = false */ const Header = props => { const [typed, changeType] = useState() - const { isDarkMode } = useGlobal() const { siteInfo } = props useEffect(() => { scrollTrigger() updateHeaderHeight() - updateTopNav() if (!typed && window && document.getElementById('typed')) { changeType( new Typed('#typed', { @@ -48,17 +45,6 @@ const Header = props => { const scrollTrigger = () => { const scrollS = window.scrollY - const nav = document.querySelector('#sticky-nav') - - if (scrollS < 500) { - nav && nav.classList.replace('bg-white', 'bg-none') - nav && nav.classList.replace('text-black', 'text-white') - nav && nav.classList.replace('border', 'border-transparent') - } else { - nav && nav.classList.replace('bg-none', 'bg-white') - nav && nav.classList.replace('text-white', 'text-black') - nav && nav.classList.replace('border-transparent', 'border') - } // 自动滚动 if ((scrollS > windowTop) & (scrollS < window.innerHeight) && !autoScroll @@ -73,19 +59,6 @@ const Header = props => { setTimeout(autoScrollEnd, 500) } windowTop = scrollS - - updateTopNav() - } - - const updateTopNav = () => { - if (!isDarkMode) { - const stickyNavElement = document.getElementById('sticky-nav') - if (window.scrollY < window.innerHeight) { - stickyNavElement?.classList?.add('dark') - } else { - stickyNavElement?.classList?.remove('dark') - } - } } function updateHeaderHeight () { diff --git a/themes/hexo/components/HeaderArticle.js b/themes/hexo/components/HeaderArticle.js index 8513419d..356b95f7 100644 --- a/themes/hexo/components/HeaderArticle.js +++ b/themes/hexo/components/HeaderArticle.js @@ -1,14 +1,12 @@ import Link from 'next/link' import { useGlobal } from '@/lib/global' import formatDate from '@/lib/formatDate' -import { useEffect } from 'react' export default function HeaderArticle({ post, siteInfo }) { if (!post) { return <> } const headerImage = post?.page_cover ? `url("${post.page_cover}")` : `url("${siteInfo?.pageCover}")` - const { isDarkMode } = useGlobal() const { locale } = useGlobal() const date = formatDate( @@ -16,42 +14,6 @@ export default function HeaderArticle({ post, siteInfo }) { locale.LOCALE ) - const scrollTrigger = () => { - const scrollS = window.scrollY - const nav = document.querySelector('#sticky-nav') - - if (scrollS < 300) { - nav && nav.classList.replace('bg-white', 'bg-none') - nav && nav.classList.replace('text-black', 'text-white') - } else { - nav && nav.classList.replace('bg-none', 'bg-white') - nav && nav.classList.replace('text-white', 'text-black') - } - updateTopNav() - } - useEffect(() => { - scrollTrigger() - window.addEventListener('scroll', scrollTrigger) - return () => { - window.removeEventListener('scroll', scrollTrigger) - } - }) - - const updateTopNav = () => { - if (!isDarkMode) { - const stickyNavElement = document.getElementById('sticky-nav') - const header = document.querySelector('#header') - if (!header || !stickyNavElement) { - return - } - if (window.scrollY < header.clientHeight) { - stickyNavElement?.classList?.add('dark') - } else { - stickyNavElement?.classList?.remove('dark') - } - } - } - return (