Skip to content

Commit 2c496c4

Browse files
authored
Merge branch 'main' into pr-factory/issue-9780-switch-class-style
2 parents a11788a + d3de6aa commit 2c496c4

File tree

2,124 files changed

+111956
-58594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,124 files changed

+111956
-58594
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ build
1515

1616
# misc
1717
.DS_Store
18+
.eslintcache
1819
*.pem
1920

2021
# debug
@@ -43,3 +44,4 @@ tsconfig.tsbuildinfo
4344
.notes
4445
.playwright-mcp
4546
shadcn-workspace
47+
.codex-artifacts

apps/v4/app/(app)/(root)/components/appearance-settings.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
"use client"
22

33
import * as React from "react"
4-
import { Button } from "@/examples/radix/ui/button"
5-
import { ButtonGroup } from "@/examples/radix/ui/button-group"
4+
import { IconMinus, IconPlus } from "@tabler/icons-react"
5+
6+
import { Button } from "@/styles/radix-nova/ui/button"
7+
import { ButtonGroup } from "@/styles/radix-nova/ui/button-group"
68
import {
79
Field,
810
FieldContent,
@@ -13,11 +15,10 @@ import {
1315
FieldSeparator,
1416
FieldSet,
1517
FieldTitle,
16-
} from "@/examples/radix/ui/field"
17-
import { Input } from "@/examples/radix/ui/input"
18-
import { RadioGroup, RadioGroupItem } from "@/examples/radix/ui/radio-group"
19-
import { Switch } from "@/examples/radix/ui/switch"
20-
import { IconMinus, IconPlus } from "@tabler/icons-react"
18+
} from "@/styles/radix-nova/ui/field"
19+
import { Input } from "@/styles/radix-nova/ui/input"
20+
import { RadioGroup, RadioGroupItem } from "@/styles/radix-nova/ui/radio-group"
21+
import { Switch } from "@/styles/radix-nova/ui/switch"
2122

2223
export function AppearanceSettings() {
2324
const [gpuCount, setGpuCount] = React.useState(8)

apps/v4/app/(app)/(root)/components/button-group-demo.tsx

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
"use client"
22

33
import * as React from "react"
4-
import { Button } from "@/examples/radix/ui/button"
5-
import { ButtonGroup } from "@/examples/radix/ui/button-group"
4+
import {
5+
ArchiveIcon,
6+
ArrowLeftIcon,
7+
CalendarPlusIcon,
8+
ClockIcon,
9+
ListFilterIcon,
10+
MailCheckIcon,
11+
MoreHorizontalIcon,
12+
TagIcon,
13+
Trash2Icon,
14+
} from "lucide-react"
15+
16+
import { Button } from "@/styles/radix-nova/ui/button"
17+
import { ButtonGroup } from "@/styles/radix-nova/ui/button-group"
618
import {
719
DropdownMenu,
820
DropdownMenuContent,
@@ -15,18 +27,7 @@ import {
1527
DropdownMenuSubContent,
1628
DropdownMenuSubTrigger,
1729
DropdownMenuTrigger,
18-
} from "@/examples/radix/ui/dropdown-menu"
19-
import {
20-
ArchiveIcon,
21-
ArrowLeftIcon,
22-
CalendarPlusIcon,
23-
ClockIcon,
24-
ListFilterIcon,
25-
MailCheckIcon,
26-
MoreHorizontalIcon,
27-
TagIcon,
28-
Trash2Icon,
29-
} from "lucide-react"
30+
} from "@/styles/radix-nova/ui/dropdown-menu"
3031

3132
export function ButtonGroupDemo() {
3233
const [label, setLabel] = React.useState("personal")

apps/v4/app/(app)/(root)/components/button-group-input-group.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
"use client"
22

33
import * as React from "react"
4-
import { Button } from "@/examples/radix/ui/button"
5-
import { ButtonGroup } from "@/examples/radix/ui/button-group"
4+
import { AudioLinesIcon, PlusIcon } from "lucide-react"
5+
6+
import { Button } from "@/styles/radix-nova/ui/button"
7+
import { ButtonGroup } from "@/styles/radix-nova/ui/button-group"
68
import {
79
InputGroup,
810
InputGroupAddon,
911
InputGroupButton,
1012
InputGroupInput,
11-
} from "@/examples/radix/ui/input-group"
13+
} from "@/styles/radix-nova/ui/input-group"
1214
import {
1315
Tooltip,
1416
TooltipContent,
1517
TooltipTrigger,
16-
} from "@/examples/radix/ui/tooltip"
17-
import { AudioLinesIcon, PlusIcon } from "lucide-react"
18+
} from "@/styles/radix-nova/ui/tooltip"
1819

