- topbar
+
+ Topbar
+
- composer
+
+ Composer
+
diff --git a/packages/components/src/button/button.tsx b/packages/components/src/button/button.tsx
index 4f8f4858..8bb88fc8 100644
--- a/packages/components/src/button/button.tsx
+++ b/packages/components/src/button/button.tsx
@@ -1,15 +1,9 @@
-import { Stack, styled, Text } from '@tamagui/core'
+import { styled, Text } from '@tamagui/core'
+import { ButtonFrame } from 'tamagui'
import type { GetProps } from '@tamagui/core'
-// import { Button} from 'react-native'
-// import { Button as RNButton } from 'react-native'
-
-// setupReactNative({ Button: RNButton })
-
-// import type { GetProps} from '@tamagui/core';
-
-const Base = styled(Stack, {
+const Base = styled(ButtonFrame, {
// tag: 'button',
cursor: 'pointer',
@@ -17,26 +11,27 @@ const Base = styled(Stack, {
display: 'inline-flex',
paddingHorizontal: 16,
paddingVertical: 10,
-
+ animation: 'fast',
variants: {
type: {
primary: {
- backgroundColor: 'hsla(229, 71%, 57%, 1)',
- hoverStyle: { backgroundColor: 'hsla(229, 54%, 45%, 1)' },
- pressStyle: { backgroundColor: 'hsla(229, 54%, 45%, 1)' },
+ backgroundColor: '$primary',
+ hoverStyle: { backgroundColor: '$primaryHover' },
+ pressStyle: { backgroundColor: '$primaryHover' },
},
positive: {
- backgroundColor: 'hsla(174, 63%, 40%, 1)',
- hoverStyle: { backgroundColor: 'hsla(174, 63%, 34%, 1)' },
- pressStyle: { backgroundColor: 'hsla(174, 63%, 34%, 1)' },
+ backgroundColor: '$success',
+ hoverStyle: { backgroundColor: '$successHover' },
+ pressStyle: { backgroundColor: '$successHover' },
},
},
} as const,
})
const ButtonText = styled(Text, {
- color: 'rgb(255, 255, 255)',
+ fontFamily: '$inter',
textAlign: 'center',
+ color: '$white',
})
type BaseProps = GetProps