Skip to content

Commit e23d388

Browse files
dawsontothdawsontoth
committed
fix: Adjust themes for orgs, domains and certificates
1 parent f499328 commit e23d388

5 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎src/components/ui/switch.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function Switch({
1515
+ 'data-[state=unchecked]:bg-input '
1616
+ 'focus-visible:border-ring '
1717
+ 'focus-visible:ring-ring/50 '
18-
+ 'dark:data-[state=unchecked]:bg-input/80 inline-flex '
18+
+ 'dark:data-[state=unchecked]:bg-grey-500 inline-flex '
1919
+ 'h-[1.15rem] w-8 shrink-0 '
2020
+ 'items-center rounded-full '
2121
+ 'border border-transparent '

‎src/features/cluster/domains/AssociateDomainWithCluster.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function AssociateDomainWithCluster({ cluster: { fqdn }, domain: { domain
2222

2323
<div className="col-span-1">Name:</div>
2424
<div className="col-span-1 flex gap-2 items-center">
25-
<div className="flex items-center gap-1 bg-gray-700 rounded-md px-3 py-1 flex-1 overflow-hidden">
25+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-1 flex-1 overflow-hidden">
2626
<input
2727
className="bg-transparent border-none outline-none w-full cursor-text truncate"
2828
type="text"
@@ -42,7 +42,7 @@ export function AssociateDomainWithCluster({ cluster: { fqdn }, domain: { domain
4242

4343
<div className="col-span-1">Target:</div>
4444
<div className="col-span-1 flex gap-2 items-center">
45-
<div className="flex items-center gap-1 bg-gray-700 rounded-md px-3 py-1 flex-1 overflow-hidden">
45+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-1 flex-1 overflow-hidden">
4646
<input
4747
className="bg-transparent border-none outline-none w-full cursor-text truncate"
4848
type="text"
@@ -59,7 +59,7 @@ export function AssociateDomainWithCluster({ cluster: { fqdn }, domain: { domain
5959

6060
<div className="col-span-1 text-xs">Domain ID:</div>
6161
<div className="col-span-1 flex gap-2 items-center">
62-
<div className="flex items-center gap-1 bg-gray-800 rounded-md px-3 py-0.5 text-xs text-muted-foreground italic flex-1 overflow-hidden">
62+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-0.5 text-xs text-muted-foreground italic flex-1 overflow-hidden">
6363
<input
6464
className="bg-transparent border-none outline-none w-full cursor-text truncate"
6565
type="text"

‎src/features/cluster/domains/VerifyDomainOwnership.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function VerifyDomainOwnership(
3030

3131
<div className="col-span-1">Name:</div>
3232
<div className="col-span-1 flex gap-2 items-center">
33-
<div className="flex items-center gap-1 bg-gray-700 rounded-md px-3 py-1 flex-1 overflow-hidden">
33+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-1 flex-1 overflow-hidden">
3434
<input
3535
className="bg-transparent border-none outline-none w-full cursor-text truncate"
3636
type="text"
@@ -50,7 +50,7 @@ export function VerifyDomainOwnership(
5050

5151
<div className="col-span-1">Content:</div>
5252
<div className="col-span-1 flex gap-2 items-center">
53-
<div className="flex items-center gap-1 bg-gray-700 rounded-md px-3 py-1 flex-1 overflow-hidden">
53+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-1 flex-1 overflow-hidden">
5454
<input
5555
className="bg-transparent border-none outline-none w-full cursor-text truncate"
5656
type="text"
@@ -74,7 +74,7 @@ export function VerifyDomainOwnership(
7474

7575
<div className="col-span-1">Name:</div>
7676
<div className="col-span-1 flex gap-2 items-center">
77-
<div className="flex items-center gap-1 bg-gray-700 rounded-md px-3 py-1 flex-1 overflow-hidden">
77+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-1 flex-1 overflow-hidden">
7878
<input
7979
className="bg-transparent border-none outline-none w-full cursor-text truncate"
8080
type="text"
@@ -94,7 +94,7 @@ export function VerifyDomainOwnership(
9494

9595
<div className="col-span-1">Target:</div>
9696
<div className="col-span-1 flex gap-2 items-center">
97-
<div className="flex items-center gap-1 bg-gray-700 rounded-md px-3 py-1 flex-1 overflow-hidden">
97+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-1 flex-1 overflow-hidden">
9898
<input
9999
className="bg-transparent border-none outline-none w-full cursor-text truncate"
100100
type="text"
@@ -111,7 +111,7 @@ export function VerifyDomainOwnership(
111111

112112
<div className="col-span-1 text-xs">Domain ID:</div>
113113
<div className="col-span-1 flex gap-2 items-center">
114-
<div className="flex items-center gap-1 bg-gray-800 rounded-md px-3 py-0.5 text-xs text-muted-foreground italic flex-1 overflow-hidden">
114+
<div className="flex items-center gap-1 bg-muted rounded-md px-3 py-0.5 text-xs text-muted-foreground italic flex-1 overflow-hidden">
115115
<input
116116
className="bg-transparent border-none outline-none w-full cursor-text truncate"
117117
type="text"

‎src/features/cluster/domains/components/CertificateProgress.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export function CertificateProgress({
6666
<div className="grid gap-2 grid-cols-1 md:grid-cols-[80px_1fr] text-sm">
6767
<div className="col-span-1 text-xs text-muted-foreground">CNAME:</div>
6868
<div className="col-span-1 flex gap-2 items-center flex-wrap">
69-
<div className="flex items-center gap-1 bg-gray-800 px-2 py-0.5 rounded text-xs">
69+
<div className="flex items-center gap-1 bg-muted px-2 py-0.5 rounded text-xs">
7070
<span className="truncate max-w-[150px]" title={recordName}>
7171
{recordName}
7272
</span>
@@ -82,7 +82,7 @@ export function CertificateProgress({
8282
</Button>
8383
</div>
8484
<ArrowIcon />
85-
<div className="flex items-center gap-1 bg-gray-800 px-2 py-0.5 rounded text-xs">
85+
<div className="flex items-center gap-1 bg-muted px-2 py-0.5 rounded text-xs">
8686
<span className="truncate max-w-[200px]" title={cluster.fqdn || ''}>
8787
{cluster.fqdn}
8888
</span>
@@ -101,7 +101,7 @@ export function CertificateProgress({
101101

102102
<div className="col-span-1 text-[10px] text-muted-foreground">Domain ID:</div>
103103
<div className="col-span-1 flex gap-2 items-center">
104-
<div className="flex items-center gap-1 bg-gray-800/50 px-2 py-0.5 rounded text-[10px] text-muted-foreground italic">
104+
<div className="flex items-center gap-1 bg-muted px-2 py-0.5 rounded text-[10px] text-muted-foreground italic">
105105
<span className="truncate max-w-[200px]">{domain.id}</span>
106106
<Button type="button" variant="ghost" size="sm" className="h-3 w-3 p-0" onClick={onCopyId} title="Copy ID">
107107
<CopyIcon className="w-2.5 h-2.5" />

‎src/features/instance/config/certificates/modals/ViewCertificateModal.tsx‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,58 +70,60 @@ export function ViewCertificateModal({
7070
</DialogHeader>
7171

7272
<div className="space-y-4">
73-
<div className="grid grid-cols-2 gap-4 text-sm bg-gray-900/50 p-4 rounded-lg border border-gray-800">
73+
<div className="grid grid-cols-2 gap-4 text-sm bg-muted p-4 rounded-lg border border-border">
7474
<div className="col-span-2">
7575
<p className="font-semibold">Issuer</p>
76-
<p className="text-gray-400 break-all">{data.details.issuer || 'N/A'}</p>
76+
<p className="text-muted-foreground break-all">{data.details.issuer || 'N/A'}</p>
7777
</div>
7878
<div className="col-span-2">
7979
<p className="font-semibold">Subject</p>
80-
<p className="text-gray-400 break-all">{data.details.subject || 'N/A'}</p>
80+
<p className="text-muted-foreground break-all">{data.details.subject || 'N/A'}</p>
8181
</div>
8282
{data.details.subject_alt_name && (
8383
<div className="col-span-2">
8484
<p className="font-semibold">Subject Alternative Name</p>
85-
<p className="text-gray-400 break-all">{data.details.subject_alt_name}</p>
85+
<p className="text-muted-foreground break-all">{data.details.subject_alt_name}</p>
8686
</div>
8787
)}
8888
<div>
8989
<p className="font-semibold">Valid From</p>
90-
<p className="text-gray-400">
90+
<p className="text-muted-foreground">
9191
{data.details.valid_from ? new Date(data.details.valid_from).toLocaleString() : 'N/A'}
9292
</p>
9393
</div>
9494
<div>
9595
<p className="font-semibold">Valid To (Expires At)</p>
96-
<p className="text-gray-400">
96+
<p className="text-muted-foreground">
9797
{data.details.valid_to ? new Date(data.details.valid_to).toLocaleString() : 'N/A'}
9898
</p>
9999
</div>
100100
<div>
101101
<p className="font-semibold">Serial Number</p>
102-
<p className="text-gray-400 font-mono text-xs break-all">{data.details.serial_number || 'N/A'}</p>
102+
<p className="text-muted-foreground font-mono text-xs break-all">
103+
{data.details.serial_number || 'N/A'}
104+
</p>
103105
</div>
104106
<div>
105107
<p className="font-semibold">Private Key Name</p>
106-
<p className="text-gray-400">{data.private_key_name || 'N/A'}</p>
108+
<p className="text-muted-foreground">{data.private_key_name || 'N/A'}</p>
107109
</div>
108110
<div>
109111
<p className="font-semibold">Is Authority</p>
110-
<p className="text-gray-400">{data.is_authority ? 'Yes' : 'No'}</p>
112+
<p className="text-muted-foreground">{data.is_authority ? 'Yes' : 'No'}</p>
111113
</div>
112114
<div>
113115
<p className="font-semibold">Is Self-Signed</p>
114-
<p className="text-gray-400">{data.is_self_signed ? 'Yes' : 'No'}</p>
116+
<p className="text-muted-foreground">{data.is_self_signed ? 'Yes' : 'No'}</p>
115117
</div>
116118
{data.hosts && data.hosts.length > 0 && (
117119
<div className="col-span-2">
118120
<p className="font-semibold">Hosts</p>
119-
<p className="text-gray-400">{data.hosts.join(', ')}</p>
121+
<p className="text-muted-foreground">{data.hosts.join(', ')}</p>
120122
</div>
121123
)}
122124
<div className="col-span-2">
123125
<p className="font-semibold">Uses</p>
124-
<p className="text-gray-400">{data.uses?.join(', ') || 'N/A'}</p>
126+
<p className="text-muted-foreground">{data.uses?.join(', ') || 'N/A'}</p>
125127
</div>
126128
</div>
127129

0 commit comments

Comments
 (0)