Skip to content

Commit 50139ba

Browse files
committed
...even more
1 parent 672b7a5 commit 50139ba

File tree

10 files changed

+31
-30
lines changed

10 files changed

+31
-30
lines changed

src/app/(dashboard)/settings/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default function NetBirdSettings() {
5959
</VerticalTabs.Trigger>
6060
</VerticalTabs.List>
6161
<RestrictedAccess page={"Settings"}>
62-
<div className={"border-l border-nb-gray-930 w-full"}>
62+
<div className={"border-l border-gray-200 dark:border-nb-gray-930 w-full"}>
6363
{account && <AuthenticationTab account={account} />}
6464
{account && <PermissionsTab account={account} />}
6565
{account && <GroupsTab account={account} />}

src/components/Button.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export const buttonVariants = cva(
6363
"dark:focus:ring-zinc-800/50 dark:bg-transparent dark:text-netbird dark:border-netbird dark:hover:bg-nb-gray-900/30",
6464
],
6565
"danger-outline": [
66-
"", // TODO - add danger button styles for light mode
66+
"bg-transparent focus:ring-red-400/20 hover:bg-red-50 text-red-500 border-red-500",
6767
"enabled:dark:focus:ring-red-800/20 enabled:dark:focus:bg-red-950/40 enabled:hover:dark:bg-red-950/50 enabled:dark:hover:border-red-800/50 dark:bg-transparent dark:text-red-500",
6868
"",
6969
],
@@ -72,7 +72,7 @@ export const buttonVariants = cva(
7272
"dark:bg-transparent dark:text-nb-gray-400 dark:border-transparent dark:hover:text-white dark:hover:bg-zinc-800/50 dark:hover:border-nb-gray-800/50",
7373
],
7474
danger: [
75-
"", // TODO - add danger button styles for light mode
75+
"bg-red-600 text-white hover:bg-red-700 focus:ring-red-400/50",
7676
"dark:focus:ring-red-700/20 dark:focus:bg-red-700 hover:dark:bg-red-700 dark:hover:border-red-800/50 dark:bg-red-600 dark:text-red-100",
7777
],
7878
},

src/components/DropdownMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ const menuItemVariants = cva("", {
7878
variants: {
7979
variant: {
8080
default:
81-
"dark:focus:bg-nb-gray-900 dark:focus:text-gray-50 dark:text-gray-400",
81+
"focus:bg-gray-100 focus:text-gray-900 text-gray-800 dark:focus:bg-nb-gray-900 dark:focus:text-gray-50 dark:text-gray-400",
8282
danger:
83-
"dark:focus:bg-red-900/20 dark:focus:text-red-500 dark:text-red-500",
83+
"focus:bg-red-100 focus:text-red-500 text-red-500 dark:focus:bg-red-900/20 dark:focus:text-red-500 dark:text-red-500",
8484
},
8585
},
8686
});

src/components/Input.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const inputVariants = cva("", {
4141
"bg-gray-100 dark:bg-nb-gray-900 border-neutral-200 dark:border-nb-gray-700 text-gray-500 dark:text-nb-gray-300",
4242
],
4343
error: [
44-
"bg-red-50 dark:bg-nb-gray-900 border-red-500 text-red-500 dark:text-nb-gray-300",
44+
"bg-red-50 dark:bg-nb-gray-900 border-red-500 text-red-500",
4545
],
4646
},
4747
},

src/components/RadioGroup.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@ export const RadioGroup = ({ value, onChange, children }: Props) => {
1717
value={value}
1818
onValueChange={onChange}
1919
className={
20-
"flex bg-nb-gray-900 rounded-md border border-nb-gray-700 text-sm items-center justify-center p-1"
20+
"flex bg-gray-50 dark:bg-nb-gray-900 rounded-md border border-gray-300 dark:border-nb-gray-700 text-sm items-center justify-center p-1"
2121
}
2222
>
2323
{children}
2424
</RadixRadioGroup.Root>
2525
);
2626
};
27+
2728
export const RadioGroupItems = ({
2829
children,
2930
}: {
3031
children: React.ReactNode;
3132
}) => {
32-
return <div className={"flex w-full bg-nb-gray-900"}>{children}</div>;
33+
return <div className={"flex w-full bg-white dark:bg-nb-gray-900"}>{children}</div>;
3334
};
3435

