Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modalのサイズとか色とか修正 #271

Merged
merged 1 commit into from
Jan 14, 2025
Merged

modalのサイズとか色とか修正 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pages/app/blog/[article_id]/@modal/(.)image/[src]/modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ export default function Modal({ imageSrc }: { imageSrc: string }) {
)
return (
<Dialog defaultOpen onOpenChange={onClose}>
<DialogContent className="w-max h-max m-0 p-0">
<DialogContent className="max-w-[96dvw] max-h-[96dvh] h-auto w-auto m-0 py-10 px-0 bg-blue-300 bg-opacity-30 border-0">
<DialogTitle></DialogTitle>
<DialogDescription></DialogDescription>
<div className="flex justify-center items-center p-0 m-0 overflow-hidden">
<div className="p-2 w-max h-max">
<ClientImage
src={imageSrc}
alt=""
width={1000}
height={1000}
className="my-10 w-full max-w-fit h-full max-h-fit shadow-lg"
width={100}
height={100}
className="h-fit w-auto max-h-[95dvh] shadow-lg overflow-contain"
/>
</div>
</DialogContent>
Expand Down
4 changes: 2 additions & 2 deletions pages/components/ui/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content
ref={ref}
className={cn(
'fixed left-[50%] top-[50%] max-h-full max-w-full w-max z-50 flex justify-center items-center translate-x-[-50%] translate-y-[-50%] border bg-background shadow-lg duration-200',
'fixed left-[50%] top-[50%] max-h-full max-w-full h-auto w-auto z-50 flex justify-center items-center translate-x-[-50%] translate-y-[-50%] border bg-background shadow-lg duration-200',
className
)}
{...props}
>
{children}
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<X className="h-4 w-4" />
<X className="h-8 w-8" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
</DialogPrimitive.Content>
Expand Down
4 changes: 2 additions & 2 deletions pages/lib/api/workers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ async function getOGPDataOrigin(targetURL: string) {
}

// 成功時はcacheに保存する
// 有効期限は3日。devのときは1秒
const expirationTtl = dev ? 1 : 60 * 60 * 24 * 3
// 有効期限は3日。devのときは60秒
const expirationTtl = dev ? 60 : 60 * 60 * 24 * 3
await env.OGP_FETCHER_CACHE.put(targetURL, JSON.stringify(data), { expirationTtl })

return data
Expand Down
Loading