Merge branch 'main' into feature-search

This commit is contained in:
tangly1024
2022-03-01 13:11:19 +08:00
committed by GitHub
7 changed files with 11 additions and 15 deletions

View File

@@ -9,7 +9,7 @@ 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-xl hover:shadow-2xl border border-gray-100 rounded-xl bg-white dark:bg-gray-800 duration-300'>
<div className='w-full shadow hover:shadow-2xl border border-gray-100 rounded-xl bg-white dark:bg-gray-800 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'>

View File

@@ -20,7 +20,7 @@ const BlogPostListPage = ({ page = 1, posts = [], postCount }) => {
return (
<div id="container" className='w-full'>
{/* 文章列表 */}
<div className="space-y-6">
<div className="space-y-6 px-2">
{posts.map(post => (
<BlogPostCard key={post.id} post={post} />
))}

View File

@@ -55,7 +55,7 @@ const BlogPostListScroll = ({ posts = [], currentSearch, showSummary = CONFIG_HE
return <div id='container' ref={targetRef} className='w-full'>
{/* 文章列表 */}
<div className='flex flex-wrap space-y-1 lg:space-y-4'>
<div className='flex flex-wrap space-y-1 lg:space-y-4 px-2'>
{postsToShow.map(post => (
<BlogPostCard key={post.id} post={post} showSummary={showSummary}/>
))}

View File

@@ -40,17 +40,17 @@ export default function HeaderArticle ({ post }) {
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 font-sans">
<div>
<div className='mt-24'>
{/* 文章Title */}
<div className="font-bold text-3xl shadow-text flex justify-center text-white dark:text-white font-sans">
<div className="font-bold text-xl shadow-text flex justify-center text-white dark:text-white font-sans">
{post.title}
</div>
<section className="flex-wrap shadow-text flex justify-center mt-2 text-white dark:text-gray-400 font-light leading-8">
<section className="flex-wrap shadow-text flex text-sm justify-center mt-2 text-white dark:text-gray-400 font-light leading-8">
<div>
{post.category && <>
<Link href={`/category/${post.category}`} passHref>
<a className="cursor-pointer text-md mr-2 dark:hover:text-white border-b dark:border-gray-500 border-dashed">
<a className="cursor-pointer mr-2 dark:hover:text-white border-b dark:border-gray-500 border-dashed">
<i className="mr-1 fas fa-folder-open" />
{post.category}
</a>

View File

@@ -15,13 +15,9 @@ export const LayoutTag = (props) => {
type: 'website'
}
// 将当前选中的标签置顶🔝
const currentTag = tags?.find(r => r?.name === tag)
const newTags = currentTag ? [currentTag].concat(tags.filter(r => r?.name !== tag)) : tags.filter(r => r?.name !== tag)
return <LayoutBase meta={meta} currentTag={tag} {...props}>
<StickyBar>
<TagList tags={newTags} currentTag={tag}/>
<TagList tags={tags} currentTag={tag}/>
</StickyBar>
<div className='md:mt-8'>
<BlogPostListScroll posts={posts} tags={tags} currentTag={tag}/>

View File

@@ -91,7 +91,7 @@ export default function ArticleDetail (props) {
</>)}
<div className="hidden busuanzi_container_page_pv font-light mr-2">
<i className='mr-1 fa-eye'/>
<i className='mr-1 fas fa-eye'/>
&nbsp;
<span className="mr-2 busuanzi_value_page_pv"/>
<span className='mr-2'>|</span>

View File

@@ -3,7 +3,7 @@
*/
// export * from './Empty' // 空主题
// export * from './NEXT'
export * from './NEXT'
// export * from './Fukasawa'
// export * from './Hexo'
export * from './Medium'
// export * from './Medium'