diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-04-02 01:41:28 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-04-02 01:41:28 +0800 |
| commit | 08b30b0706751eb2a4318f8287dd8a7502276a59 (patch) | |
| tree | 51e77fd3fc031d1bd7381422c4e8f90263b89e87 /packages/react-shared | |
| parent | bf52ce7e725224de23c2a5318b8224cc92e5188a (diff) | |
| parent | 19454a92dcf29c3c50d3d62cbda3c62b7bafe37f (diff) | |
| download | dexon-sol-tools-08b30b0706751eb2a4318f8287dd8a7502276a59.tar dexon-sol-tools-08b30b0706751eb2a4318f8287dd8a7502276a59.tar.gz dexon-sol-tools-08b30b0706751eb2a4318f8287dd8a7502276a59.tar.bz2 dexon-sol-tools-08b30b0706751eb2a4318f8287dd8a7502276a59.tar.lz dexon-sol-tools-08b30b0706751eb2a4318f8287dd8a7502276a59.tar.xz dexon-sol-tools-08b30b0706751eb2a4318f8287dd8a7502276a59.tar.zst dexon-sol-tools-08b30b0706751eb2a4318f8287dd8a7502276a59.zip | |
Merge branch 'development' into refactor/publishProcess
* development:
Add HACK comment and reorganize use other wallet button
Fixed comment(s) for PR #488
OrderStateWatcher fixes for PR #488
Amended comments to clarify changes on PR #488
Monitor different state layers with OrderWatcher
Implement wallet locked and uninstalled states
Style changes
Remove props that are covered by the defaults
Implement ETH/WETH conversion and allowance toggle styling
Diffstat (limited to 'packages/react-shared')
| -rw-r--r-- | packages/react-shared/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | packages/react-shared/src/utils/colors.ts | 21 |
2 files changed, 19 insertions, 3 deletions
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md index 51fb8e4b6..9fffd8ea3 100644 --- a/packages/react-shared/CHANGELOG.md +++ b/packages/react-shared/CHANGELOG.md @@ -4,3 +4,4 @@ * Added new colors (#468) * Fix section and menuItem text display to replace dashes with spaces. + * Reorganized colors and added new ones diff --git a/packages/react-shared/src/utils/colors.ts b/packages/react-shared/src/utils/colors.ts index ea0165305..7613414ae 100644 --- a/packages/react-shared/src/utils/colors.ts +++ b/packages/react-shared/src/utils/colors.ts @@ -1,7 +1,6 @@ import { colors as materialUiColors } from 'material-ui/styles'; -export const colors = { - ...materialUiColors, +const baseColors = { gray40: '#F8F8F8', grey50: '#FAFAFA', grey100: '#F5F5F5', @@ -27,6 +26,7 @@ export const colors = { lightBlue: '#60A4F4', lightBlueA700: '#0091EA', linkBlue: '#1D5CDE', + mediumBlue: '#488AEA', darkBlue: '#4D5481', turquois: '#058789', lightPurple: '#A81CA6', @@ -45,7 +45,22 @@ export const colors = { orange: '#E69D00', amber800: '#FF8F00', darkYellow: '#caca03', +}; + +const appColors = { + // wallet specific colors walletBoxShadow: 'rgba(56, 59, 137, 0.2)', - walletBorder: '#f5f5f6', + walletBorder: '#ededee', walletDefaultItemBackground: '#fbfbfc', + walletFocusedItemBackground: '#f0f1f4', + allowanceToggleShadow: 'rgba(0, 0, 0, 0)', + allowanceToggleOffTrack: '#adadad', + allowanceToggleOnTrack: baseColors.mediumBlue, + wrapEtherConfirmationButton: baseColors.mediumBlue, +}; + +export const colors = { + ...materialUiColors, + ...baseColors, + ...appColors, }; |