diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-11-09 08:09:38 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-11-09 08:09:38 +0800 |
commit | 211163b3724090347dba736cbcdcb2b1ec252bd0 (patch) | |
tree | 80f3b8e23daba4a12e4afc55d7a345678ca04795 /packages/instant/src/style/theme.ts | |
parent | c84e163edb329b478749cad09f222cc12e3698fe (diff) | |
parent | 117e2f583ff44bdb63340a2134edea0f3ecb77b3 (diff) | |
download | dexon-0x-contracts-211163b3724090347dba736cbcdcb2b1ec252bd0.tar.gz dexon-0x-contracts-211163b3724090347dba736cbcdcb2b1ec252bd0.tar.zst dexon-0x-contracts-211163b3724090347dba736cbcdcb2b1ec252bd0.zip |
Merge branch 'development' into feature/instant/account-state-change
* development:
[instant] Viewport specific errors (#1228)
Added more comments
Include wholeNumberSchema in sra-spec schemas
chore(instant): fix linter
Fix isNode
fix(instant): update buy quote at start up in the case of default amount
fix: apply css reset to overlay as well
fix(website): turn off production flag when building locally
chore: linter
fix: progress bar
fix: use fontSize prop in button
feat: make instant resistant to external styles
feat: add faux externall css file
Add upstream issue
Use const require instead of import
Fix tslint issues
Use detect-node
Set curstom inspect printer in BigNumber
Diffstat (limited to 'packages/instant/src/style/theme.ts')
-rw-r--r-- | packages/instant/src/style/theme.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/instant/src/style/theme.ts b/packages/instant/src/style/theme.ts index d10c9b72c..8dada2d28 100644 --- a/packages/instant/src/style/theme.ts +++ b/packages/instant/src/style/theme.ts @@ -1,6 +1,6 @@ import * as styledComponents from 'styled-components'; -const { default: styled, css, keyframes, withTheme, ThemeProvider } = styledComponents; +const { default: styled, css, keyframes, withTheme, createGlobalStyle, ThemeProvider } = styledComponents; export type Theme = { [key in ColorOption]: string }; @@ -33,4 +33,4 @@ export const theme: Theme = { export const transparentWhite = 'rgba(255,255,255,0.3)'; export const overlayBlack = 'rgba(0, 0, 0, 0.6)'; -export { styled, css, keyframes, withTheme, ThemeProvider }; +export { styled, css, keyframes, withTheme, createGlobalStyle, ThemeProvider }; |