Skip to content

Commit ad4b2db

Browse files
authored
Merge branch 'main' into added-new-sizes
2 parents 2c35e4e + 84bd513 commit ad4b2db

File tree

20 files changed

+135
-39
lines changed

20 files changed

+135
-39
lines changed

.changeset/hip-baths-heal.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

apps/preview/app/(tabs)/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState } from 'react'
22
import { View } from 'react-native';
33
import { useColorScheme } from "@/hooks/useColorScheme";
4-
import { Button, ButtonLabel, TextField, Switch, ButtonIcon, IconButton, IconButtonIcon } from "@vega-ui/react-native";
4+
import { Button, ButtonLabel, TextField, Switch, IconButton, IconButtonIcon } from "@vega-ui/react-native";
55
import { Globe } from "@vega-ui/reanimated-icons";
66

77
export default function HomeScreen() {
@@ -16,7 +16,7 @@ export default function HomeScreen() {
1616
<TextField disabled keyboardType='email-address' placeholder='Last name' />
1717
<TextField error disabled keyboardType='email-address' placeholder='Last name' />
1818
<Switch />
19-
<Button onPress={() => setValue(value + 1)}>
19+
<Button variant='secondary' appearance='transparent' onPress={() => setValue(value + 1)}>
2020
<ButtonLabel>Increment (now: {value})</ButtonLabel>
2121
</Button>
2222
<IconButton>

packages/icons/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @vega-ui/icons-react-native
22

3+
## 0.5.2
4+
5+
## 0.5.1
6+
7+
## 0.5.0
8+
39
## 0.4.0
410

511
## 0.3.0

packages/icons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vega-ui/icons-react-native",
3-
"version": "0.4.0",
3+
"version": "0.5.2",
44
"description": "Vega UI - Icons (React Native)",
55
"license": "MIT",
66
"author": "VegaUI Team",

packages/reanimated-icons/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @vega-ui/reanimated-icons
22

3+
## 0.5.2
4+
5+
## 0.5.1
6+
7+
## 0.5.0
8+
39
## 0.4.0
410

511
### Minor Changes

packages/reanimated-icons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vega-ui/reanimated-icons",
3-
"version": "0.4.0",
3+
"version": "0.5.2",
44
"description": "Vega UI - Reanimated Icons (React Native)",
55
"license": "MIT",
66
"author": "VegaUI Team",

packages/theme/CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# @vega-ui/theme
22

3+
## 0.5.2
4+
5+
### Patch Changes
6+
7+
- 10dcbe8: The gray colors have been changed, the surface has been added, and the fields styles have also been changed
8+
- Updated dependencies [10dcbe8]
9+
- @vega-ui/tokens@0.5.2
10+
11+
## 0.5.1
12+
13+
### Patch Changes
14+
15+
- cff8d2c: Made surface color (dark theme) darker and more contrast
16+
- @vega-ui/tokens@0.5.1
17+
18+
## 0.5.0
19+
20+
### Patch Changes
21+
22+
- Updated dependencies [b19c4f8]
23+
- @vega-ui/tokens@0.5.0
24+
325
## 0.4.0
426

527
### Minor Changes

packages/theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vega-ui/theme",
3-
"version": "0.4.0",
3+
"version": "0.5.2",
44
"description": "Vega UI - Theme for React apps",
55
"license": "MIT",
66
"author": "VegaUI Team",

packages/theme/src/constants/themes/dark.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ export const darkTheme: Theme = {
1313
black: colors.black,
1414

1515
surface: {
16-
foreground: '#1F2227',
16+
ultrathin: '#1E2025',
17+
thin: colors.white,
18+
regular: colors.gray['950'],
19+
thick: colors.gray['900'],
20+
ultrathick: colors.gray['850'],
1721
},
1822

1923
gray: {
@@ -186,14 +190,16 @@ export const darkTheme: Theme = {
186190

187191
disable: {
188192
text: colors.gray[300],
189-
background: colors.gray[900],
193+
background: colors.gray[850],
190194
placeholderText: colors.gray[400],
191195
border: colors.gray[700]
192196
},
193197

194198
field: {
195199
placeholder: colors.gray[500],
196200
border: colors.gray[700],
197-
borderActive: colors.gray[500]
201+
borderActive: colors.gray[500],
202+
backgroundColor: colors.gray['950'],
203+
backgroundHoverColor: colors.gray['900'],
198204
}
199205
} as const

packages/theme/src/constants/themes/light.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ export const lightTheme: Theme = {
1313
black: colors.black,
1414

1515
surface: {
16-
foreground: '#FFFFFF',
16+
ultrathin: colors.white,
17+
thin: colors.gray['50'],
18+
regular: colors.gray['50'],
19+
thick: colors.gray['100'],
20+
ultrathick: colors.gray['150'],
1721
},
1822

1923
gray: {
@@ -186,14 +190,16 @@ export const lightTheme: Theme = {
186190

187191
disable: {
188192
text: colors.gray[700],
189-
background: colors.gray[100],
193+
background: colors.gray[150],
190194
placeholderText: colors.gray[600],
191195
border: colors.gray[300]
192196
},
193197

194198
field: {
195199
placeholder: colors.gray[500],
196200
border: colors.gray[300],
197-
borderActive: colors.gray[500]
201+
borderActive: colors.gray[500],
202+
backgroundColor: colors.gray['50'],
203+
backgroundHoverColor: colors.gray['100'],
198204
}
199205
} as const

0 commit comments

Comments
 (0)