From ee9bd3623de378dc29ebb784f2f9650402a84ae6 Mon Sep 17 00:00:00 2001 From: Matthew Lipski Date: Tue, 26 Aug 2025 15:26:53 +0200 Subject: [PATCH 1/7] Removed prefix --- packages/shadcn/components.json | 3 +- packages/shadcn/src/badge/Badge.tsx | 9 ++-- packages/shadcn/src/comments/Card.tsx | 16 ++++--- packages/shadcn/src/comments/Comment.tsx | 37 +++++----------- packages/shadcn/src/components/ui/avatar.tsx | 6 +-- packages/shadcn/src/components/ui/badge.tsx | 10 ++--- packages/shadcn/src/components/ui/button.tsx | 22 +++++----- packages/shadcn/src/components/ui/card.tsx | 17 ++++---- .../src/components/ui/dropdown-menu.tsx | 28 ++++++------- packages/shadcn/src/components/ui/form.tsx | 8 ++-- packages/shadcn/src/components/ui/input.tsx | 16 +++---- packages/shadcn/src/components/ui/label.tsx | 16 +++---- packages/shadcn/src/components/ui/popover.tsx | 2 +- packages/shadcn/src/components/ui/select.tsx | 36 +++++++--------- .../shadcn/src/components/ui/skeleton.tsx | 8 ++-- packages/shadcn/src/components/ui/tabs.tsx | 30 ++++++------- packages/shadcn/src/components/ui/toggle.tsx | 28 ++++++------- packages/shadcn/src/components/ui/tooltip.tsx | 4 +- packages/shadcn/src/form/TextInput.tsx | 8 ++-- packages/shadcn/src/menu/Button.tsx | 2 +- packages/shadcn/src/menu/Menu.tsx | 4 +- packages/shadcn/src/panel/Panel.tsx | 4 +- packages/shadcn/src/panel/PanelTab.tsx | 2 +- packages/shadcn/src/panel/PanelTextInput.tsx | 2 +- packages/shadcn/src/popover/popover.tsx | 4 +- .../shadcn/src/sideMenu/SideMenuButton.tsx | 2 +- packages/shadcn/src/style.css | 6 +-- .../src/suggestionMenu/SuggestionMenu.tsx | 2 +- .../SuggestionMenuEmptyItem.tsx | 6 +-- .../src/suggestionMenu/SuggestionMenuItem.tsx | 24 +++++------ .../suggestionMenu/SuggestionMenuLabel.tsx | 2 +- .../suggestionMenu/SuggestionMenuLoader.tsx | 5 ++- .../gridSuggestionMenu/GridSuggestionMenu.tsx | 4 +- .../GridSuggestionMenuItem.tsx | 8 ++-- .../shadcn/src/tableHandle/ExtendButton.tsx | 12 +++--- .../shadcn/src/tableHandle/TableHandle.tsx | 2 +- packages/shadcn/src/toolbar/Toolbar.tsx | 16 ++++--- packages/shadcn/tailwind.config.js | 6 --- playground/src/main.tsx | 2 +- playground/src/style.css | 42 +++++++++++++++++++ 40 files changed, 231 insertions(+), 230 deletions(-) delete mode 100644 packages/shadcn/tailwind.config.js diff --git a/packages/shadcn/components.json b/packages/shadcn/components.json index 7b5a0aa931..eafc961dca 100644 --- a/packages/shadcn/components.json +++ b/packages/shadcn/components.json @@ -4,11 +4,10 @@ "rsc": false, "tsx": true, "tailwind": { - "config": "tailwind.config.js", "css": "src/style.css", "baseColor": "slate", "cssVariables": true, - "prefix": "bn" + "prefix": "" }, "aliases": { "components": "@/components", diff --git a/packages/shadcn/src/badge/Badge.tsx b/packages/shadcn/src/badge/Badge.tsx index d8333fc2f1..74c1787953 100644 --- a/packages/shadcn/src/badge/Badge.tsx +++ b/packages/shadcn/src/badge/Badge.tsx @@ -30,7 +30,7 @@ export const Badge = forwardRef< variant={isSelected ? "secondary" : "outline"} className={cn( className, - "bn-flex bn-items-center bn-gap-1 bn-rounded-full bn-h-7 bn-px-2.5", + "flex h-7 items-center gap-1 rounded-full px-2.5", )} onClick={onClick} onMouseEnter={onMouseEnter} @@ -51,7 +51,7 @@ export const Badge = forwardRef< {badge} {mainTooltip} {secondaryTooltip && {secondaryTooltip}} @@ -73,10 +73,7 @@ export const BadgeGroup = forwardRef< return (
{children} diff --git a/packages/shadcn/src/comments/Card.tsx b/packages/shadcn/src/comments/Card.tsx index 70cdb17193..75b880b54f 100644 --- a/packages/shadcn/src/comments/Card.tsx +++ b/packages/shadcn/src/comments/Card.tsx @@ -28,8 +28,8 @@ export const Card = forwardRef< {headerText && ( -
- {headerText} -
+
{headerText}
)} {children}
@@ -58,9 +56,9 @@ export const CardSection = forwardRef<
diff --git a/packages/shadcn/src/comments/Comment.tsx b/packages/shadcn/src/comments/Comment.tsx index c493a56642..75caab87bb 100644 --- a/packages/shadcn/src/comments/Comment.tsx +++ b/packages/shadcn/src/comments/Comment.tsx @@ -25,47 +25,33 @@ const AuthorInfo = forwardRef< if (authorInfo === "loading") { return ( -
+
); } return ( -
+
{authorInfo.username[0]} -
- {authorInfo.username} - +
+ {authorInfo.username} + {timeString} {edited && `(${dict.comments.edited})`}
@@ -103,15 +89,12 @@ export const Comment = forwardRef< return (
setHovered(true)} onMouseLeave={() => setHovered(false)} > {doShowActions ? ( -
+
{actions}
) : null} diff --git a/packages/shadcn/src/components/ui/avatar.tsx b/packages/shadcn/src/components/ui/avatar.tsx index 41070f9c95..1dcdcee406 100644 --- a/packages/shadcn/src/components/ui/avatar.tsx +++ b/packages/shadcn/src/components/ui/avatar.tsx @@ -13,7 +13,7 @@ function Avatar({ ); @@ -42,7 +42,7 @@ function AvatarFallback({ svg]:size-3 bn:gap-1 bn:[&>svg]:pointer-events-none bn:focus-visible:border-ring bn:focus-visible:ring-ring/50 bn:focus-visible:ring-[3px] bn:aria-invalid:ring-destructive/20 bn:dark:aria-invalid:ring-destructive/40 bn:aria-invalid:border-destructive bn:transition-[color,box-shadow] bn:overflow-hidden", + "inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden", { variants: { variant: { default: - "bn:border-transparent bn:bg-primary bn:text-primary-foreground bn:[a&]:hover:bg-primary/90", + "border-transparent bg-primary text-primary-foreground [a&]:hover:bg-primary/90", secondary: - "bn:border-transparent bn:bg-secondary bn:text-secondary-foreground bn:[a&]:hover:bg-secondary/90", + "border-transparent bg-secondary text-secondary-foreground [a&]:hover:bg-secondary/90", destructive: - "bn:border-transparent bn:bg-destructive bn:text-white bn:[a&]:hover:bg-destructive/90 bn:focus-visible:ring-destructive/20 bn:dark:focus-visible:ring-destructive/40 bn:dark:bg-destructive/60", + "border-transparent bg-destructive text-white [a&]:hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60", outline: - "bn:text-foreground bn:[a&]:hover:bg-accent bn:[a&]:hover:text-accent-foreground", + "text-foreground [a&]:hover:bg-accent [a&]:hover:text-accent-foreground", }, }, defaultVariants: { diff --git a/packages/shadcn/src/components/ui/button.tsx b/packages/shadcn/src/components/ui/button.tsx index 6e10ccca17..43ab1151fc 100644 --- a/packages/shadcn/src/components/ui/button.tsx +++ b/packages/shadcn/src/components/ui/button.tsx @@ -5,27 +5,27 @@ import { cva, type VariantProps } from "class-variance-authority"; import { cn } from "../../lib/utils"; const buttonVariants = cva( - "bn:inline-flex bn:items-center bn:justify-center bn:gap-2 bn:whitespace-nowrap bn:rounded-md bn:text-sm bn:font-medium bn:transition-all bn:disabled:pointer-events-none bn:disabled:opacity-50 bn:[&_svg]:pointer-events-none bn:[&_svg:not([class*=size-])]:size-4 bn:shrink-0 bn:[&_svg]:shrink-0 bn:outline-none bn:focus-visible:border-ring bn:focus-visible:ring-ring/50 bn:focus-visible:ring-[3px] bn:aria-invalid:ring-destructive/20 bn:dark:aria-invalid:ring-destructive/40 bn:aria-invalid:border-destructive", + "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*=size-])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive", { variants: { variant: { default: - "bn:bg-primary bn:text-primary-foreground bn:shadow-xs bn:hover:bg-primary/90", + "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90", destructive: - "bn:bg-destructive bn:text-white bn:shadow-xs bn:hover:bg-destructive/90 bn:focus-visible:ring-destructive/20 bn:dark:focus-visible:ring-destructive/40 bn:dark:bg-destructive/60", + "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60", outline: - "bn:border bn:bg-background bn:shadow-xs bn:hover:bg-accent bn:hover:text-accent-foreground bn:dark:bg-input/30 bn:dark:border-input bn:dark:hover:bg-input/50", + "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50", secondary: - "bn:bg-secondary bn:text-secondary-foreground bn:shadow-xs bn:hover:bg-secondary/80", + "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80", ghost: - "bn:hover:bg-accent bn:hover:text-accent-foreground bn:dark:hover:bg-accent/50", - link: "bn:text-primary bn:underline-offset-4 bn:hover:underline", + "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50", + link: "text-primary underline-offset-4 hover:underline", }, size: { - default: "bn:h-9 bn:px-4 bn:py-2 bn:has-[>svg]:px-3", - sm: "bn:h-8 bn:rounded-md bn:gap-1.5 bn:px-3 bn:has-[>svg]:px-2.5", - lg: "bn:h-10 bn:rounded-md bn:px-6 bn:has-[>svg]:px-4", - icon: "bn:size-9", + default: "h-9 px-4 py-2 has-[>svg]:px-3", + sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5", + lg: "h-10 rounded-md px-6 has-[>svg]:px-4", + icon: "size-9", }, }, defaultVariants: { diff --git a/packages/shadcn/src/components/ui/card.tsx b/packages/shadcn/src/components/ui/card.tsx index 462d6cc96d..0deef84bed 100644 --- a/packages/shadcn/src/components/ui/card.tsx +++ b/packages/shadcn/src/components/ui/card.tsx @@ -7,7 +7,7 @@ function Card({ className, ...props }: React.ComponentProps<"div">) {
) {
) { return (
); @@ -42,7 +42,7 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) { return (
); @@ -53,7 +53,7 @@ function CardAction({ className, ...props }: React.ComponentProps<"div">) {
) { return (
); @@ -75,10 +75,7 @@ function CardFooter({ className, ...props }: React.ComponentProps<"div">) { return (
); diff --git a/packages/shadcn/src/components/ui/dropdown-menu.tsx b/packages/shadcn/src/components/ui/dropdown-menu.tsx index ca914f7ca5..568aad2a78 100644 --- a/packages/shadcn/src/components/ui/dropdown-menu.tsx +++ b/packages/shadcn/src/components/ui/dropdown-menu.tsx @@ -41,7 +41,7 @@ function DropdownMenuContent({ data-slot="dropdown-menu-content" sideOffset={sideOffset} className={cn( - "bn:bg-popover bn:text-popover-foreground bn:data-[state=open]:animate-in bn:data-[state=closed]:animate-out bn:data-[state=closed]:fade-out-0 bn:data-[state=open]:fade-in-0 bn:data-[state=closed]:zoom-out-95 bn:data-[state=open]:zoom-in-95 bn:data-[side=bottom]:slide-in-from-top-2 bn:data-[side=left]:slide-in-from-right-2 bn:data-[side=right]:slide-in-from-left-2 bn:data-[side=top]:slide-in-from-bottom-2 bn:z-50 bn:max-h-(--radix-dropdown-menu-content-available-height) bn:min-w-[8rem] bn:origin-(--radix-dropdown-menu-content-transform-origin) bn:overflow-x-hidden bn:overflow-y-auto bn:rounded-md bn:border bn:p-1 bn:shadow-md", + "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 max-h-(--radix-dropdown-menu-content-available-height) origin-(--radix-dropdown-menu-content-transform-origin) z-50 min-w-[8rem] overflow-y-auto overflow-x-hidden rounded-md border p-1 shadow-md", className, )} {...props} @@ -72,7 +72,7 @@ function DropdownMenuItem({ data-inset={inset} data-variant={variant} className={cn( - "bn:focus:bg-accent bn:focus:text-accent-foreground bn:data-[variant=destructive]:text-destructive bn:data-[variant=destructive]:focus:bg-destructive/10 bn:dark:data-[variant=destructive]:focus:bg-destructive/20 bn:data-[variant=destructive]:focus:text-destructive bn:data-[variant=destructive]:*:[svg]:!text-destructive bn:[&_svg:not([class*=text-])]:text-muted-foreground bn:relative bn:flex bn:cursor-default bn:items-center bn:gap-2 bn:rounded-sm bn:px-2 bn:py-1.5 bn:text-sm bn:outline-hidden bn:select-none bn:data-[disabled]:pointer-events-none bn:data-[disabled]:opacity-50 bn:data-[inset]:pl-8 bn:[&_svg]:pointer-events-none bn:[&_svg]:shrink-0 bn:[&_svg:not([class*=size-])]:size-4", + "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*=text-])]:text-muted-foreground outline-hidden relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm data-[disabled]:pointer-events-none data-[inset]:pl-8 data-[disabled]:opacity-50 [&_svg:not([class*=size-])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0", className, )} {...props} @@ -90,15 +90,15 @@ function DropdownMenuCheckboxItem({ - + - + {children} @@ -126,14 +126,14 @@ function DropdownMenuRadioItem({ - + - + {children} @@ -153,7 +153,7 @@ function DropdownMenuLabel({ data-slot="dropdown-menu-label" data-inset={inset} className={cn( - "bn:px-2 bn:py-1.5 bn:text-sm bn:font-medium bn:data-[inset]:pl-8", + "px-2 py-1.5 text-sm font-medium data-[inset]:pl-8", className, )} {...props} @@ -168,7 +168,7 @@ function DropdownMenuSeparator({ return ( ); @@ -182,7 +182,7 @@ function DropdownMenuShortcut({ {children} - + ); } @@ -228,7 +228,7 @@ function DropdownMenuSubContent({ ) {
@@ -95,7 +95,7 @@ function FormLabel({