Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Enhance component styles for improved visual consistency across light and dark modes

Bill Yang765c385a8504
diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsx
index 9d2af831a..f0eee196f 100644
--- a/client/src/app/admin/components/organizations/Organizations.tsx
+++ b/client/src/app/admin/components/organizations/Organizations.tsx
@@ -375,7 +375,7 @@ export function Organizations() {
<GrowthChart data={organizations} color="#8b5cf6" title="Organizations" />
</TabsContent>
<TabsContent value="usage">
- <div className="flex items-center gap-1 bg-neutral-800 p-1 rounded-lg">
+ <div className="flex items-center gap-1 bg-neutral-100 dark:bg-neutral-800 p-1 rounded-lg">
<Button
size="sm"
variant={timePeriod === "30d" ? "default" : "ghost"}
@@ -425,7 +425,7 @@ export function Organizations() {
/>
</div>
- <div className="flex items-center gap-6 mb-4 p-4 bg-neutral-900 border border-neutral-700 rounded-lg">
+ <div className="flex items-center gap-6 mb-4 p-4 bg-neutral-50 dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 rounded-lg">
<div className="flex items-center gap-2">
<Switch id="show-zero-events" checked={showZeroEvents} onCheckedChange={setShowZeroEvents} />
<Label htmlFor="show-zero-events" className="text-sm cursor-pointer">
@@ -446,7 +446,7 @@ export function Organizations() {
</div>
</div>
- <div className="rounded-md border border-neutral-700">
+ <div className="rounded-md border border-neutral-100 dark:border-neutral-800">
<Table>
<TableHeader>
{table.getHeaderGroups().map(headerGroup => (
@@ -504,7 +504,7 @@ export function Organizations() {
</TableRow>
{expandedOrgs.has(row.original.id) && (
<TableRow>
- <TableCell colSpan={columns.length} className="bg-neutral-900 py-4 px-8">
+ <TableCell colSpan={columns.length} className="bg-neutral-50 dark:bg-neutral-900 py-4 px-8">
<div className="space-y-6">
{/* Subscription Details */}
<CopyText text={row.original.id}></CopyText>
@@ -513,17 +513,17 @@ export function Organizations() {
<CreditCard className="h-4 w-4" />
Subscription Details
</div>
- <div className="grid grid-cols-1 md:grid-cols-4 gap-4 p-4 border border-neutral-700 rounded">
+ <div className="grid grid-cols-1 md:grid-cols-4 gap-4 p-4 border border-neutral-100 dark:border-neutral-800 rounded">
<div>
- <div className="text-xs text-neutral-400 uppercase tracking-wide">Plan</div>
+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Plan</div>
<div className="font-medium">{row.original.subscription.planName}</div>
</div>
<div>
- <div className="text-xs text-neutral-400 uppercase tracking-wide">Status</div>
+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Status</div>
<div className="font-medium">{row.original.subscription.status}</div>
</div>
<div>
- <div className="text-xs text-neutral-400 uppercase tracking-wide">Event Limit</div>
+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Event Limit</div>
<div className="font-medium">
{row.original.subscription.eventLimit
? formatter(row.original.subscription.eventLimit)
@@ -532,7 +532,7 @@ export function Organizations() {
</div>
{row.original.subscription.currentPeriodEnd && (
<div>
- <div className="text-xs text-neutral-400 uppercase tracking-wide">Period End</div>
+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Period End</div>
<div className="font-medium">
{formatDistanceToNow(new Date(row.original.subscription.currentPeriodEnd), {
addSuffix: true,
@@ -542,7 +542,7 @@ export function Organizations() {
)}
{row.original.subscription.cancelAtPeriodEnd && (
<div>
- <div className="text-xs text-neutral-400 uppercase tracking-wide">Cancellation</div>
+ <div className="text-xs text-neutral-500 dark:text-neutral-400 uppercase tracking-wide">Cancellation</div>
<div className="font-medium text-orange-400">Cancels at period end</div>
</div>
)}
@@ -562,11 +562,11 @@ export function Organizations() {
key={site.siteId}
href={`/${site.siteId}`}
target="_blank"
- className="inline-flex items-center gap-2 px-3 py-2 bg-neutral-800 hover:bg-neutral-700 border border-neutral-600 rounded-md text-sm transition-colors"
+ className="inline-flex items-center gap-2 px-3 py-2 bg-neutral-100 dark:bg-neutral-800 hover:bg-neutral-200 dark:hover:bg-neutral-700 border border-neutral-200 dark:border-neutral-700 rounded-md text-sm transition-colors"
>
<div className="flex flex-col">
<span className="font-medium">{site.domain}</span>
- <span className="text-xs text-neutral-400">
+ <span className="text-xs text-neutral-500 dark:text-neutral-400">
{formatter(site.eventsLast24Hours)} events (24h) ·{" "}
{formatter(site.eventsLast30Days)} (30d)
</span>
@@ -576,7 +576,7 @@ export function Organizations() {
))}
</div>
) : (
- <div className="text-neutral-400 p-4 border border-neutral-700 rounded">No sites</div>
+ <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">No sites</div>
)}
</div>
@@ -591,7 +591,7 @@ export function Organizations() {
{row.original.members.map(member => (
<div
key={member.userId}
- className="p-3 border border-neutral-700 rounded flex items-center justify-between"
+ className="p-3 border border-neutral-100 dark:border-neutral-800 rounded flex items-center justify-between"
>
<div className="flex flex-col gap-1">
<div className="font-medium flex items-center gap-2">
@@ -600,8 +600,8 @@ export function Organizations() {
{member.role}
</Badge>
</div>
- <div className="text-sm text-neutral-200">{member.email}</div>
- <div className="text-xs text-neutral-400">
+ <div className="text-sm text-neutral-700 dark:text-neutral-200">{member.email}</div>
+ <div className="text-xs text-neutral-500 dark:text-neutral-400">
<CopyText text={member.userId} className="text-xs"></CopyText>
</div>
<Button
@@ -619,7 +619,7 @@ export function Organizations() {
))}
</div>
) : (
- <div className="text-neutral-400 p-4 border border-neutral-700 rounded">No members</div>
+ <div className="text-neutral-500 dark:text-neutral-400 p-4 border border-neutral-100 dark:border-neutral-800 rounded">No members</div>
)}
</div>
</div>
diff --git a/client/src/app/admin/components/shared/GrowthChart.tsx b/client/src/app/admin/components/shared/GrowthChart.tsx
index 530632b2c..b568cd9b2 100644
--- a/client/src/app/admin/components/shared/GrowthChart.tsx
+++ b/client/src/app/admin/components/shared/GrowthChart.tsx
@@ -48,11 +48,11 @@ export function GrowthChart({ data, color = "#3b82f6", title }: GrowthChartProps
}, [data]);
if (data === undefined) {
- return <div className="h-64 flex items-center justify-center text-neutral-400 text-sm">Loading...</div>;
+ return <div className="h-64 flex items-center justify-center text-neutral-500 dark:text-neutral-400 text-sm">Loading...</div>;
}
if (!data || data.length === 0) {
- return <div className="h-64 flex items-center justify-center text-neutral-400 text-sm">No data available</div>;
+ return <div className="h-64 flex items-center justify-center text-neutral-500 dark:text-neutral-400 text-sm">No data available</div>;
}
return (
diff --git a/client/src/app/admin/components/shared/OverviewCards.tsx b/client/src/app/admin/components/shared/OverviewCards.tsx
index de0ead32b..9e6065e6e 100644
--- a/client/src/app/admin/components/shared/OverviewCards.tsx
+++ b/client/src/app/admin/components/shared/OverviewCards.tsx
@@ -24,18 +24,18 @@ export function OverviewCards({ cards, isLoading }: OverviewCardsProps) {
return (
<div
key={index}
- className="bg-neutral-900 border border-neutral-700 rounded-lg p-6 hover:border-neutral-600 transition-colors"
+ className="bg-neutral-50 dark:bg-neutral-900 border border-neutral-100 dark:border-neutral-800 rounded-lg p-6 hover:border-neutral-200 dark:hover:border-neutral-700 transition-colors"
>
<div className="flex items-center justify-between mb-2">
- <div className="text-sm font-medium text-neutral-400">{card.title}</div>
- <Icon className="h-4 w-4 text-neutral-500" />
+ <div className="text-sm font-medium text-neutral-600 dark:text-neutral-400">{card.title}</div>
+ <Icon className="h-4 w-4 text-neutral-500 dark:text-neutral-500" />
</div>
{isLoading ? (
<Skeleton className="h-8 w-24" />
) : (
<div className="text-2xl font-bold">{card.value.toLocaleString()}</div>
)}
- {card.description && <div className="text-xs text-neutral-500 mt-1">{card.description}</div>}
+ {card.description && <div className="text-xs text-neutral-500 dark:text-neutral-500 mt-1">{card.description}</div>}
</div>
);
})}
diff --git a/client/src/app/admin/components/shared/SearchInput.tsx b/client/src/app/admin/components/shared/SearchInput.tsx
index f18982bf5..372e98a62 100644
--- a/client/src/app/admin/components/shared/SearchInput.tsx
+++ b/client/src/app/admin/components/shared/SearchInput.tsx
@@ -13,12 +13,12 @@ interface SearchInputProps {
export function SearchInput({ value, onChange, placeholder = "Search...", className = "max-w-sm" }: SearchInputProps) {
return (
<div className={`relative ${className}`}>
- <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-400" />
+ <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-500 dark:text-neutral-400" />
<Input
placeholder={placeholder}
value={value}
onChange={e => onChange(e.target.value)}
- className="pl-9 bg-neutral-900 border-neutral-700"
+ className="pl-9 bg-neutral-50 dark:bg-neutral-900 border-neutral-100 dark:border-neutral-800"
/>
</div>
);
diff --git a/client/src/app/admin/components/sites/Sites.tsx b/client/src/app/admin/components/sites/Sites.tsx
index da82aea02..eb116bfd7 100644
--- a/client/src/app/admin/components/sites/Sites.tsx
+++ b/client/src/app/admin/components/sites/Sites.tsx
@@ -152,7 +152,7 @@ export function Sites() {
<SearchInput placeholder="Search by domain or owner email..." value={searchQuery} onChange={setSearchQuery} />
</div>
- <div className="rounded-md border border-neutral-700">
+ <div className="rounded-md border border-neutral-100 dark:border-neutral-800">
<Table>
<TableHeader>
{table.getHeaderGroups().map(headerGroup => (
diff --git a/client/src/app/admin/components/users/UserFilters.tsx b/client/src/app/admin/components/users/UserFilters.tsx
index 3aa331a04..90f8c1dfd 100644
--- a/client/src/app/admin/components/users/UserFilters.tsx
+++ b/client/src/app/admin/components/users/UserFilters.tsx
@@ -14,12 +14,12 @@ export function UserFilters({ table }: UserFiltersProps) {
return (
<div className="flex flex-col md:flex-row gap-4">
<div className="relative flex-1">
- <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-400" />
+ <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-500 dark:text-neutral-400" />
<Input
placeholder="Filter by email..."
value={(table.getColumn("email")?.getFilterValue() as string) ?? ""}
onChange={e => table.getColumn("email")?.setFilterValue(e.target.value)}
- className="pl-9 bg-neutral-900 border-neutral-700"
+ className="pl-9 bg-neutral-50 dark:bg-neutral-900 border-neutral-100 dark:border-neutral-800"
/>
</div>
<div className="w-full md:w-48">
diff --git a/client/src/app/admin/components/users/UsersTable.tsx b/client/src/app/admin/components/users/UsersTable.tsx
index 30252e087..f53a5150f 100644
--- a/client/src/app/admin/components/users/UsersTable.tsx
+++ b/client/src/app/admin/components/users/UsersTable.tsx
@@ -200,7 +200,7 @@ export function UsersTable({
});
return (
- <div className="rounded-md border border-neutral-700">
+ <div className="rounded-md border border-neutral-100 dark:border-neutral-800">
<Table>
<TableHeader>
{table.getHeaderGroups().map(headerGroup => (
diff --git a/client/src/app/admin/page.tsx b/client/src/app/admin/page.tsx
index 94d7b574d..ac9a99114 100644
--- a/client/src/app/admin/page.tsx
+++ b/client/src/app/admin/page.tsx
@@ -79,7 +79,7 @@ export default function AdminPage() {
</TabsContent>
<TabsContent value="settings">
- <div className="p-4 border rounded-md">
+ <div className="p-4 border border-neutral-100 dark:border-neutral-800 rounded-md">
<h2 className="text-xl font-bold mb-4">Admin Settings</h2>
<p className="text-muted-foreground">Settings panel coming soon...</p>
</div>