Merge pull request #117 from tangly1024/feature-hexo-dev-cocommunity

V2.8.4 Feature hexo dev cocommunity

blog.config.js

@@ -79,7 +79,7 @@ const BLOG = {
   ADSENSE_GOOGLE_ID: process.env.NEXT_PUBLIC_ADSENSE_GOOGLE_ID || '', // 谷歌广告ID e.g ca-pub-xxxxxxxxxxxxxxxx
 
   isProd: process.env.VERCEL_ENV === 'production', // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables)  isProd: process.env.VERCEL_ENV === 'production' // distinguish between development and production environment (ref: https://vercel.com/docs/environment-variables#system-environment-variables)
-  VERSION: '2.8.3' // 版本号
+  VERSION: '2.8.4' // 版本号
 }
 
 module.exports = BLOG

components/Tabs.js

@@ -35,7 +35,7 @@ const Tabs = ({ className, children }) => {
     setCurrentTab(i)
   }
 
-  return <div className={'mb-5 bg-white dark:bg-gray-800 duration-200 ' + className}>
+  return <div className={'mb-5 duration-200 ' + className}>
     <ul className='flex justify-center space-x-5 pb-4 dark:text-gray-400 text-gray-600'>
       {children.map((item, index) => {
         return <li key={index}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "notion-next",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "homepage": "https://github.com/tangly1024/NotionNext.git",
   "license": "MIT",
   "repository": {

styles/globals.css

@@ -121,33 +121,6 @@ nav {
   @apply max-w-0
 }
 
-/* 渐变透明度 */
-.line-x-opacity{
-  background: -webkit-linear-gradient(left, rgba(255,255,255,0), rgb(255, 255, 255)); /* Safari 5.1 - 6.0 */
-  background: -o-linear-gradient(right, rgba(255, 255, 255,0), rgb(255, 255, 255)); /* Opera 11.1 - 12.0 */
-  background: -moz-linear-gradient(right, rgba(255, 255, 255,0), rgba(255, 255, 255)); /* Firefox 3.6 - 15 */
-  background: linear-gradient(to right, rgba(255, 255, 255,0), rgba(255, 255, 255)); /* 标准的语法（必须放在最后） */
-}
-
-.-line-x-opacity{
-  background: -webkit-linear-gradient(right, rgba(255,255,255,0), rgb(255, 255, 255)); /* Safari 5.1 - 6.0 */
-  background: -o-linear-gradient(left, rgba(255, 255, 255,0), rgb(255, 255, 255)); /* Opera 11.1 - 12.0 */
-  background: -moz-linear-gradient(left, rgba(255, 255, 255,0), rgba(255, 255, 255)); /* Firefox 3.6 - 15 */
-  background: linear-gradient(to left, rgba(255, 255, 255,0), rgba(255, 255, 255)); /* 标准的语法（必须放在最后） */
-}
-.dark .line-x-opacity{
-  background: -webkit-linear-gradient(left, rgba(31, 41, 55,0), rgb(31, 41, 55)); /* Safari 5.1 - 6.0 */
-  background: -o-linear-gradient(right, rgba(31, 41, 55,0), rgb(31, 41, 55)); /* Opera 11.1 - 12.0 */
-  background: -moz-linear-gradient(right, rgba(31, 41, 55,0), rgba(31, 41, 55)); /* Firefox 3.6 - 15 */
-  background: linear-gradient(to right, rgba(31, 41, 55,0), rgba(31, 41, 55)); /* 标准的语法（必须放在最后） */
-}
-
-.dark .-line-x-opacity{
-  background: -webkit-linear-gradient(right, rgba(31, 41, 55,0), rgb(31, 41, 55)); /* Safari 5.1 - 6.0 */
-  background: -o-linear-gradient(left, rgba(31, 41, 55,0), rgb(31, 41, 55)); /* Opera 11.1 - 12.0 */
-  background: -moz-linear-gradient(left, rgba(31, 41, 55,0), rgb(31, 41, 55)); /* Firefox 3.6 - 15 */
-  background: linear-gradient(to left, rgba(31, 41, 55,0), rgb(31, 41, 55)); /* 标准的语法（必须放在最后） */
-}
 
 .glassmorphism{
   background: hsla(0, 0%, 100%, .75);
@@ -165,30 +138,6 @@ nav {
   background: none !important;
 }
 
-.article-cover{
-  -webkit-text-size-adjust: 100%;
-  font-size: 14px;
-  font-family: -apple-system,SF UI Text,Arial,PingFang SC,Hiragino Sans GB,Microsoft YaHei,WenQuanYi Micro Hei,sans-serif;
-  -webkit-font-smoothing: antialiased;
-  color: rgba(0,0,0,.75);
-  font-variant-ligatures: common-ligatures;
-  line-height: 1.625;
-  tab-size: 4;
-  outline: 0;
-  font-weight: normal;
-  -webkit-box-sizing: border-box;
-  padding: 0;
-  margin: 0;
-  position: relative;
-  z-index: 998;
-  padding-top: 160px;
-  bottom: -1px;
-  margin-top: -200px;
-  width: 100%;
-  background-image: linear-gradient(-180deg,rgba(255,255,255,0) 0%,#fff 70%);
-  padding-bottom: 34px;
-}
-
 .shadow-text{
   text-shadow: 0.1em 0.1em 0.2em black;
 }

tailwind.config.js

@@ -13,6 +13,11 @@ module.exports = {
         },
         night: {
           DEFAULT: BLOG.BACKGROUND_DARK || '#111827'
+        },
+        hexo: {
+          'background-gray': '#f5f5f5',
+          'black-gray': '#101414',
+          'light-gray': '#e5e5e5'
         }
       }
     }

themes/hexo/LayoutBase.js

@@ -44,7 +44,7 @@ const LayoutBase = (props) => {
     return () => document.removeEventListener('scroll', scrollListener)
   }, [show])
 
-  return (<div className='bg-white dark:bg-gray-900'>
+  return (<div className='bg-hexo-background-gray dark:bg-black'>
     <CommonHead meta={meta} />
 
     <TopNav {...props}/>
@@ -53,8 +53,8 @@ const LayoutBase = (props) => {
 
     <main id='wrapper' className='w-full py-8 min-h-screen'>
 
-      <div id='container-inner' className='pt-14 w-full mx-auto lg:flex justify-center md:space-x-4'>
-        <div className='flex-grow w-full max-w-4xl'>
+      <div id='container-inner' className='pt-14 w-full mx-auto lg:flex justify-center lg:space-x-4'>
+        <div className='flex-grow w-full lg:max-w-4xl'>
           {onLoading ? <LoadingCover/> : children}
         </div>
 
@@ -64,7 +64,7 @@ const LayoutBase = (props) => {
     </main>
 
      {/* 右下角悬浮 */}
-     <div className='bottom-12 right-1 fixed justify-end z-20 font-sans text-white bg-blue-400 rounded'>
+     <div className='bottom-12 right-1 fixed justify-end z-20 font-sans text-white bg-indigo-500 dark:bg-hexo-black-gray rounded-sm'>
         <div className={(show ? 'animate__animated ' : 'hidden') + ' animate__fadeInUp justify-center duration-300  animate__faster flex flex-col items-center cursor-pointer '}>
           <FloatDarkModeButton/>
           {floatSlot}

themes/hexo/LayoutCategoryIndex.js

@@ -25,7 +25,7 @@ export const LayoutCategoryIndex = props => {
               <Link key={category.name} href={`/category/${category.name}`} passHref>
                 <div
                   className={
-                    ' duration-300 dark:hover:text-white rounded-lg px-5 cursor-pointer py-2 hover:bg-blue-400 hover:text-white'
+                    ' duration-300 dark:hover:text-white px-5 cursor-pointer py-2 hover:text-indigo-400'
                   }
                 >
                   <i className="mr-4 fas fa-folder" />

themes/hexo/LayoutSearch.js

@@ -55,7 +55,7 @@ export const LayoutSearch = props => {
                 >
                   <div
                     className={
-                      ' duration-300 dark:hover:text-white rounded-lg px-5 cursor-pointer py-2 hover:bg-blue-400 hover:text-white'
+                      ' duration-300 dark:hover:text-white rounded-lg px-5 cursor-pointer py-2 hover:bg-indigo-400 hover:text-white'
                     }
                   >
                     <i className="mr-4 fas fa-folder" />

themes/hexo/LayoutSlug.js

@@ -53,7 +53,7 @@ export const LayoutSlug = props => {
       showTag={false}
       floatSlot={floatSlot}
     >
-      <div className="w-full dark:border-gray-600 lg:shadow-md lg:hover:shadow-xl lg:border lg:border-gray-100 lg:rounded-xl lg:px-2 lg:py-4 lg:bg-white lg:dark:bg-gray-800">
+      <div className="w-full lg:shadow-sm lg:hover:shadow lg:border lg:rounded-xl lg:px-2 lg:py-4 bg-white dark:bg-hexo-black-gray dark:border-black">
         {!lock && <ArticleDetail {...props} />}
         {lock && <ArticleLock password={post.password} validPassword={validPassword} />}
       </div>

themes/hexo/components/ArticleCopyright.js

@@ -17,7 +17,7 @@ export default function ArticleCopyright () {
 
   const { locale } = useGlobal()
   return <section className="dark:text-gray-300 mt-6 mx-1 font-sans">
-    <ul className="overflow-x-auto whitespace-nowrap text-sm dark:bg-gray-700 bg-gray-100 p-5 leading-8 border-l-2 border-blue-500">
+    <ul className="overflow-x-auto whitespace-nowrap text-sm dark:bg-gray-900 bg-gray-100 p-5 leading-8 border-l-2 border-indigo-500">
       <li>
         <strong className='mr-2'>{locale.COMMON.AUTHOR}:</strong>
         <Link href={'/about'} >

themes/hexo/components/ArticleDetail.js

@@ -38,7 +38,7 @@ export default function ArticleDetail (props) {
   })
 
   return (<div id="container" className="max-w-5xl overflow-x-auto flex-grow mx-auto md:w-full md:px-5 ">
-    <article itemScope itemType="https://schema.org/Movie" className="subpixel-antialiased bg-white dark:bg-gray-800" >
+    <article itemScope itemType="https://schema.org/Movie" className="subpixel-antialiased" >
 
       {/* Notion文章主体 */}
       <section id='notion-article' className='px-5'>
@@ -76,7 +76,7 @@ export default function ArticleDetail (props) {
     <hr className='border-dashed'/>
 
     {/* 评论互动 */}
-    <div className="duration-200  overflow-x-auto bg-white dark:bg-gray-800 px-3">
+    <div className="duration-200 overflow-x-auto bg-white dark:bg-hexo-black-gray px-3">
        <Comment frontMatter={post} />
     </div>
   </div>)

themes/hexo/components/ArticleLock.js

@@ -28,7 +28,7 @@ export const ArticleLock = props => {
       <div className='font-bold'>{locale.COMMON.ARTICLE_LOCK_TIPS}</div>
       <div className='flex'>
         <input id="password" type='password' className='w-full text-sm pl-5 rounded-l transition focus:shadow-lg dark:text-gray-300 font-light leading-10 text-black bg-gray-100 dark:bg-gray-500'></input>
-        <div onClick={submitPassword} className="px-3 whitespace-nowrap cursor-pointer items-center justify-center py-2 bg-blue-500 hover:bg-blue-400 text-white rounded-r duration-300" >
+        <div onClick={submitPassword} className="px-3 whitespace-nowrap cursor-pointer items-center justify-center py-2 bg-indigo-500 hover:bg-indigo-400 text-white rounded-r duration-300" >
           <i className={'duration-200 cursor-pointer fas fa-key'} >&nbsp;{locale.COMMON.SUBMIT}</i>
         </div>
       </div>

themes/hexo/components/BlogPostArchive.js

@@ -16,10 +16,10 @@ const BlogPostArchive = ({ posts = [], archiveTitle }) => {
       <div className='pt-16 pb-4 text-3xl dark:text-gray-300' id={archiveTitle}>{archiveTitle}</div>
       <ul>
         {posts.map(post => (
-          <li key={post.id} className='border-l-2 p-1 text-xs md:text-base items-center  hover:scale-x-105 hover:border-gray-500 dark:hover:border-gray-300 dark:border-gray-400 transform duration-500'>
+          <li key={post.id} className='border-l-2 p-1 text-xs md:text-base items-center  hover:scale-x-105 hover:border-indigo-500 dark:hover:border-indigo-300 dark:border-indigo-400 transform duration-500'>
             <div id={post?.date?.start_date}><span className='text-gray-400'>{post.date.start_date}</span> &nbsp;
               <Link href={`${BLOG.PATH}/article/${post.slug}`} passHref>
-                <a className='dark:text-gray-400  dark:hover:text-gray-300 overflow-x-hidden hover:underline cursor-pointer text-gray-600'>{post.title}</a>
+                <a className='dark:text-gray-400  dark:hover:text-indigo-300 overflow-x-hidden hover:underline cursor-pointer text-gray-600'>{post.title}</a>
               </Link>
             </div>
           </li>

themes/hexo/components/BlogPostCard.js

@@ -8,23 +8,23 @@ import CONFIG_HEXO from '../config_hexo'
 const BlogPostCard = ({ post, showSummary }) => {
   const showPreview = CONFIG_HEXO.POST_LIST_PREVIEW && post.blockMap
   return (
-    <div className='w-full shadow hover:shadow-2xl border border-gray-100 dark:border-gray-600 rounded-xl bg-white dark:bg-gray-800 duration-300'>
+    <div className='w-full shadow-sm hover:shadow border dark:border-black rounded-xl bg-white dark:bg-hexo-black-gray duration-300'>
       <div key={post.id} className='animate__animated animate__fadeIn flex flex-col-reverse lg:flex-row justify-between duration-300'>
 
       <div className='lg:p-8 p-4 flex flex-col w-full'>
         <Link href={`${BLOG.PATH}/article/${post.slug}`} passHref>
-          <a className={`replace cursor-pointer hover:underline text-2xl font-sans ${showPreview ? 'text-center' : ''} leading-tight text-gray-700 dark:text-gray-100 hover:text-blue-500 dark:hover:text-blue-400`}>
+          <a className={`replace cursor-pointer hover:underline text-2xl font-sans ${showPreview ? 'text-center' : ''} leading-tight text-gray-700 dark:text-gray-100 hover:text-indigo-700 dark:hover:text-indigo-400`}>
             {post.title}
           </a>
         </Link>
 
-        <div className={`flex mt-2 items-center ${showPreview ? 'justify-center' : 'justify-start'} flex-wrap dark:text-gray-500 text-gray-400 hover:text-blue-500 dark:hover:text-blue-400 `}>
+        <div className={`flex mt-2 items-center ${showPreview ? 'justify-center' : 'justify-start'} flex-wrap dark:text-gray-500 text-gray-400 hover:text-indigo-700 dark:hover:text-indigo-400`}>
           <Link href={`/archive#${post?.date?.start_date?.substr(0, 7)}`} passHref>
             <a className='font-light hover:underline cursor-pointer text-sm leading-4 mr-3'><i className="far fa-calendar-alt mr-1"/>{post.date.start_date}</a>
           </Link>
         </div>
 
-        {(!showPreview || showSummary) && <p className='replace my-4 text-gray-700 dark:text-gray-300 text-sm font-light leading-7'>
+        {(!showPreview || showSummary) && <p className='replace my-4 text-gray-700  dark:text-gray-300 text-sm font-light leading-7'>
           {post.summary}
         </p>}
 
@@ -44,7 +44,7 @@ const BlogPostCard = ({ post, showSummary }) => {
 
         <div className='text-gray-400 justify-between flex'>
           <Link href={`/category/${post.category}`} passHref>
-              <a className='cursor-pointer font-light text-sm hover:underline transform'>
+              <a className='cursor-pointer font-light text-sm hover:underline hover:text-indigo-700 dark:hover:text-indigo-400 transform'>
                 <i className='mr-1 far fa-folder' />{post.category}
               </a>
             </Link>

themes/hexo/components/Card.js

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

themes/hexo/components/Catalog.js

@@ -71,7 +71,7 @@ const Catalog = ({ toc }) => {
                           display: 'inline-block',
                           marginLeft: tocItem.indentLevel * 16
                         }}
-                        className={`${activeSection === id && ' font-bold text-red-400 underline'}`}
+                        className={`${activeSection === id && ' font-bold text-indigo-400 underline'}`}
                       >
                         {tocItem.text}
                       </span>

themes/hexo/components/CategoryGroup.js

@@ -11,8 +11,8 @@ const CategoryGroup = ({ currentCategory, categories }) => {
         const selected = currentCategory === category.name
         return <Link key={category.name} href={`/category/${category.name}`} passHref>
           <a className={(selected
-            ? 'hover:text-white dark:hover:text-white bg-blue-600 text-white '
-            : 'dark:text-gray-400 text-gray-500 hover:text-white dark:hover:text-white hover:bg-blue-600') +
+            ? 'hover:text-white dark:hover:text-white bg-indigo-600 text-white '
+            : 'dark:text-gray-400 text-gray-500 hover:text-white dark:hover:text-white hover:bg-indigo-600') +
             '  text-sm w-full items-center duration-300 px-2  cursor-pointer py-1 font-light'}>
               <div> <i className={`mr-2 fas ${selected ? 'fa-folder-open' : 'fa-folder'}`} />{category.name}({category.count})</div>
             </a>

themes/hexo/components/Footer.js

@@ -7,12 +7,12 @@ const Footer = ({ title }) => {
   const startYear = BLOG.SINCE && BLOG.SINCE !== currentYear && BLOG.SINCE + '-'
   return (
     <footer
-      className='font-sans dark:bg-gray-900 flex-shrink-0 bg-blue-400 justify-center text-center m-auto w-full leading-6 text-gray-100 text-sm p-6'
+      className='font-sans dark:bg-black flex-shrink-0 bg-hexo-light-gray justify-center text-center m-auto w-full leading-6  text-gray-600 dark:text-gray-100 text-sm p-6'
     >
-      <i className='fas fa-copyright' /> {`${startYear}${currentYear}`} <span><i className='mx-1 animate-pulse fas fa-heart'/> <a href={BLOG.LINK} className='underline font-bold text-gray-50 dark:text-gray-300 '>{BLOG.AUTHOR}</a>.
+      <i className='fas fa-copyright' /> {`${startYear}${currentYear}`} <span><i className='mx-1 animate-pulse fas fa-heart'/> <a href={BLOG.LINK} className='underline font-bold  dark:text-gray-300 '>{BLOG.AUTHOR}</a>.
       <br/>
 
-      <span>Powered by <a href='https://notion.so' className='underline font-bold text-gray-50 dark:text-gray-300'>Notion</a> & <a href='https://github.com/tangly1024/NotionNext' className='underline font-bold text-gray-50 dark:text-gray-300'>NotionNext {BLOG.VERSION}</a>.</span></span>
+      <span>Powered by <a href='https://notion.so' className='underline font-bold dark:text-gray-300'>Notion</a> & <a href='https://github.com/tangly1024/NotionNext' className='underline font-bold dark:text-gray-300'>NotionNext {BLOG.VERSION}</a>.</span></span>
 
       {BLOG.BEI_AN && <><br /><i className='fas fa-shield-alt' /> <a href='https://beian.miit.gov.cn/' className='mr-2'>{BLOG.BEI_AN}</a><br/></>}
       <br/>

themes/hexo/components/HeaderArticle.js

@@ -6,6 +6,7 @@ import { useEffect } from 'react'
 
 export default function HeaderArticle ({ post }) {
   const headerImage = post?.page_cover ? `url("${post.page_cover}")` : `url("/${CONFIG_HEXO.HOME_BANNER_IMAGE}")`
+  const { isDarkMode } = useGlobal()
 
   const { locale } = useGlobal()
   const date = formatDate(
@@ -24,6 +25,7 @@ export default function HeaderArticle ({ post }) {
       nav && nav.classList.replace('bg-none', 'bg-white')
       nav && nav.classList.replace('text-white', 'text-black')
     }
+    updateTopNav()
   }
   useEffect(() => {
     scrollTrigger()
@@ -33,6 +35,17 @@ export default function HeaderArticle ({ post }) {
     }
   })
 
+  const updateTopNav = () => {
+    if (!isDarkMode) {
+      const stickyNavElement = document.getElementById('sticky-nav')
+      if (window.scrollY < window.innerHeight) {
+        stickyNavElement?.classList?.add('dark')
+      } else {
+        stickyNavElement?.classList?.remove('dark')
+      }
+    }
+  }
+
   return (
       <div
         id="header"

themes/hexo/components/InfoCard.js

@@ -9,7 +9,7 @@ export function InfoCard (props) {
   const router = useRouter()
   return <Card className={className}>
     <div
-      className='justify-center items-center flex hover:rotate-45 py-6 hover:scale-105 transform duration-200 cursor-pointer'
+      className='justify-center items-center flex hover:rotate-45 py-6 hover:scale-105 dark:text-gray-100 font-sans transform duration-200 cursor-pointer'
       onClick={() => {
         router.push('/')
       }}
@@ -23,7 +23,7 @@ export function InfoCard (props) {
         className='rounded-full'
       />
     </div>
-    <div className='text-center font-sans text-xl pb-4 dark:text-gray-300'>{BLOG.AUTHOR}</div>
+    <div className='text-center text-xl pb-4'>{BLOG.AUTHOR}</div>
     <div className='text-sm text-center'>{BLOG.BIO}</div>
     <MenuGroupCard {...props}/>
     <SocialButton />

themes/hexo/components/LatestPostsGroup.js

@@ -46,9 +46,9 @@ const LatestPostsGroup = ({ posts }) => {
               />
               <div
                 className={
-                  (selected ? ' text-blue-400 ' : 'dark:text-gray-400 ') +
-                  ' text-sm py-1.5 overflow-x-hidden hover:text-blue-400 px-2 duration-200 w-full rounded ' +
-                  'hover:text-white dark:hover:text-white cursor-pointer items-center flex'
+                  (selected ? ' text-indigo-400 ' : 'dark:text-gray-400 ') +
+                  ' text-sm py-1.5 overflow-x-hidden hover:text-indigo-600 px-2 duration-200 w-full rounded ' +
+                  'hover:text-white dark:hover:text-indigo-400 cursor-pointer items-center flex'
                 }
               >
                 <div>

themes/hexo/components/Logo.js

@@ -5,7 +5,7 @@ import React from 'react'
 const Logo = () => {
   return <Link href='/' passHref>
         <div className='flex flex-col justify-center items-center cursor-pointer space-y-3'>
-          <div className='font-sans text-xl'> {BLOG.TITLE}</div>
+          <div className='font-sans text-lg p-1.5 rounded bg-black text-white dark:border-white border-black border'> {BLOG.TITLE}</div>
         </div>
   </Link>
 }