aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/components/ui
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-11-09 07:42:46 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-11-09 07:42:46 +0800
commit4f4d901ecaa4fd772288c3421f92da293690ceb8 (patch)
treeb5c1f038eb74abeea86094f2bef7c6c3581614fc /packages/instant/src/components/ui
parent6a84877f9aab63db1c493d1a3d73d06e65735a78 (diff)
parent117e2f583ff44bdb63340a2134edea0f3ecb77b3 (diff)
downloaddexon-sol-tools-4f4d901ecaa4fd772288c3421f92da293690ceb8.tar
dexon-sol-tools-4f4d901ecaa4fd772288c3421f92da293690ceb8.tar.gz
dexon-sol-tools-4f4d901ecaa4fd772288c3421f92da293690ceb8.tar.bz2
dexon-sol-tools-4f4d901ecaa4fd772288c3421f92da293690ceb8.tar.lz
dexon-sol-tools-4f4d901ecaa4fd772288c3421f92da293690ceb8.tar.xz
dexon-sol-tools-4f4d901ecaa4fd772288c3421f92da293690ceb8.tar.zst
dexon-sol-tools-4f4d901ecaa4fd772288c3421f92da293690ceb8.zip
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/dropdown-ui
Diffstat (limited to 'packages/instant/src/components/ui')
-rw-r--r--packages/instant/src/components/ui/container.tsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/instant/src/components/ui/container.tsx b/packages/instant/src/components/ui/container.tsx
index 172d384b4..8aa5db9e5 100644
--- a/packages/instant/src/components/ui/container.tsx
+++ b/packages/instant/src/components/ui/container.tsx
@@ -67,9 +67,9 @@ export const Container =
${props => cssRuleIfExists(props, 'cursor')}
${props => cssRuleIfExists(props, 'overflow')}
${props => (props.hasBoxShadow ? `box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.1)` : '')};
- ${props => props.display && stylesForMedia('display', props.display)}
- ${props => (props.width ? stylesForMedia('width', props.width) : '')}
- ${props => (props.height ? stylesForMedia('height', props.height) : '')}
+ ${props => props.display && stylesForMedia<string>('display', props.display)}
+ ${props => props.width && stylesForMedia<string>('width', props.width)}
+ ${props => props.height && stylesForMedia<string>('height', props.height)}
background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
border-color: ${props => (props.borderColor ? props.theme[props.borderColor] : 'none')};
&:hover {