aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components/ui/text.tsx
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-07-28 02:51:30 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-07-28 02:51:30 +0800
commitc851c3763060ca4cf9e37d75e36e534f9b7d9294 (patch)
tree82bb74e4521804377869c099cf5eba019f06d4d5 /packages/website/ts/components/ui/text.tsx
parenta0d7b1efa59cf7322a97ef75268c372068592976 (diff)
parent44d1be27e626c4e80ccf80d3f070a890c45f02ac (diff)
downloaddexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar
dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.gz
dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.bz2
dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.lz
dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.xz
dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.zst
dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.zip
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/website/upgrade-allowance-toggles-to-locks-and-checks
Diffstat (limited to 'packages/website/ts/components/ui/text.tsx')
-rw-r--r--packages/website/ts/components/ui/text.tsx3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/website/ts/components/ui/text.tsx b/packages/website/ts/components/ui/text.tsx
index 72bee8c0a..734483564 100644
--- a/packages/website/ts/components/ui/text.tsx
+++ b/packages/website/ts/components/ui/text.tsx
@@ -10,6 +10,7 @@ export interface TextProps {
Tag?: TextTag;
fontSize?: string;
fontFamily?: string;
+ fontStyle?: string;
fontColor?: string;
lineHeight?: string;
minHeight?: string;
@@ -29,6 +30,7 @@ const PlainText: React.StatelessComponent<TextProps> = ({ children, className, o
export const Text = styled(PlainText)`
font-family: ${props => props.fontFamily};
+ font-style: ${props => props.fontStyle};
font-weight: ${props => props.fontWeight};
font-size: ${props => props.fontSize};
text-decoration-line: ${props => props.textDecorationLine};
@@ -46,6 +48,7 @@ export const Text = styled(PlainText)`
Text.defaultProps = {
fontFamily: 'Roboto',
+ fontStyle: 'normal',
fontWeight: 400,
fontColor: colors.black,
fontSize: '15px',