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
This commit is contained in:
Fabio Berger
2018-03-22 12:00:41 +00:00
11 changed files with 485 additions and 47 deletions

View File

@@ -45,4 +45,7 @@ export const colors = {
orange: '#E69D00',
amber800: '#FF8F00',
darkYellow: '#caca03',
walletBoxShadow: 'rgba(56, 59, 137, 0.2)',
walletBorder: '#f5f5f6',
walletDefaultItemBackground: '#fbfbfc',
};