diff options
| author | Steve Klebanoff <steve@0xproject.com> | 2018-12-05 09:41:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 09:41:42 +0800 |
| commit | 2f50cca480092c14d5a8737f50aa08c99ae825b4 (patch) | |
| tree | 7f9fa1aa0861c35828430698b02cc4b03aa76826 /packages | |
| parent | 0a944244cfdaf99d15a2e4f002dd5e5013a28ae5 (diff) | |
| parent | 40ac4509caf8749671b27f046941ac30e77aa521 (diff) | |
| download | dexon-0x-contracts-2f50cca480092c14d5a8737f50aa08c99ae825b4.tar dexon-0x-contracts-2f50cca480092c14d5a8737f50aa08c99ae825b4.tar.gz dexon-0x-contracts-2f50cca480092c14d5a8737f50aa08c99ae825b4.tar.bz2 dexon-0x-contracts-2f50cca480092c14d5a8737f50aa08c99ae825b4.tar.lz dexon-0x-contracts-2f50cca480092c14d5a8737f50aa08c99ae825b4.tar.xz dexon-0x-contracts-2f50cca480092c14d5a8737f50aa08c99ae825b4.tar.zst dexon-0x-contracts-2f50cca480092c14d5a8737f50aa08c99ae825b4.zip | |
Merge pull request #1382 from 0xProject/fix/instant/center-powered-by
[instant] Center powered by and change to text to Connect
Diffstat (limited to 'packages')
4 files changed, 11 insertions, 7 deletions
diff --git a/packages/instant/src/components/payment_method.tsx b/packages/instant/src/components/payment_method.tsx index 603788748..7c93f1d1c 100644 --- a/packages/instant/src/components/payment_method.tsx +++ b/packages/instant/src/components/payment_method.tsx @@ -88,10 +88,14 @@ export class PaymentMethod extends React.Component<PaymentMethodProps> { return ( <WalletPrompt onClick={this.props.onUnlockWalletClick} - image={<Icon width={13} icon="lock" color={ColorOption.black} />} + image={ + <Container position="relative" top="2px"> + <Icon width={13} icon="lock" color={ColorOption.black} /> + </Container> + } {...colors} > - Please Unlock {this.props.walletDisplayName} + Click to Connect {this.props.walletDisplayName} </WalletPrompt> ); case AccountState.None: diff --git a/packages/instant/src/components/wallet_prompt.tsx b/packages/instant/src/components/wallet_prompt.tsx index a0b3ae457..c07cfe7b5 100644 --- a/packages/instant/src/components/wallet_prompt.tsx +++ b/packages/instant/src/components/wallet_prompt.tsx @@ -21,7 +21,7 @@ export const WalletPrompt: React.StatelessComponent<WalletPromptProps> = ({ primaryColor, }) => ( <Container - padding="14.5px" + padding="10px" border={`1px solid ${primaryColor}`} backgroundColor={secondaryColor} width="100%" @@ -33,7 +33,7 @@ export const WalletPrompt: React.StatelessComponent<WalletPromptProps> = ({ <Flex> {image} <Container marginLeft="10px"> - <Text fontSize="16px" fontColor={primaryColor}> + <Text fontSize="16px" fontColor={primaryColor} fontWeight="500"> {children} </Text> </Container> diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx index 8a809ee31..0337c7714 100644 --- a/packages/instant/src/components/zero_ex_instant_container.tsx +++ b/packages/instant/src/components/zero_ex_instant_container.tsx @@ -70,7 +70,7 @@ export class ZeroExInstantContainer extends React.Component<ZeroExInstantContain marginTop="10px" marginLeft="auto" marginRight="auto" - width="140px" + width="108px" > <a href={ZERO_EX_SITE_URL} target="_blank"> <PoweredByLogo /> diff --git a/packages/instant/src/style/theme.ts b/packages/instant/src/style/theme.ts index 71e4b7052..fd3f03c3f 100644 --- a/packages/instant/src/style/theme.ts +++ b/packages/instant/src/style/theme.ts @@ -38,8 +38,8 @@ export const theme: Theme = { lightestGrey: '#EEEEEE', darkGrey: '#333333', white: 'white', - lightOrange: '#F9F2ED', - darkOrange: '#F2994C', + lightOrange: '#FFF8F2', + darkOrange: '#F7A24F', green: '#3CB34F', red: '#D00000', darkBlue: '#135df6', |