3536
export const RadioGroupItem = ({
@@ -47,11 +48,11 @@ export const RadioGroupItem = ({
4748
key={value}
4849
className={cn(
4950
variant === "default" &&
50-
"text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-nb-gray-600 data-[state=checked]:text-nb-gray-100",
51+
"text-gray-600 dark:text-nb-gray-500 hover:text-gray-700 dark:hover:text-nb-gray-400 data-[state=checked]:bg-gray-200 dark:data-[state=checked]:bg-nb-gray-600 data-[state=checked]:text-gray-800 dark:data-[state=checked]:text-nb-gray-100",
5152
variant === "red" &&
52-
"text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-red-800 data-[state=checked]:text-red-200",
53+
"text-red-500 dark:text-red-500 hover:text-red-600 dark:hover:text-red-400 data-[state=checked]:bg-red-100 dark:data-[state=checked]:bg-red-800 data-[state=checked]:text-red-600 dark:data-[state=checked]:text-red-200",
5354
variant === "green" &&
54-
"text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-green-800 data-[state=checked]:text-green-200",
55+
"text-green-500 dark:text-green-500 hover:text-green-600 dark:hover:text-green-400 data-[state=checked]:bg-green-100 dark:data-[state=checked]:bg-green-800 data-[state=checked]:text-green-600 dark:data-[state=checked]:text-green-200",
5556
"cursor-pointer relative transition-all w-full py-1.5 px-5 rounded-md h-full flex items-center text-sm gap-1 text-center justify-center",
5657
)}
5758
>

src/components/VerticalTabs.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function VerticalTabs({ value, onChange, children }: Props) {
3434
>
3535
<Tabs.Root
3636
orientation={"vertical"}
37-
className={"block lg:flex bg-nb-gray"}
37+
className={"block lg:flex bg-white dark:bg-nb-gray"}
3838
value={value}
3939
onValueChange={(value) => onChange(value)}
4040
>
@@ -51,7 +51,7 @@ function List({ children }: { children: React.ReactNode }) {
5151
<Tabs.List
5252
className={cn(
5353
"px-4 py-4 whitespace-nowrap overflow-y-hidden shrink-0 no-scrollbar",
54-
"lg:h-full items-start bg-nb-gray border-b-0 border-nb-gray-930",
54+
"lg:h-full items-start bg-gray-50 dark:bg-nb-gray border-b-0 border-gray-200 dark:border-nb-gray-930",
5555
"flex lg:flex-col lg:gap-1",
5656
)}
5757
style={{
@@ -82,10 +82,10 @@ function Trigger({
8282
"py-2 text-base rounded-md w-full transition-all data-[disabled]:opacity-10",
8383
"lg:pl-6 lg:pr-8 pl-4 pr-4 text-center lg:text-left",
8484
value == currentValue
85-
? "bg-nb-gray-920"
85+
? "bg-gray-200 dark:bg-nb-gray-920"
8686
: disabled
8787
? ""
88-
: "text-nb-gray-500 hover:bg-nb-gray-900/50",
88+
: "text-gray-600 dark:text-nb-gray-500 hover:bg-gray-100 dark:hover:bg-nb-gray-900/50",
8989
)}
9090
value={value}
9191
onClick={() => {

src/components/skeletons/SkeletonHeader.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
export default function SkeletonHeader() {
22
return (
3-
<div className={"px-8 py-6 flex flex-col gap-6"}>
4-
<div className={"h-[16px] bg-nb-gray-930 w-[100px] rounded-full"}></div>
5-
<div className={"flex gap-3 flex-col mt-4"}>
6-
<div className={"h-[30px] bg-nb-gray-930 w-[170px] rounded-md"}></div>
7-
<div className={"h-[10px] bg-nb-gray-930 w-[540px] rounded-full"}></div>
8-
<div className={"h-[10px] bg-nb-gray-930 w-[340px] rounded-full"}></div>
3+
<div className={"flex flex-col gap-4 max-w-3xl"}>
4+
<div className={"h-[16px] bg-gray-200 dark:bg-nb-gray-930 w-[100px] rounded-full"}></div>
5+
<div className={"flex gap-2 flex-col"}>
6+
<div className={"h-[30px] bg-gray-200 dark:bg-nb-gray-930 w-[170px] rounded-md"}></div>
7+
<div className={"h-[10px] bg-gray-200 dark:bg-nb-gray-930 w-[540px] rounded-full"}></div>
8+
<div className={"h-[10px] bg-gray-200 dark:bg-nb-gray-930 w-[340px] rounded-full"}></div>
99
</div>
10-
<div className={"flex gap-5"}>
10+
<div className={"flex gap-2 flex-col mt-6"}>
1111
<div
12-
className={"h-[40px] bg-nb-gray-930/50 w-[400px] rounded-md"}
12+
className={"h-[40px] bg-gray-200 dark:bg-nb-gray-930/50 w-[400px] rounded-md"}
1313
></div>
1414
<div
15-
className={"h-[40px] bg-nb-gray-930/50 w-[140px] rounded-md"}
15+
className={"h-[40px] bg-gray-200 dark:bg-nb-gray-930/50 w-[140px] rounded-md"}
1616
></div>
1717
<div
18-
className={"h-[40px] bg-nb-gray-930/50 w-[180px] rounded-md"}
18+
className={"h-[40px] bg-gray-200 dark:bg-nb-gray-930/50 w-[180px] rounded-md"}
1919
></div>
20-
<div className={"h-[40px] bg-nb-gray-930/50 w-[60px] rounded-md"}></div>
20+
<div className={"h-[40px] bg-gray-200 dark:bg-nb-gray-930/50 w-[60px] rounded-md"}></div>
2121
</div>
2222
</div>
2323
);

src/modules/access-tokens/AccessTokensTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default function AccessTokensTable({ user }: Props) {
9999
data={tokens}
100100
/>
101101
) : (
102-
<div className={"bg-nb-gray-950 overflow-hidden"}>
102+
<div className={"bg-white dark:bg-nb-gray-950 overflow-hidden"}>
103103
<NoResults
104104
className={"py-3"}
105105
title={"No access tokens"}

src/modules/settings/AuthenticationTab.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ export default function AuthenticationTab({ account }: Readonly<Props>) {
201201

202202
<div
203203
className={cn(
204-
"border border-nb-gray-900 border-t-0 rounded-b-md bg-nb-gray-940 px-[1.28rem] pt-3 pb-5 flex flex-col gap-4 mx-[0.25rem]",
204+
"border border-gray-200 dark:border-nb-gray-900 border-t-0 rounded-b-md bg-gray-50 dark:bg-nb-gray-940 px-[1.28rem] pt-3 pb-5 flex flex-col gap-4 mx-[0.25rem]",
205205
!loginExpiration
206206
? "opacity-50 pointer-events-none"
207-
: "bg-nb-gray-930/80",
207+
: "bg-gray-100 dark:bg-nb-gray-930/80",
208208
)}
209209
>
210210
<div className={cn("flex justify-between gap-10 mt-2")}>

src/modules/settings/GroupsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ export default function GroupsTable({ headingTarget }: Readonly<Props>) {
304304
)}
305305
</DataTable>
306306
) : (
307-
<div className={"bg-nb-gray-950 overflow-hidden"}>
307+
<div className={"bg-white dark:bg-nb-gray-950 overflow-hidden"}>
308308
<NoResults
309309
className={"py-3"}
310310
title={"No groups"}

0 commit comments

Comments
 (0)