Merge branch 'main' into feat/secondary-menu

This commit is contained in:
tangly1024.com
2023-03-23 13:20:06 +08:00
7 changed files with 8 additions and 7 deletions

View File

@@ -11,13 +11,13 @@ class MyDocument extends Document {
render() { render() {
return ( return (
<Html lang={BLOG.LANG} className='test'> <Html lang={BLOG.LANG}>
<Head> <Head>
<link rel='icon' href='/favicon.ico' /> <link rel='icon' href='/favicon.ico' />
<CommonScript /> <CommonScript />
</Head> </Head>
<body className={`${BLOG.FONT_STYLE} tracking-wider bg-day dark:bg-night`}> <body className={`${BLOG.FONT_STYLE} bg-day dark:bg-night`}>
<Main /> <Main />
<NextScript /> <NextScript />
</body> </body>

View File

@@ -46,7 +46,7 @@ export const LayoutSlug = props => {
showTag={false} showTag={false}
floatSlot={floatSlot} floatSlot={floatSlot}
> >
<div className="w-full lg:hover:shadow lg:border lg:rounded-xl lg:px-2 lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black"> <div className="w-full lg:hover:shadow lg:border lg:rounded-xl lg:px-2 lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black article">
{lock && <ArticleLock validPassword={validPassword} />} {lock && <ArticleLock validPassword={validPassword} />}
{!lock && <div id="container" className="overflow-x-auto flex-grow mx-auto md:w-full md:px-5 "> {!lock && <div id="container" className="overflow-x-auto flex-grow mx-auto md:w-full md:px-5 ">

View File

@@ -15,6 +15,7 @@ const BlogPostCard = ({ index, post, showSummary, siteInfo }) => {
return ( return (
<div <div
id='blog-post-card'
data-aos="fade-up" data-aos="fade-up"
data-aos-duration="200" data-aos-duration="200"
data-aos-delay={delay} data-aos-delay={delay}

View File

@@ -1,7 +1,7 @@
const Card = ({ children, headerSlot, className }) => { const Card = ({ children, headerSlot, className }) => {
return <div className={className}> return <div className={className}>
<>{headerSlot}</> <>{headerSlot}</>
<section className="shadow-md hover:shadow-md dark:text-gray-300 border dark:border-black rounded-xl px-2 py-4 bg-white dark:bg-hexo-black-gray lg:duration-100"> <section className="card shadow-md hover:shadow-md dark:text-gray-300 border dark:border-black rounded-xl px-2 py-4 bg-white dark:bg-hexo-black-gray lg:duration-100">
{children} {children}
</section> </section>
</div> </div>

View File

@@ -19,7 +19,7 @@ export default function HeaderArticle({ post, siteInfo }) {
return ( return (
<div <div
id="header" id="header"
className="w-full h-96 relative md:flex-shrink-0 overflow-hidden bg-cover bg-center bg-no-repeat animate__animated animate__fadeIn" className="w-full h-96 relative md:flex-shrink-0 overflow-hidden bg-cover bg-center bg-no-repeat animate__animated animate__fadeIn z-10"
style={{ backgroundImage: headerImage }} style={{ backgroundImage: headerImage }}
> >
<header className="animate__slideInDown animate__animated bg-black bg-opacity-70 absolute top-0 w-full h-96 py-10 flex justify-center items-center "> <header className="animate__slideInDown animate__animated bg-black bg-opacity-70 absolute top-0 w-full h-96 py-10 flex justify-center items-center ">

View File

@@ -25,7 +25,7 @@ export default function SideRight(props) {
const { locale } = useGlobal() const { locale } = useGlobal()
return ( return (
<div className={'space-y-4 lg:w-80 lg:pt-0 px-2 pt-4'}> <div id='sideRight' className={'space-y-4 lg:w-80 lg:pt-0 px-2 pt-4'}>
<InfoCard {...props} /> <InfoCard {...props} />
{CONFIG_HEXO.WIDGET_ANALYTICS && <AnalyticsCard {...props} />} {CONFIG_HEXO.WIDGET_ANALYTICS && <AnalyticsCard {...props} />}

View File

@@ -129,7 +129,7 @@ const TopNav = props => {
<SearchDrawer cRef={searchDrawer} slot={searchDrawerSlot} /> <SearchDrawer cRef={searchDrawer} slot={searchDrawerSlot} />
{/* 导航栏 */} {/* 导航栏 */}
<div id='sticky-nav' className={'top-0 duration-200 transition-all shadow-none fixed bg-none dark:bg-hexo-black-gray dark:text-gray-200 text-black w-full z-20 transform border-transparent dark:border-transparent'}> <div id='sticky-nav' style={{ 'backdrop-filter': 'blur(3px)' }} className={'top-0 duration-200 transition-all shadow-none fixed bg-none dark:bg-hexo-black-gray dark:text-gray-200 text-black w-full z-20 transform border-transparent dark:border-transparent'}>
<div className='w-full flex justify-between items-center px-4 py-2'> <div className='w-full flex justify-between items-center px-4 py-2'>
<div className='flex'> <div className='flex'>
<Logo {...props} /> <Logo {...props} />