Update: Fix layout for WQHD

Hayao0819 · Mar 6, 2024 · 2d4704a · 2d4704a
1 parent f294d1b
commit 2d4704a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/app/(hayao)/blog/[slug]/page.tsx b/src/app/(hayao)/blog/[slug]/page.tsx
@@ -1,7 +1,6 @@
 import { Metadata } from "next";
 
 import { PostList as PostListElement, PostPageSwitch } from "@/components/layouts/blog/PostPreviewList";
-import CommonSpacer from "@/components/layouts/CommonSpacer";
 import { POSTLIST_ONEPAGE, SUMMARY_LENGTH } from "@/lib/blog/config";
 import { fetchedBlogPostListWithoutHidden } from "@/lib/blog/post";
 import { PostData } from "@/lib/markdown/post";
@@ -12,7 +11,7 @@ export default async function BlogTop({ params }: { params: { slug: string } })
     const postlist = getPostList(slug);
 
     return (
-        <CommonSpacer className="flex flex-col">
+        <div className="flex flex-col">
             <div className="grow">
                 <PostListElement posts={postlist.posts} />
             </div>
@@ -21,7 +20,7 @@ export default async function BlogTop({ params }: { params: { slug: string } })
                 currentPage={postlist.currentPage}
                 linktemplate={(page) => `/blog/${page}`}
             />
-        </CommonSpacer>
+        </div>
     );
 }
 

diff --git a/src/app/(hayao)/blog/layout.tsx b/src/app/(hayao)/blog/layout.tsx
@@ -14,7 +14,7 @@ export default function BlogLayout({ children }: { children: React.ReactNode })
 
     return (
         <CommonSpacer className="md:flex md:gap-2">
-            <div className="md:w-9/12">{children}</div>
+            <div className="mx-auto md:w-9/12 xl:w-1/2">{children}</div>
             <div className="flex flex-col gap-12 md:w-3/12 ">
                 {/* Categories */}
                 <div className={sectionClassName}>

diff --git a/src/lib/markdown/postlist.ts b/src/lib/markdown/postlist.ts
@@ -34,13 +34,7 @@ export class PostList {
         //includeDraft: boolean | undefined = undefined,
         //includeHidden: boolean | undefined = undefined,
     ) {
-        if (this.fetched) {
-            return this;
-        }
-
-        //if (includeDraft === undefined) {
-        //    includeDraft = process.env.NODE_ENV === "development";
-        //}
+        if (this.fetched) return this;
 
         const files = getMdFilesInDir(dir);
         //console.log(getMdFilesInDir(process.cwd()));