diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-03-22 20:00:41 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-03-22 20:00:41 +0800 |
| commit | beb483ea85ca0df707e81883d612125be1968389 (patch) | |
| tree | 9b9a043b2225cb980fa04d0be8a8040147a8b5df /packages/react-shared | |
| parent | 46b7fecafe283e814e2088373ec857747e4cf314 (diff) | |
| parent | 8478dc8d6d05efcdeac6653872f35149f3c9589c (diff) | |
| download | dexon-sol-tools-beb483ea85ca0df707e81883d612125be1968389.tar.gz dexon-sol-tools-beb483ea85ca0df707e81883d612125be1968389.tar.zst dexon-sol-tools-beb483ea85ca0df707e81883d612125be1968389.zip | |
Merge branch 'development' into addExtraDocs
* development:
Change blockchain prop to not optional
Other style changes
Updated padding and colors
Refactor TokenState type
Fix a bug causing fillOrdersUpTo validation to fail because of some extra orders being passed
Implement initial wallet interface
# Conflicts:
# packages/react-shared/CHANGELOG.md
# packages/website/ts/types.ts
Diffstat (limited to 'packages/react-shared')
| -rw-r--r-- | packages/react-shared/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | packages/react-shared/src/utils/colors.ts | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index ae13588dc..51fb8e4b6 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG -## v0.0.2 - _TBD_ +## v0.1.0 - _TBD, 2018_ + * Added new colors (#468) * Fix section and menuItem text display to replace dashes with spaces. diff --git a/packages/react-shared/src/utils/colors.ts b/packages/react-shared/src/utils/colors.ts index 2eead95c7..ea0165305 100644 --- a/packages/react-shared/src/utils/colors.ts +++ b/packages/react-shared/src/utils/colors.ts @@ -45,4 +45,7 @@ export const colors = { orange: '#E69D00', amber800: '#FF8F00', darkYellow: '#caca03', + walletBoxShadow: 'rgba(56, 59, 137, 0.2)', + walletBorder: '#f5f5f6', + walletDefaultItemBackground: '#fbfbfc', }; |