diff options
author | fragosti <francesco.agosti93@gmail.com> | 2018-11-09 03:25:25 +0800 |
---|---|---|
committer | fragosti <francesco.agosti93@gmail.com> | 2018-11-09 03:25:25 +0800 |
commit | 3395b8d095a62e5baa4c049da98b256ce596d6b9 (patch) | |
tree | b9241ba7299fdcc5f7a5e1f17cad7a4a95ae203d /packages/instant/src/components/ui/flex.tsx | |
parent | 88eb642aa543673bde52c1d14fc1f3e92d8b2137 (diff) | |
parent | b388d5496272d535b5c192a7098f4227bb1fb3f2 (diff) | |
download | dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.gz dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.bz2 dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.lz dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.xz dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.tar.zst dexon-sol-tools-3395b8d095a62e5baa4c049da98b256ce596d6b9.zip |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/dropdown-ui
Diffstat (limited to 'packages/instant/src/components/ui/flex.tsx')
-rw-r--r-- | packages/instant/src/components/ui/flex.tsx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/packages/instant/src/components/ui/flex.tsx b/packages/instant/src/components/ui/flex.tsx index fd218b0cd..5b00138b8 100644 --- a/packages/instant/src/components/ui/flex.tsx +++ b/packages/instant/src/components/ui/flex.tsx @@ -18,15 +18,18 @@ export const Flex = styled.div < FlexProps > ` - display: ${props => (props.inline ? 'inline-flex' : 'flex')}; - flex-direction: ${props => props.direction}; - flex-wrap: ${props => props.flexWrap}; - ${props => cssRuleIfExists(props, 'flexGrow')} - justify-content: ${props => props.justify}; - align-items: ${props => props.align}; - background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')}; - ${props => stylesForMedia('width', props.width || 'auto')} - ${props => stylesForMedia('height', props.height || 'auto')} + && { + all: initial; + display: ${props => (props.inline ? 'inline-flex' : 'flex')}; + flex-direction: ${props => props.direction}; + flex-wrap: ${props => props.flexWrap}; + ${props => cssRuleIfExists(props, 'flexGrow')} + justify-content: ${props => props.justify}; + align-items: ${props => props.align}; + background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')}; + ${props => (props.width ? stylesForMedia('width', props.width) : '')} + ${props => (props.height ? stylesForMedia('height', props.height) : '')} + } `; Flex.defaultProps = { |