-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'update-example-project' into canary
- Loading branch information
Showing
19 changed files
with
471 additions
and
464 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import "@/styles/globals.css"; | ||
| import "section-blog-theme/styles.css"; | ||
| import "section-blog-theme/styles.css" | ||
| import '@/styles/globals.css' | ||
| export default function App({ Component, pageProps }) { | ||
| return <Component {...pageProps} />; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,57 @@ | ||
| import * as React from "react"; | ||
| import { Slot } from "@radix-ui/react-slot"; | ||
| import { cva, type VariantProps } from "class-variance-authority"; | ||
| import { cn } from "@/utility/utils"; | ||
| import * as React from "react" | ||
| import { Slot } from "@radix-ui/react-slot" | ||
| import { cva, type VariantProps } from "class-variance-authority" | ||
|
|
||
| import { cn } from "@/utility/utils" | ||
|
|
||
| const buttonVariants = cva( | ||
| "inline-flex items-center justify-center 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", | ||
| "nx-inline-flex nx-items-center nx-justify-center nx-whitespace-nowrap nx-rounded-md nx-text-sm nx-font-medium nx-transition-colors focus-visible:nx-outline-none focus-visible:nx-ring-1 focus-visible:nx-ring-ring disabled:nx-pointer-events-none disabled:nx-opacity-50", | ||
| { | ||
| variants: { | ||
| variant: { | ||
| default: | ||
| "bg-primary text-primary-foreground shadow hover:bg-primary/90", | ||
| "nx-bg-primary nx-text-primary-foreground nx-shadow hover:nx-bg-primary/90", | ||
| destructive: | ||
| "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90", | ||
| "nx-bg-destructive nx-text-destructive-foreground nx-shadow-sm hover:nx-bg-destructive/90", | ||
| outline: | ||
| "border border-input bg-transparent shadow-sm hover:bg-accent hover:text-accent-foreground", | ||
| "nx-border nx-border-input nx-bg-background nx-shadow-sm hover:nx-bg-accent hover:nx-text-accent-foreground", | ||
| secondary: | ||
| "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80", | ||
| ghost: "hover:bg-accent hover:text-accent-foreground", | ||
| link: "text-primary underline-offset-4 hover:underline", | ||
| "nx-bg-secondary nx-text-secondary-foreground nx-shadow-sm hover:nx-bg-secondary/80", | ||
| ghost: "hover:nx-bg-accent hover:nx-text-accent-foreground", | ||
| link: "nx-text-primary nx-underline-offset-4 hover:nx-underline", | ||
| }, | ||
| size: { | ||
| default: "h-9 px-4 py-2", | ||
| sm: "h-8 rounded-md px-3 text-xs", | ||
| lg: "h-10 rounded-md px-8", | ||
| icon: "h-9 w-9", | ||
| default: "nx-h-9 nx-px-4 nx-py-2", | ||
| sm: "nx-h-8 nx-rounded-md nx-px-3 nx-text-xs", | ||
| lg: "nx-h-10 nx-rounded-md nx-px-8", | ||
| icon: "nx-h-9 nx-w-9", | ||
| }, | ||
| }, | ||
| defaultVariants: { | ||
| variant: "default", | ||
| size: "default", | ||
| }, | ||
| }, | ||
| ); | ||
| } | ||
| ) | ||
|
|
||
| export interface ButtonProps | ||
| extends React.ButtonHTMLAttributes<HTMLButtonElement>, | ||
| VariantProps<typeof buttonVariants> { | ||
| asChild?: boolean; | ||
| asChild?: boolean | ||
| } | ||
|
|
||
| const Button = React.forwardRef<HTMLButtonElement, ButtonProps>( | ||
| ({ className, variant, size, asChild = false, ...props }, ref) => { | ||
| const Comp = asChild ? Slot : "button"; | ||
| const Comp = asChild ? Slot : "button" | ||
| return ( | ||
| <Comp | ||
| className={cn(buttonVariants({ variant, size, className }))} | ||
| ref={ref} | ||
| {...props} | ||
| /> | ||
| ); | ||
| }, | ||
| ); | ||
| Button.displayName = "Button"; | ||
| ) | ||
| } | ||
| ) | ||
| Button.displayName = "Button" | ||
|
|
||
| export { Button, buttonVariants }; | ||
| export { Button, buttonVariants } |
Oops, something went wrong.