Skip to content

Commit

Permalink
Merge pull request #1222 from tangly1024/fix/build-fukasawa
Browse files Browse the repository at this point in the history
Fix/build fukasawa
  • Loading branch information
tangly1024 committed Jun 29, 2023
2 parents e11d472 + ab6b753 commit 11035f2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .env.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# 环境变量 @see https://www.nextjs.cn/docs/basic-features/environment-variables
NEXT_PUBLIC_VERSION=3.16.1
NEXT_PUBLIC_VERSION=3.16.2
2 changes: 1 addition & 1 deletion blog.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const BLOG = {
process.env.NOTION_PAGE_ID || '02ab3b8678004aa69e9e415905ef32a5',
PSEUDO_STATIC: false, // 伪静态路径,开启后所有文章URL都以 .html 结尾。
NEXT_REVALIDATE_SECOND: process.env.NEXT_PUBLIC_REVALIDATE_SECOND || 5, // 更新内容缓存间隔 单位(秒);即每个页面有5秒的纯静态期、此期间无论多少次访问都不会抓取notion数据;调大该值有助于节省Vercel资源、同时提升访问速率,但也会使文章更新有延迟。
THEME: process.env.NEXT_PUBLIC_THEME || 'hexo', // 主题, 支持 ['next','hexo',"fukasawa','medium','example','matery','gitbook','simple'] @see https://preview.tangly1024.com
THEME: process.env.NEXT_PUBLIC_THEME || 'fukasawa', // 主题, 支持 ['next','hexo',"fukasawa','medium','example','matery','gitbook','simple'] @see https://preview.tangly1024.com
THEME_SWITCH: process.env.NEXT_PUBLIC_THEME_SWITCH || false, // 是否显示切换主题按钮
LANG: process.env.NEXT_PUBLIC_LANG || 'zh-CN', // e.g 'zh-CN','en-US' see /lib/lang.js for more.
SINCE: 2021, // e.g if leave this empty, current year will be used.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notion-next",
"version": "3.16.1",
"version": "3.16.2",
"homepage": "https://github.com/tangly1024/NotionNext.git",
"license": "MIT",
"repository": {
Expand Down
18 changes: 13 additions & 5 deletions themes/fukasawa/components/BlogListPage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import BLOG from '@/blog.config'
import { deepClone } from '@/lib/utils'
import { deepClone, isBrowser } from '@/lib/utils'
import BlogCard from './BlogCard'
import BlogPostListEmpty from './BlogListEmpty'
import PaginationSimple from './PaginationSimple'
Expand Down Expand Up @@ -65,13 +65,21 @@ const BlogListPage = ({ page = 1, posts = [], postCount, siteInfo }) => {
}
}

/**
* 计算文章列数
* @returns
*/
const calculateColumns = () => {
if (window.innerWidth >= 1024) {
if (!isBrowser()) {
return 3
} else if (window.innerWidth >= 640) {
return 2
} else {
return 1
if (window.innerWidth >= 1024) {
return 3
} else if (window.innerWidth >= 640) {
return 2
} else {
return 1
}
}
}

Expand Down

0 comments on commit 11035f2

Please sign in to comment.