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/minor issues #2093

Merged
merged 3 commits into from
Apr 24, 2024
Merged

Fix/minor issues #2093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a863de0
fix: checkbox label and modal close button
Apr 24, 2024
575c675
Merge branch 'patch' of github.com:gluestack/gluestack-ui into fix/mi…
Apr 24, 2024
e94389e
fix: radio and linear-gradient fixes
Apr 24, 2024
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
2 changes: 1 addition & 1 deletion example/storybook-nativewind/src/core-components/nativewind/checkbox/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const checkboxIndicatorStyle = tva({
});

const checkboxLabelStyle = tva({
base: 'text-typography-600 data-[checked=true]:text-typography-900 group-hover/checkbox:text-typography-900 group-hover/checkbox:data-[checked=true]:text-typography-900 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:text-typography-900 group-hover/checkbox:data-[disabled=true]:text-typography-400 active:text-typography-900 active:data-[checked=true]:text-typography-900 data-[disabled=true]:opacity-40 web:select-none',
base: 'text-typography-600 data-[checked=true]:text-typography-900 group-hover/checkbox:text-typography-900 group-hover/checkbox:data-[checked=true]:text-typography-900 group-hover/checkbox:data-[checked=true]:data-[disabled=true]:text-typography-900 group-hover/checkbox:data-[disabled=true]:text-typography-400 data-[active=true]:text-typography-900 data-[active=true]:data-[checked=true]:text-typography-900 data-[disabled=true]:opacity-40 web:select-none',
parentVariants: {
size: {
lg: 'text-lg',
Expand Down
2 changes: 1 addition & 1 deletion example/storybook-nativewind/src/core-components/nativewind/modal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const modalBodyStyle = tva({
});

const modalCloseButtonStyle = tva({
base: 'group/modal-close-button z-10 p-2 rounded-sm data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer',
base: 'group/modal-close-button z-10 p-2 rounded data-[focus-visible=true]:web:bg-background-100 web:outline-0 cursor-pointer',
});

const modalHeaderStyle = tva({
Expand Down
10 changes: 5 additions & 5 deletions example/storybook-nativewind/src/core-components/nativewind/radio/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ const radioIconStyle = tva({

parentVariants: {
size: {
sm: 'h-[10px] w-[10px]',
md: 'h-[14px] w-[14px]',
sm: 'h-3 w-3',
md: 'h-4 w-4',
lg: 'h-[18px] w-[18px]',
},
},
Expand All @@ -71,9 +71,9 @@ const radioIndicatorStyle = tva({
base: 'justify-center items-center bg-transparent border-outline-400 border-2 rounded-full data-[focus-visible=true]:web:outline-2 data-[focus-visible=true]:web:outline-primary-700 data-[focus-visible=true]:web:outline data-[checked=true]:border-primary-600 data-[checked=true]:bg-transparent data-[hover=true]:border-outline-500 data-[hover=true]:bg-transparent data-[hover=true]:data-[checked=true]:bg-transparent data-[hover=true]:data-[checked=true]:border-primary-700 data-[hover=true]:data-[invalid=true]:border-error-700 data-[hover=true]:data-[disabled=true]:opacity-40 data-[hover=true]:data-[disabled=true]:border-outline-400 data-[hover=true]:data-[disabled=true]:data-[invalid=true]:border-error-400 data-[active=true]:bg-transparent data-[active=true]:border-primary-800 data-[invalid=true]:border-error-700 data-[disabled=true]:opacity-40 data-[disabled=true]:data-[checked=true]:border-outline-400 data-[disabled=true]:data-[checked=true]:bg-transparent data-[disabled=true]:data-[invalid=true]:border-error-400',
parentVariants: {
size: {
sm: 'h-[16px] w-[16px]',
md: 'h-[20px] w-[20px]',
lg: 'h-[24px] w-[24px]',
sm: 'p-px h-4 w-4',
md: 'p-[1.5px] h-5 w-5',
lg: 'p-0.5 h-6 w-6',
},
},
});
Expand Down
Empty file added example/storybook-nativewind/src/recipes/linear-gradient/index.themed.stories.mdx
View file
Open in desktop
Empty file.
Loading