Merge branch 'CaliCastle:main' into main

MarlinDiary · Jul 21, 2023 · ba55780 · ba55780
2 parents 369ef92 + a37e35a
commit ba55780
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,4 @@ next-env.d.ts
 static/
 
 .react-email/
+/.idea
diff --git a/app/(main)/blog/BlogPostCard.tsx b/app/(main)/blog/BlogPostCard.tsx
@@ -54,10 +54,12 @@ export function BlogPostCard({ post, views }: { post: Post; views: number }) {
  </span>
  </span>
 
- <span className="inline-flex items-center space-x-1 text-[12px] font-medium text-[--post-image-fg] md:text-sm">
- <ScriptIcon />
- <span>{categories.join(', ')}</span>
- </span>
+ {Array.isArray(categories) && (
+ <span className="inline-flex items-center space-x-1 text-[12px] font-medium text-[--post-image-fg] md:text-sm">
+ <ScriptIcon />
+ <span>{categories.join(', ')}</span>
+ </span>
+ )}
  </span>
  <span className="inline-flex items-center space-x-3 text-[12px] font-medium text-[--post-image-fg] md:text-xs">
  <span className="inline-flex items-center space-x-1">

diff --git a/app/clerk.css b/app/clerk.css
@@ -14,6 +14,11 @@
 
 .cl-modalBackdrop {
  @apply backdrop-blur-sm backdrop-saturate-150;
+ @apply bg-zinc-100/40;
+}
+
+.dark .cl-modalBackdrop {
+ @apply bg-zinc-900/40;
 }
 
 .cl-userButtonPopoverCard {