Merge branch 'main' into cloudflare

This commit is contained in:
hamster1963 2024-10-13 17:45:39 +08:00
commit f1cb2ac79d

View File

@ -38,8 +38,18 @@ export default function ServerCard({
>
<Popover>
<PopoverTrigger asChild>
<section className={"flex items-center justify-start gap-2 lg:w-28"}>
<section
className="grid items-center gap-2 lg:w-28"
style={{ gridTemplateColumns: "auto 1fr auto" }}
>
<div
className={cn(
"flex items-center justify-center",
showFlag ? "min-w-[17px]" : "min-w-0",
)}
>
{showFlag ? <ServerFlag country_code={country_code} /> : null}
</div>
<p
className={cn(
"break-all font-bold tracking-tight",
@ -48,7 +58,7 @@ export default function ServerCard({
>
{name}
</p>
<span className="h-2 w-2 shrink-0 rounded-full bg-green-500"></span>
<span className="h-2 w-2 shrink-0 rounded-full bg-green-500 self-center"></span>
</section>
</PopoverTrigger>
<PopoverContent side="top">
@ -127,8 +137,18 @@ export default function ServerCard({
>
<Popover>
<PopoverTrigger asChild>
<section className={"flex items-center justify-start gap-2 lg:w-28"}>
<section
className="grid items-center gap-2 lg:w-28"
style={{ gridTemplateColumns: "auto 1fr auto" }}
>
<div
className={cn(
"flex items-center justify-center",
showFlag ? "min-w-[17px]" : "min-w-0",
)}
>
{showFlag ? <ServerFlag country_code={country_code} /> : null}
</div>
<p
className={cn(
"break-all font-bold tracking-tight",
@ -137,7 +157,7 @@ export default function ServerCard({
>
{name}
</p>
<span className="h-2 w-2 shrink-0 rounded-full bg-red-500"></span>
<span className="h-2 w-2 shrink-0 rounded-full bg-red-500 self-center"></span>
</section>
</PopoverTrigger>
<PopoverContent className="w-fit p-2" side="top">