Skip to content

Commit 757ec4b

Browse files
committed
fix: Update colours.
1 parent ce8c546 commit 757ec4b

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

src/shadcn/ui/button.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from "react"
22
import { Slot } from "@radix-ui/react-slot"
33
import { cva, type VariantProps } from "class-variance-authority"
4-
4+
55
import { cn } from "src"
6-
6+
77
const buttonVariants = cva(
88
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
99
{
@@ -14,7 +14,7 @@ const buttonVariants = cva(
1414
destructive:
1515
"bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
1616
outline:
17-
"border border-input bg-paper shadow-sm hover:bg-accent hover:text-accent-foreground",
17+
"border border-input bg-muted shadow-sm hover:bg-accent hover:text-accent-foreground",
1818
secondary:
1919
"bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
2020
ghost: "hover:bg-accent hover:text-accent-foreground",
@@ -33,13 +33,13 @@ const buttonVariants = cva(
3333
},
3434
}
3535
)
36-
36+
3737
export interface ButtonProps
3838
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
3939
VariantProps<typeof buttonVariants> {
4040
asChild?: boolean
4141
}
42-
42+
4343
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
4444
({ className, variant, size, asChild = false, ...props }, ref) => {
4545
const Comp = asChild ? Slot : "button"
@@ -53,5 +53,5 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
5353
}
5454
)
5555
Button.displayName = "Button"
56-
56+
5757
export { Button, buttonVariants }

src/shadcn/ui/input.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
1111
<input
1212
type={type}
1313
className={cn(
14-
"flex h-9 w-full rounded-md border border-input bg-paper px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-paper file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
14+
"flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-paper file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
1515
className
1616
)}
1717
ref={ref}

src/tokens.css

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
--paper: 240 4.8% 100%;
66
/* --paper2: var(--paper); */
77

8-
--card: 0 0% 100%;
8+
--card: var(--paper);
99
--card-foreground: 240 10% 5.9%;
1010

11-
--popover: 0 0% 100%;
11+
--popover: var(--paper);
1212
--popover-foreground: 240 10% 5.9%;
1313

1414
--primary: 240 5.9% 10%;
@@ -57,10 +57,11 @@
5757
--paper: 240 3.7% 9.9%;
5858
/* --paper2: 240 3.7% 13.9%; */
5959

60-
--card: 240 10% 5.9%;
60+
61+
--card: var(--paper);
6162
--card-foreground: 0 0% 98%;
6263

63-
--popover: 240 10% 5.9%;
64+
--popover: var(--paper);
6465
--popover-foreground: 0 0% 98%;
6566

6667
--primary: 0 0% 98%;

0 commit comments

Comments
 (0)