Skip to content

Commit

Permalink
Fix tw class order (formatting)
Browse files Browse the repository at this point in the history
  • Loading branch information
solomonhawk committed Oct 28, 2024
1 parent ec2258b commit c99e83d
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion apps/web/src/features/table/pages/new/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function TableNew() {
const navigate = useNavigate();

return (
<div className="flex flex-col grow items-center justify-center p-12 sm:p-16">
<div className="flex grow flex-col items-center justify-center p-12 sm:p-16">
<Card className="mx-auto max-w-md">
<CardHeader>
<CardTitle>New Table</CardTitle>
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/components/global-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type Props = {

function Root({ children }: Props) {
return (
<header className="flex justify-between items-center p-8 bg-primary-foreground">
<header className="bg-primary-foreground flex items-center justify-between p-8">
{children}
</header>
);
Expand All @@ -19,8 +19,8 @@ function Root({ children }: Props) {
function LogoMark() {
return (
<div className="flex items-center gap-10 p-4 group-hover:text-green-300">
<GiPlatform className="text-green-300 size-16 sm:size-20" />
<h1 className="font-bold text-sm sm:text-base transition-colors">
<GiPlatform className="size-16 text-green-300 sm:size-20" />
<h1 className="text-sm font-bold transition-colors sm:text-base">
Manifold
</h1>
</div>
Expand All @@ -46,7 +46,7 @@ function Authed({
className="flex items-center gap-8"
>
<span>Safe travels…</span>
<GiSecretDoor className="text-green-300 size-18 sm:size-20" />
<GiSecretDoor className="size-18 text-green-300 sm:size-20" />
</Button>

<Avatar>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/ui/avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const Avatar = React.forwardRef<
<AvatarPrimitive.Root
ref={ref}
className={cn(
"relative flex size-avatar-sm sm:size-avatar shrink-0 overflow-hidden rounded-full",
"size-avatar-sm sm:size-avatar relative flex shrink-0 overflow-hidden rounded-full",
className,
)}
{...props}
Expand All @@ -37,7 +37,7 @@ const AvatarFallback = React.forwardRef<
<AvatarPrimitive.Fallback
ref={ref}
className={cn(
"flex h-full w-full items-center justify-center rounded-full bg-muted text-xs",
"bg-muted flex h-full w-full items-center justify-center rounded-full text-xs",
className,
)}
{...props}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/ui/card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Card = React.forwardRef<
<div
ref={ref}
className={cn(
"rounded border bg-card text-card-foreground shadow",
"bg-card text-card-foreground rounded border shadow",
className,
)}
{...props}
Expand Down Expand Up @@ -47,7 +47,7 @@ const CardDescription = React.forwardRef<
>(({ className, ...props }, ref) => (
<p
ref={ref}
className={cn("text-sm text-muted-foreground", className)}
className={cn("text-muted-foreground text-sm", className)}
{...props}
/>
));
Expand Down
14 changes: 7 additions & 7 deletions packages/ui/src/components/ui/command.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Command = React.forwardRef<
<CommandPrimitive
ref={ref}
className={cn(
"flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground",
"bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md",
className,
)}
{...props}
Expand All @@ -27,7 +27,7 @@ const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
return (
<Dialog {...props}>
<DialogContent className="overflow-hidden p-0" forceMount>
<Command className="[&_[cmdk-group-heading]]:px-8 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-8 [&_[cmdk-input-wrapper]_svg]:h-20 [&_[cmdk-input-wrapper]_svg]:w-20 [&_[cmdk-input]]:h-48 [&_[cmdk-item]]:px-8 [&_[cmdk-item]]:py-12 [&_[cmdk-item]]:gap-8 [&_[cmdk-item]_svg]:h-20 [&_[cmdk-item]_svg]:w-20">
<Command className="[&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group-heading]]:px-8 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-8 [&_[cmdk-input-wrapper]_svg]:h-20 [&_[cmdk-input-wrapper]_svg]:w-20 [&_[cmdk-input]]:h-48 [&_[cmdk-item]]:gap-8 [&_[cmdk-item]]:px-8 [&_[cmdk-item]]:py-12 [&_[cmdk-item]_svg]:h-20 [&_[cmdk-item]_svg]:w-20">
{children}
</Command>
</DialogContent>
Expand All @@ -44,7 +44,7 @@ const CommandInput = React.forwardRef<
<CommandPrimitive.Input
ref={ref}
className={cn(
"flex h-40 w-full rounded-md bg-transparent py-12 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
"placeholder:text-muted-foreground flex h-40 w-full rounded-md bg-transparent py-12 text-sm outline-none disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
{...props}
Expand Down Expand Up @@ -87,7 +87,7 @@ const CommandGroup = React.forwardRef<
<CommandPrimitive.Group
ref={ref}
className={cn(
"overflow-hidden p-8 text-foreground [&_[cmdk-group-heading]]:px-8 [&_[cmdk-group-heading]]:py-6 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground",
"text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-8 [&_[cmdk-group-heading]]:px-8 [&_[cmdk-group-heading]]:py-6 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium",
className,
)}
{...props}
Expand All @@ -102,7 +102,7 @@ const CommandSeparator = React.forwardRef<
>(({ className, ...props }, ref) => (
<CommandPrimitive.Separator
ref={ref}
className={cn("-mx-1 h-px bg-border", className)}
className={cn("bg-border -mx-1 h-px", className)}
{...props}
/>
));
Expand All @@ -115,7 +115,7 @@ const CommandItem = React.forwardRef<
<CommandPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-default select-none items-center rounded-sm px-8 py-6 text-sm outline-none data-[disabled=true]:pointer-events-none data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground data-[disabled=true]:opacity-50",
"data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm px-8 py-6 text-sm outline-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50",
className,
)}
{...props}
Expand All @@ -131,7 +131,7 @@ const CommandShortcut = ({
return (
<span
className={cn(
"ml-auto text-xs tracking-widest text-muted-foreground",
"text-muted-foreground ml-auto text-xs tracking-widest",
className,
)}
{...props}
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/components/ui/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const DialogOverlay = React.forwardRef<
<DialogPrimitive.Overlay
ref={ref}
className={cn(
"fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
"data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80",
className,
)}
{...props}
Expand All @@ -36,13 +36,13 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content
ref={ref}
className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-16 border bg-background p-24 shadow-lg duration-200 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-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
"bg-background 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-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-16 border p-24 shadow-lg duration-200 sm:rounded-lg",
className,
)}
{...props}
>
{children}
<DialogPrimitive.Close className="absolute right-16 top-16 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-16 top-16 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
<Cross2Icon className="size-16" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
Expand Down Expand Up @@ -100,7 +100,7 @@ const DialogDescription = React.forwardRef<
>(({ className, ...props }, ref) => (
<DialogPrimitive.Description
ref={ref}
className={cn("text-sm text-muted-foreground", className)}
className={cn("text-muted-foreground text-sm", className)}
{...props}
/>
));
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/ui/flex.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const FlexCol = React.forwardRef<HTMLDivElement, FlexColProps>(
const Comp = asChild ? Slot : "div";
return (
<Comp
className={cn("flex flex-col grow min-h-0", className)}
className={cn("flex min-h-0 grow flex-col", className)}
ref={ref}
{...props}
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/ui/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
<input
type={type}
className={cn(
"flex h-36 w-full rounded-md border border-input bg-transparent px-12 py-4 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
"border-input file:text-foreground placeholder:text-muted-foreground focus-visible:ring-ring flex h-36 w-full rounded-md border bg-transparent px-12 py-4 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
ref={ref}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/components/ui/resizable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ const ResizableHandle = ({
}) => (
<ResizablePrimitive.PanelResizeHandle
className={cn(
"relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 [&[data-panel-group-direction=vertical]>div]:rotate-90 data-[resize-handle-state=hover]:after:bg-accent-foreground/50 data-[resize-handle-state=drag]:bg-accent-foreground",
"bg-border focus-visible:ring-ring data-[resize-handle-state=hover]:after:bg-accent-foreground/50 data-[resize-handle-state=drag]:bg-accent-foreground relative flex w-px items-center justify-center after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-offset-1 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 [&[data-panel-group-direction=vertical]>div]:rotate-90",
className,
)}
{...props}
>
{withHandle && (
<div className="z-10 flex h-16 w-12 items-center justify-center rounded-sm border bg-border">
<div className="bg-border z-10 flex h-16 w-12 items-center justify-center rounded-sm border">
<DragHandleDots2Icon className="h-10 w-10" />
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/ui/separator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Separator = React.forwardRef<
decorative={decorative}
orientation={orientation}
className={cn(
"shrink-0 bg-border",
"bg-border shrink-0",
orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
className,
)}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/ui/skeleton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Skeleton({
}: React.HTMLAttributes<HTMLDivElement>) {
return (
<div
className={cn("animate-pulse rounded-md bg-primary/10", className)}
className={cn("bg-primary/10 animate-pulse rounded-md", className)}
{...props}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/ui/textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
return (
<textarea
className={cn(
"flex min-h-64 w-full rounded-md border border-input bg-transparent px-12 py-8 text-sm shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
"border-input placeholder:text-muted-foreground focus-visible:ring-ring flex min-h-64 w-full rounded-md border bg-transparent px-12 py-8 text-sm shadow-sm focus-visible:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50",
className,
)}
ref={combinedRef}
Expand Down

0 comments on commit c99e83d

Please sign in to comment.