Ahmad.zuhdi.y/bukopin-redemption-client-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: change font size

Browse Source
This commit is contained in:
Hasta Ragil Saputra 2019-02-01 21:45:23 +07:00
parent c647dfc0c2
commit b5d734c959
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/pages/RegisterNew/index.js
View File

@ -583,11 +583,13 @@ class RegisterPage extends React.Component {
<div style={{ padding: 5, marginTop: 20 }}> <div style={{ padding: 5, marginTop: 20 }}>
<Button <Button
fullWidth fullWidth
variant="contained" style={{ backgroundColor: '#ffeb3b',marginBottom: 16 }} onClick={this.register}> variant="contained" style={{ backgroundColor: '#ffeb3b' }} onClick={this.register}>
{this.state.isLoading ? <CircularProgress className={classes.progress} /> : "Daftar"} {this.state.isLoading ? <CircularProgress className={classes.progress} /> : "Daftar"}
</Button> </Button>
<Typography variant="subtitle2" gutterBottom> <Typography variant="subtitle2" gutterBottom style={{
marginTop: 16
}}>
Belum menerima email? <Link to={"/resend_email"} replace>Kirim ulang email</Link> Belum menerima email? <Link to={"/resend_email"} replace>Kirim ulang email</Link>
</Typography> </Typography>

16
src/common/pages/Root/index.js
View File

@ -3,8 +3,22 @@ import {observer, inject} from 'mobx-react';
import Routes, { LINKS } from "../../routes"; import Routes, { LINKS } from "../../routes";
import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'; import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
import getMuiTheme from 'material-ui/styles/getMuiTheme'; import getMuiTheme from 'material-ui/styles/getMuiTheme';
import { MuiThemeProvider as MuiThemeProviderNew, createMuiTheme } from '@material-ui/core/styles';
import typography from 'material-ui/styles/typography'; import typography from 'material-ui/styles/typography';
const theme = createMuiTheme({
typography: {
// Use the system font instead of the default Roboto font.
fontFamily: [
'Montserrat',
'Roboto',
'-apple-system',
'BlinkMacSystemFont',
'"Segoe UI"'
].join(','),
}
});
@inject('appstate') @inject('appstate')
@observer @observer
export default class ComponentName extends React.Component { export default class ComponentName extends React.Component {
@ -60,7 +74,9 @@ export default class ComponentName extends React.Component {
return ( return (
<div> <div>
<MuiThemeProvider muiTheme={muiTheme}> <MuiThemeProvider muiTheme={muiTheme}>
<MuiThemeProviderNew theme={theme}>
<Routes></Routes> <Routes></Routes>
</MuiThemeProviderNew>
</MuiThemeProvider> </MuiThemeProvider>
</div> </div>
) )

3
src/common/styles/style.scss
View File

@ -2,6 +2,7 @@
@import "./helper.scss"; @import "./helper.scss";
@import url('https://fonts.googleapis.com/css?family=Roboto:100,300,400,500'); @import url('https://fonts.googleapis.com/css?family=Roboto:100,300,400,500');
@import url('https://fonts.googleapis.com/css?family=Source+Code+Pro:300,400,500,600'); @import url('https://fonts.googleapis.com/css?family=Source+Code+Pro:300,400,500,600');
@import url('https://fonts.googleapis.com/css?family=Montserrat');
@import "./animated.scss"; @import "./animated.scss";
body { body {
@ -9,7 +10,7 @@ body {
background-color: #f1f5f9; background-color: #f1f5f9;
text-transform: none; text-transform: none;
padding-top: 56px; padding-top: 56px;
font-family: "Avenir Next W01", "Proxima Nova W01", "Rubik", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; font-family: 'Montserrat', "Avenir Next W01", "Proxima Nova W01", "Rubik", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
font-size: .8rem; font-size: .8rem;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;