Skip to content

Commit 80896d0

Browse files
authored
Merge pull request #2303 from gluestack/fix/docs-color-combination
Fix/docs color combination
2 parents 3ab0515 + f83347f commit 80896d0

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

example/storybook-nativewind/src/components/Toast/index.nw.stories.mdx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,9 @@ The Examples section provides visual representations of the different variants o
433433
return (
434434
<Toast
435435
action="error"
436+
variant="outline"
436437
nativeID={uniqueToastId}
437-
className="p-4 gap-6 w-full shadow-hard-5 max-w-[443px] flex-row justify-between"
438+
className="p-4 gap-6 border-error-500 w-full shadow-hard-5 max-w-[443px] flex-row justify-between"
438439
>
439440
<HStack space="md">
440441
<Icon
@@ -443,18 +444,18 @@ The Examples section provides visual representations of the different variants o
443444
size="lg"
444445
/>
445446
<VStack space="xs">
446-
<ToastTitle className="font-semibold">Error!</ToastTitle>
447-
<ToastDescription className="text-typography-100" size="sm">
447+
<ToastTitle className="font-semibold text-error-500">Error!</ToastTitle>
448+
<ToastDescription size="sm">
448449
Something went wrong.
449450
</ToastDescription>
450451
</VStack>
451452
</HStack>
452453
<HStack className="min-[450px]:gap-3 gap-1">
453454
<Button variant="link" size="sm" className="px-3.5 self-center">
454-
<ButtonText className="text-typography-0 group-hover/button:text-typography-50">Retry</ButtonText>
455+
<ButtonText>Retry</ButtonText>
455456
</Button>
456457
<Pressable onPress={() => toast.close(id)}>
457-
<Icon as={CloseIcon} className="stroke-background-0" />
458+
<Icon as={CloseIcon} />
458459
</Pressable>
459460
</HStack>
460461
</Toast>

example/storybook-nativewind/src/extra-components/nativewind/Demos/ModalDemo.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ const ModalDemo = () => {
6161
</Button>
6262
<Button
6363
size="sm"
64-
action="positive"
6564
onPress={() => {
6665
setShowModal(false);
6766
}}

example/storybook-nativewind/src/hooks/useMediaQuery/index.nw.stories.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import Wrapper from '../../core-components/nativewind/Wrapper';
6868
<Box
6969
className={
7070
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
71-
(isMobile ? 'border-green-500 bg-green-50' : '')
71+
(isMobile ? 'border-primary-500 bg-background-50' : '')
7272
}
7373
>
7474
<Icon as={Smartphone} size={'xs'} />
@@ -77,7 +77,7 @@ import Wrapper from '../../core-components/nativewind/Wrapper';
7777
<Box
7878
className={
7979
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
80-
(isTablet ? 'border-green-500 bg-green-50' : '')
80+
(isTablet ? 'border-primary-500 bg-background-50' : '')
8181
}
8282
>
8383
<Icon as={Tablet} size="sm" />
@@ -86,7 +86,7 @@ import Wrapper from '../../core-components/nativewind/Wrapper';
8686
<Box
8787
className={
8888
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
89-
(isSmallScreen ? 'border-green-500 bg-green-50' : '')
89+
(isSmallScreen ? 'border-primary-500 bg-background-50' : '')
9090
}
9191
>
9292
<Icon as={Laptop} size="sm" />
@@ -95,7 +95,7 @@ import Wrapper from '../../core-components/nativewind/Wrapper';
9595
<Box
9696
className={
9797
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
98-
(isLargeScreen ? 'border-green-500 bg-green-50' : '')
98+
(isLargeScreen ? 'border-primary-500 bg-background-50' : '')
9999
}
100100
>
101101
<Icon as={Tv} size="sm" />

example/storybook-nativewind/src/hooks/useMediaQuery/useMediaQuery.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const UseMediaQueryBasic = ({ ...props }: any) => {
3131
<Box
3232
className={
3333
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
34-
(isMobile ? 'border-green-500 bg-green-50' : '')
34+
(isMobile ? 'border-primary-500 bg-background-50' : '')
3535
}
3636
>
3737
<Icon as={Smartphone} size={'xs'} />
@@ -40,7 +40,7 @@ const UseMediaQueryBasic = ({ ...props }: any) => {
4040
<Box
4141
className={
4242
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
43-
(isTablet ? 'border-green-500 bg-green-50' : '')
43+
(isTablet ? 'border-primary-500 bg-background-50' : '')
4444
}
4545
>
4646
<Icon as={Tablet} />
@@ -49,7 +49,7 @@ const UseMediaQueryBasic = ({ ...props }: any) => {
4949
<Box
5050
className={
5151
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
52-
(isSmallScreen ? 'border-green-500 bg-green-50' : '')
52+
(isSmallScreen ? 'border-primary-500 bg-background-50' : '')
5353
}
5454
>
5555
<Icon as={Laptop} />
@@ -58,7 +58,7 @@ const UseMediaQueryBasic = ({ ...props }: any) => {
5858
<Box
5959
className={
6060
'border justify-center items-center w-[120px] h-[80px] rounded gap-2 ' +
61-
(isLargeScreen ? 'border-green-500 bg-green-50' : '')
61+
(isLargeScreen ? 'border-primary-500 bg-background-50' : '')
6262
}
6363
>
6464
<Icon as={Tv} />

0 commit comments

Comments
 (0)