1920
export function ButtonGroupInputGroup() {
2021
const [voiceEnabled, setVoiceEnabled] = React.useState(false)

apps/v4/app/(app)/(root)/components/button-group-nested.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
"use client"
22

3-
import { Button } from "@/examples/radix/ui/button"
4-
import { ButtonGroup } from "@/examples/radix/ui/button-group"
53
import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react"
64

5+
import { Button } from "@/styles/radix-nova/ui/button"
6+
import { ButtonGroup } from "@/styles/radix-nova/ui/button-group"
7+
78
export function ButtonGroupNested() {
89
return (
910
<ButtonGroup>

apps/v4/app/(app)/(root)/components/button-group-popover.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import { Button } from "@/examples/radix/ui/button"
2-
import { ButtonGroup } from "@/examples/radix/ui/button-group"
1+
import { BotIcon, ChevronDownIcon } from "lucide-react"
2+
3+
import { Button } from "@/styles/radix-nova/ui/button"
4+
import { ButtonGroup } from "@/styles/radix-nova/ui/button-group"
35
import {
46
Popover,
57
PopoverContent,
68
PopoverTrigger,
7-
} from "@/examples/radix/ui/popover"
8-
import { Separator } from "@/examples/radix/ui/separator"
9-
import { Textarea } from "@/examples/radix/ui/textarea"
10-
import { BotIcon, ChevronDownIcon } from "lucide-react"
9+
} from "@/styles/radix-nova/ui/popover"
10+
import { Separator } from "@/styles/radix-nova/ui/separator"
11+
import { Textarea } from "@/styles/radix-nova/ui/textarea"
1112

1213
export function ButtonGroupPopover() {
1314
return (

apps/v4/app/(app)/(root)/components/empty-avatar-group.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
import { PlusIcon } from "lucide-react"
2+
13
import {
24
Avatar,
35
AvatarFallback,
46
AvatarGroup,
57
AvatarImage,
6-
} from "@/examples/radix/ui/avatar"
7-
import { Button } from "@/examples/radix/ui/button"
8+
} from "@/styles/radix-nova/ui/avatar"
9+
import { Button } from "@/styles/radix-nova/ui/button"
810
import {
911
Empty,
1012
EmptyContent,
1113
EmptyDescription,
1214
EmptyHeader,
1315
EmptyMedia,
1416
EmptyTitle,
15-
} from "@/examples/radix/ui/empty"
16-
import { PlusIcon } from "lucide-react"
17+
} from "@/styles/radix-nova/ui/empty"
1718

1819
export function EmptyAvatarGroup() {
1920
return (

apps/v4/app/(app)/(root)/components/field-checkbox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Checkbox } from "@/examples/radix/ui/checkbox"
2-
import { Field, FieldLabel } from "@/examples/radix/ui/field"
1+
import { Checkbox } from "@/styles/radix-nova/ui/checkbox"
2+
import { Field, FieldLabel } from "@/styles/radix-nova/ui/field"
33

44
export function FieldCheckbox() {
55
return (

apps/v4/app/(app)/(root)/components/field-demo.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Button } from "@/examples/radix/ui/button"
2-
import { Checkbox } from "@/examples/radix/ui/checkbox"
1+
import { Button } from "@/styles/radix-nova/ui/button"
2+
import { Checkbox } from "@/styles/radix-nova/ui/checkbox"
33
import {
44
Field,
55
FieldDescription,
@@ -8,17 +8,17 @@ import {
88
FieldLegend,
99
FieldSeparator,
1010
FieldSet,
11-
} from "@/examples/radix/ui/field"
12-
import { Input } from "@/examples/radix/ui/input"
11+
} from "@/styles/radix-nova/ui/field"
12+
import { Input } from "@/styles/radix-nova/ui/input"
1313
import {
1414
Select,
1515
SelectContent,
1616
SelectGroup,
1717
SelectItem,
1818
SelectTrigger,
1919
SelectValue,
20-
} from "@/examples/radix/ui/select"
21-
import { Textarea } from "@/examples/radix/ui/textarea"
20+
} from "@/styles/radix-nova/ui/select"
21+
import { Textarea } from "@/styles/radix-nova/ui/textarea"
2222

2323
export function FieldDemo() {
2424
return (

apps/v4/app/(app)/(root)/components/field-hear.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Card, CardContent } from "@/examples/radix/ui/card"
2-
import { Checkbox } from "@/examples/radix/ui/checkbox"
1+
import { Card, CardContent } from "@/styles/radix-nova/ui/card"
2+
import { Checkbox } from "@/styles/radix-nova/ui/checkbox"
33
import {
44
Field,
55
FieldDescription,
@@ -8,7 +8,7 @@ import {
88
FieldLegend,
99
FieldSet,
1010
FieldTitle,
11-
} from "@/examples/radix/ui/field"
11+
} from "@/styles/radix-nova/ui/field"
1212

1313
const options = [
1414
{

0 commit comments

Comments
 (0)