-
-
Notifications
You must be signed in to change notification settings - Fork 7
fix: update background color stories #859
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,18 +27,23 @@ export default meta; | |
| type Story = StoryObj; | ||
|
|
||
| const ButtonComponents = () => ( | ||
| <Box flexDirection={BoxFlexDirection.Row} gap={2}> | ||
| <Button variant={ButtonVariant.Primary}>Primary Button</Button> | ||
| <Button variant={ButtonVariant.Secondary}>Secondary Button</Button> | ||
| <Button variant={ButtonVariant.Tertiary}>Tertiary Button</Button> | ||
| <TextButton>Text Button</TextButton> | ||
| <Box flexDirection={BoxFlexDirection.Column} gap={2}> | ||
| <Button isFullWidth variant={ButtonVariant.Primary}> | ||
| Primary Button | ||
| </Button> | ||
| <Button isFullWidth variant={ButtonVariant.Secondary}> | ||
| Secondary Button | ||
| </Button> | ||
| <Button isFullWidth variant={ButtonVariant.Tertiary}> | ||
| Tertiary Button | ||
| </Button> | ||
| </Box> | ||
| ); | ||
|
|
||
| const TextComponents = () => ( | ||
| <> | ||
| <Text variant={TextVariant.HeadingSm}>Text & Icon Colors</Text> | ||
| <Box twClassName="space-y-2"> | ||
| <Box flexDirection={BoxFlexDirection.Column} gap={2}> | ||
| <Box | ||
| flexDirection={BoxFlexDirection.Row} | ||
| alignItems={BoxAlignItems.Center} | ||
|
|
@@ -65,18 +70,16 @@ const TextComponents = () => ( | |
| <Icon name={IconName.Info} color={IconColor.IconMuted} /> | ||
| <Text color={TextColor.TextMuted}>Text Muted and Icon Muted</Text> | ||
| </Box> | ||
| <TextButton>Text Button</TextButton> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moving TextButton to text where it's likely to be used instead of in a button group |
||
| </Box> | ||
| </> | ||
| ); | ||
|
|
||
| const Backgrounds: React.FC = () => { | ||
| const tw = useTailwind(); | ||
| return ( | ||
| <ScrollView style={tw`flex-1 bg-default`}> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. background/default is right up against the edge of text here. Going to move to change storybook background color altogether |
||
| <Box | ||
| twClassName="w-full" | ||
| backgroundColor={BoxBackgroundColor.BackgroundDefault} | ||
| > | ||
| <ScrollView style={tw`flex-1`}> | ||
| <Box twClassName="w-full"> | ||
georgewrmarshall marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {/* Background Default */} | ||
| <Box | ||
| flexDirection={BoxFlexDirection.Column} | ||
|
|
@@ -88,7 +91,8 @@ const Backgrounds: React.FC = () => { | |
| <ButtonComponents /> | ||
| {/* Background Section */} | ||
| <Box | ||
| twClassName="p-4 rounded-2xl" | ||
| twClassName="rounded-2xl" | ||
| padding={4} | ||
| backgroundColor={BoxBackgroundColor.BackgroundSection} | ||
| flexDirection={BoxFlexDirection.Column} | ||
| gap={4} | ||
|
|
@@ -99,7 +103,8 @@ const Backgrounds: React.FC = () => { | |
|
|
||
| {/* Background Subsection */} | ||
| <Box | ||
| twClassName="p-4 rounded-2xl" | ||
| twClassName="rounded-2xl" | ||
| padding={4} | ||
| backgroundColor={BoxBackgroundColor.BackgroundSubsection} | ||
| flexDirection={BoxFlexDirection.Column} | ||
| gap={4} | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,6 @@ const ButtonComponents = () => ( | |
| <Button variant={ButtonVariant.Primary}>Primary Button</Button> | ||
| <Button variant={ButtonVariant.Secondary}>Secondary Button</Button> | ||
| <Button variant={ButtonVariant.Tertiary}>Tertiary Button</Button> | ||
| <TextButton>Text Button</TextButton> | ||
| </Box> | ||
| ); | ||
|
|
||
|
|
@@ -63,6 +62,7 @@ const TextComponents = () => ( | |
| <Icon name={IconName.Info} color={IconColor.IconMuted} /> | ||
| <Text color={TextColor.TextMuted}>Text Muted and Icon Muted</Text> | ||
| </Box> | ||
| <TextButton>Text Button</TextButton> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moving TextButton to text where it's likely to be used instead of in a button group |
||
| </Box> | ||
| </> | ||
| ); | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
space-y-2doesn't work with twrnc