adjust border

This commit is contained in:
miloschwartz
2025-04-12 19:50:30 -04:00
parent 1a750e8279
commit 419e576a3e
31 changed files with 118 additions and 112 deletions

View File

@@ -29,17 +29,17 @@ const navItems = [
{
title: "Sites",
href: "/{orgId}/settings/sites",
icon: <Combine className="h-4 w-4" />
// icon: <Combine className="h-4 w-4" />
},
{
title: "Resources",
href: "/{orgId}/settings/resources",
icon: <Waypoints className="h-4 w-4" />
// icon: <Waypoints className="h-4 w-4" />
},
{
title: "Access Control",
href: "/{orgId}/settings/access",
icon: <Users className="h-4 w-4" />,
// icon: <Users className="h-4 w-4" />,
children: [
{
title: "Users",
@@ -54,12 +54,12 @@ const navItems = [
{
title: "Shareable Links",
href: "/{orgId}/settings/share-links",
icon: <LinkIcon className="h-4 w-4" />
// icon: <LinkIcon className="h-4 w-4" />
},
{
title: "General",
href: "/{orgId}/settings/general",
icon: <Settings className="h-4 w-4" />
// icon: <Settings className="h-4 w-4" />
}
];

View File

@@ -104,20 +104,6 @@ export default async function ResourceLayout(props: ResourceLayoutProps) {
return (
<>
<div className="mb-4">
<Breadcrumb>
<BreadcrumbList>
<BreadcrumbItem>
<Link href="../">Resources</Link>
</BreadcrumbItem>
<BreadcrumbSeparator />
<BreadcrumbItem>
<BreadcrumbPage>{resource.name}</BreadcrumbPage>
</BreadcrumbItem>
</BreadcrumbList>
</Breadcrumb>
</div>
<SettingsSectionTitle
title={`${resource?.name} Settings`}
description="Configure the settings on your resource"

View File

@@ -284,7 +284,7 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
<ConfirmDeleteDialog
open={isDeleteModalOpen}
setOpen={setIsDeleteModalOpen}
onConfirm={() => deleteSite(selectedSite.id)}
onConfirm={async () => deleteSite(selectedSite.id)}
title="Delete Site"
description="Are you sure you want to delete this site? This action cannot be undone."
/>

View File

@@ -46,13 +46,18 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
];
return (
<SiteProvider site={site}>
<div className="space-y-6">
<SiteInfoCard />
<HorizontalTabs items={navItems}>
{children}
</HorizontalTabs>
</div>
</SiteProvider>
<>
<SettingsSectionTitle
title={`${site?.name} Settings`}
description="Configure the settings on your site"
/>
<SiteProvider site={site}>
<div className="space-y-6">
<SiteInfoCard />
<HorizontalTabs items={navItems}>{children}</HorizontalTabs>
</div>
</SiteProvider>
</>
);
}

View File

@@ -502,20 +502,6 @@ WantedBy=default.target`
return (
<>
<div className="mb-4 flex-row">
<Breadcrumb>
<BreadcrumbList>
<BreadcrumbItem>
<Link href="../">Sites</Link>
</BreadcrumbItem>
<BreadcrumbSeparator />
<BreadcrumbItem>
<BreadcrumbPage>Create Site</BreadcrumbPage>
</BreadcrumbItem>
</BreadcrumbList>
</Breadcrumb>
</div>
<div className="flex justify-between">
<HeaderTitle
title="Create Site"

View File

@@ -18,7 +18,7 @@ export default async function AuthLayout({ children }: AuthLayoutProps) {
const user = await getUser();
return (
<>
<div className="h-full flex flex-col">
{user && (
<UserProvider user={user}>
<div className="p-3">
@@ -27,9 +27,11 @@ export default async function AuthLayout({ children }: AuthLayoutProps) {
</UserProvider>
)}
<div className="w-full max-w-md mx-auto p-3 md:mt-32">
{children}
<div className="flex-1 flex items-center justify-center">
<div className="w-full max-w-md p-3">
{children}
</div>
</div>
</>
</div>
);
}

View File

@@ -30,7 +30,7 @@ export default function SupporterMessage({ tier }: { tier: string }) {
Pangolin
</span>
<Star className="w-3 h-3"/>
<div className="absolute left-1/2 transform -translate-x-1/2 -top-10 hidden group-hover:block text-primary text-sm rounded-md border-2 shadow-md px-4 py-2 pointer-events-none opacity-0 group-hover:opacity-100 transition-opacity">
<div className="absolute left-1/2 transform -translate-x-1/2 -top-10 hidden group-hover:block text-primary text-sm rounded-md border shadow-md px-4 py-2 pointer-events-none opacity-0 group-hover:opacity-100 transition-opacity">
Thank you for supporting Pangolin as a {tier}!
</div>
</div>

View File

@@ -3,7 +3,7 @@
@custom-variant dark (&:is(.dark *));
:root {
--background: hsl(0 0% 100%);
--background: hsl(0 0% 98%);
--foreground: hsl(20 0% 10%);
--card: hsl(0 0% 100%);
--card-foreground: hsl(20 0% 10%);
@@ -22,7 +22,7 @@
--border: hsl(20 5.9% 80%);
--input: hsl(20 5.9% 75%);
--ring: hsl(24.6 95% 53.1%);
--radius: 0.75rem;
--radius: 0.50rem;
--chart-1: hsl(12 76% 61%);
--chart-2: hsl(173 58% 39%);
--chart-3: hsl(197 37% 24%);
@@ -31,7 +31,7 @@
}
.dark {
--background: hsl(20 0% 10%);
--background: hsl(20 0% 8%);
--foreground: hsl(60 9.1% 97.8%);
--card: hsl(20 0% 10%);
--card-foreground: hsl(60 9.1% 97.8%);
@@ -47,7 +47,7 @@
--accent-foreground: hsl(60 9.1% 97.8%);
--destructive: hsl(0 72.2% 50.6%);
--destructive-foreground: hsl(60 9.1% 97.8%);
--border: hsl(12 6.5% 30%);
--border: hsl(12 6.5% 15%);
--input: hsl(12 6.5% 35%);
--ring: hsl(20.5 90.2% 48.2%);
--chart-1: hsl(220 70% 50%);

View File

@@ -1,6 +1,6 @@
import type { Metadata } from "next";
import "./globals.css";
import { Figtree, Inter } from "next/font/google";
import { Figtree, Inter, Red_Hat_Display, Red_Hat_Mono, Red_Hat_Text, Space_Grotesk } from "next/font/google";
import { Toaster } from "@/components/ui/toaster";
import { ThemeProvider } from "@app/providers/ThemeProvider";
import EnvProvider from "@app/providers/EnvProvider";
@@ -43,7 +43,7 @@ export default async function RootLayout({
return (
<html suppressHydrationWarning>
<body className={`${font.className} min-h-screen flex flex-col`}>
<body className={`${font.className} h-screen overflow-hidden`}>
<ThemeProvider
attribute="class"
defaultTheme="system"
@@ -53,8 +53,8 @@ export default async function RootLayout({
<EnvProvider env={pullEnv()}>
<SupportStatusProvider supporterStatus={supporterData}>
{/* Main content */}
<div className="flex flex-col min-h-screen">
<div className="flex-1">
<div className="h-full flex flex-col">
<div className="flex-1 overflow-auto">
{children}
</div>
</div>