diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-11-14 15:14:23 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-11-15 02:00:18 +0800 |
| commit | 7688037fb86334ec2913c6fa850b6514fd9986b8 (patch) | |
| tree | 54abcb22177dd2d3f301da258134bcbc5e2e1968 /packages | |
| parent | 997912a8f8647fed9ff10570e332ff84807907aa (diff) | |
| download | dexon-sol-tools-7688037fb86334ec2913c6fa850b6514fd9986b8.tar dexon-sol-tools-7688037fb86334ec2913c6fa850b6514fd9986b8.tar.gz dexon-sol-tools-7688037fb86334ec2913c6fa850b6514fd9986b8.tar.bz2 dexon-sol-tools-7688037fb86334ec2913c6fa850b6514fd9986b8.tar.lz dexon-sol-tools-7688037fb86334ec2913c6fa850b6514fd9986b8.tar.xz dexon-sol-tools-7688037fb86334ec2913c6fa850b6514fd9986b8.tar.zst dexon-sol-tools-7688037fb86334ec2913c6fa850b6514fd9986b8.zip | |
fix(instant): border radius
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/instant/src/components/instant_heading.tsx | 7 | ||||
| -rw-r--r-- | packages/instant/src/components/ui/container.tsx | 4 | ||||
| -rw-r--r-- | packages/instant/src/components/zero_ex_instant_container.tsx | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/packages/instant/src/components/instant_heading.tsx b/packages/instant/src/components/instant_heading.tsx index 7f9567454..002695269 100644 --- a/packages/instant/src/components/instant_heading.tsx +++ b/packages/instant/src/components/instant_heading.tsx @@ -32,12 +32,7 @@ export class InstantHeading extends React.Component<InstantHeadingProps, {}> { public render(): React.ReactNode { const iconOrAmounts = this._renderIcon() || this._renderAmountsSection(); return ( - <Container - backgroundColor={ColorOption.primaryColor} - padding="20px" - width="100%" - borderRadius="3px 3px 0px 0px" - > + <Container backgroundColor={ColorOption.primaryColor} padding="20px" width="100%"> <Container marginBottom="5px"> <Text letterSpacing="1px" diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx index 8aa5db9e5..4dafe1386 100644 --- a/packages/instant/src/components/ui/container.tsx +++ b/packages/instant/src/components/ui/container.tsx @@ -20,7 +20,7 @@ export interface ContainerProps { marginBottom?: string; marginLeft?: string; padding?: string; - borderRadius?: string; + borderRadius?: MediaChoice; border?: string; borderColor?: ColorOption; borderTop?: string; @@ -57,7 +57,6 @@ export const Container = ${props => cssRuleIfExists(props, 'margin-bottom')} ${props => cssRuleIfExists(props, 'margin-left')} ${props => cssRuleIfExists(props, 'padding')} - ${props => cssRuleIfExists(props, 'border-radius')} ${props => cssRuleIfExists(props, 'border')} ${props => cssRuleIfExists(props, 'border-top')} ${props => cssRuleIfExists(props, 'border-bottom')} @@ -70,6 +69,7 @@ export const Container = ${props => props.display && stylesForMedia<string>('display', props.display)} ${props => props.width && stylesForMedia<string>('width', props.width)} ${props => props.height && stylesForMedia<string>('height', props.height)} + ${props => props.borderRadius && stylesForMedia<string>('border-radius', props.borderRadius)} background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')}; border-color: ${props => (props.borderColor ? props.theme[props.borderColor] : 'none')}; &:hover { diff --git a/packages/instant/src/components/zero_ex_instant_container.tsx b/packages/instant/src/components/zero_ex_instant_container.tsx index c0a197590..698bfef17 100644 --- a/packages/instant/src/components/zero_ex_instant_container.tsx +++ b/packages/instant/src/components/zero_ex_instant_container.tsx @@ -43,7 +43,7 @@ export class ZeroExInstantContainer extends React.Component<{}, ZeroExInstantCon zIndex={zIndex.mainContainer} position="relative" backgroundColor={ColorOption.white} - borderRadius="3px" + borderRadius={{ default: '3px', sm: '0px' }} hasBoxShadow={true} overflow="hidden" height="100%" |