diff options
| author | Tayane Fernandes <tayane.rmf@gmail.com> | 2017-03-10 13:20:13 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-10 13:20:13 -0300 |
| commit | 51a7eeb2142a4c3d71a67cb0693644ceec2e3637 (patch) | |
| tree | 37fb9d4374a3a3873d0b092fce6e89299e097a1c /web-ui/src/common/app.js | |
| parent | 1e62467a7adfafe91025cf6c8955d54770e705aa (diff) | |
| parent | 99d03c1f4b2d4e10561fc4d0bef14ccd12ad0f9d (diff) | |
Merge pull request #1004 from pixelated/validate-email
[#923] Add material-ui framework
Diffstat (limited to 'web-ui/src/common/app.js')
| -rw-r--r-- | web-ui/src/common/app.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/web-ui/src/common/app.js b/web-ui/src/common/app.js index 03a69fc9..b8302000 100644 --- a/web-ui/src/common/app.js +++ b/web-ui/src/common/app.js @@ -19,11 +19,18 @@ import React from 'react'; import { I18nextProvider } from 'react-i18next'; import internationalization from 'src/common/i18n'; +import injectTapEventPlugin from 'react-tap-event-plugin'; +import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'; +import materialPixTheme from 'src/common/materialPixTheme'; + +injectTapEventPlugin(); const App = ({ i18n = internationalization, child }) => ( - <I18nextProvider i18n={i18n}> - {child} - </I18nextProvider> + <MuiThemeProvider muiTheme={materialPixTheme}> + <I18nextProvider i18n={i18n}> + {child} + </I18nextProvider> + </MuiThemeProvider> ); App.propTypes = { |