Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: divider, link, navigation and select component style inconsistencies #134

Merged
merged 1 commit into from
Jun 18, 2024
+8 −14
Merged

fix: divider, link, navigation and select component style inconsistencies #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/theme/src/components/divider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import { tv } from 'tailwind-variants'

export const divider = tv({
slots: {
divider: ['list-item', 'shrink-0', 'bg-partition', 'border-none'],
divider: ['shrink-0', 'bg-partition', 'border-none'],
},
variants: {
orientation: {
horizontal: {
divider: ['w-px', 'h-full'],
divider: ['h-px', 'w-full'],
},
vertical: {
divider: ['h-px', 'w-full'],
divider: ['w-px', 'h-full'],
},
},
},
Expand Down
8 changes: 1 addition & 7 deletions packages/theme/src/components/link.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@ import { tv } from 'tailwind-variants'

export const link = tv({
slots: {
link: [
'text-inherit hover:text-sky-600',
'transition-all duration-200',
'rounded',
'disabled:cursor-default disabled:opacity-50',
'focus:outline-dashed focus:outline-offset-2 focus:outline-1 focus:outline-sky-600',
],
link: ['text-sky-600', 'transition-all duration-200', 'rounded', 'disabled:cursor-default disabled:opacity-50'],
},
variants: {
underline: {
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/src/components/navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export const navigation = tv({
divider: ['bg-partition', 'border-partition'],
trigger: [
'flex items-center grow gap-x-3',
'p-2',
'focus:outline-dashed focus:outline-offset-2 focus:outline-1 focus:outline-partition',
],
},
Expand All @@ -23,7 +22,7 @@ export const navigation = tv({
wrapper: ['flex-row items-center', 'w-full', 'px-4 md:px-6'],
segment: ['items-center'],
divider: ['h-full', 'w-px', 'mx-2'],
trigger: ['py-2 px-6'],
trigger: ['p-2'],
},
vertical: {
wrapper: ['flex-col', 'h-full', 'p-4'],
Expand Down Expand Up @@ -51,6 +50,7 @@ export const navigation = tv({
lg: {},
},
variant: {
none: {},
highlight: {
item: ['rounded-md hover:bg-foreground'],
trigger: ['rounded-md'],
Expand Down
4 changes: 2 additions & 2 deletions packages/theme/src/components/select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ export const select = tv({
'cursor-pointer',
'has-[:disabled]:opacity-50',
],
placeholder: ['text-subtitle'],
placeholder: [],
button: ['flex flex-row items-center justify-between', 'w-full', 'p-1.5', 'focus:outline-none'],
icon: [],
icon: ['shrink-0'],
popover: ['bg-foreground', 'border border-solid border-partition', 'rounded-md', 'w-[--trigger-width]'],
list: ['flex flex-col gap-1', 'p-1', 'outline-none'],
option: [
Expand Down