From b5d734c959fa7ed64cc3cf6de437b33b3aebb832 Mon Sep 17 00:00:00 2001
From: Hasta Ragil Saputra <hasta.ragil@gmail.com>
Date: Fri, 1 Feb 2019 21:45:23 +0700
Subject: [PATCH] feat: change font size

---
 src/common/pages/RegisterNew/index.js |  6 ++++--
 src/common/pages/Root/index.js        | 18 +++++++++++++++++-
 src/common/styles/style.scss          |  3 ++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/common/pages/RegisterNew/index.js b/src/common/pages/RegisterNew/index.js
index 355866f..e051bc0 100644
--- a/src/common/pages/RegisterNew/index.js
+++ b/src/common/pages/RegisterNew/index.js
@@ -583,11 +583,13 @@ class RegisterPage extends React.Component {
                                     <div style={{ padding: 5, marginTop: 20 }}>
                                         <Button
                                           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"}
                                         </Button>
 
-                                      <Typography variant="subtitle2" gutterBottom>
+                                      <Typography variant="subtitle2" gutterBottom style={{
+                                        marginTop: 16
+                                      }}>
                                       Belum menerima email? <Link to={"/resend_email"} replace>Kirim ulang email</Link>
                                       </Typography>
 
diff --git a/src/common/pages/Root/index.js b/src/common/pages/Root/index.js
index 28f2732..6eac4bf 100644
--- a/src/common/pages/Root/index.js
+++ b/src/common/pages/Root/index.js
@@ -3,8 +3,22 @@ import {observer, inject} from 'mobx-react';
 import Routes, { LINKS } from "../../routes";
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 import getMuiTheme from 'material-ui/styles/getMuiTheme';
+import { MuiThemeProvider as MuiThemeProviderNew, createMuiTheme } from '@material-ui/core/styles';
 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')
 @observer
 export default class ComponentName extends React.Component {
@@ -60,7 +74,9 @@ export default class ComponentName extends React.Component {
     return (
       <div>
         <MuiThemeProvider muiTheme={muiTheme}>
-        <Routes></Routes>
+          <MuiThemeProviderNew theme={theme}>
+            <Routes></Routes>
+          </MuiThemeProviderNew>
         </MuiThemeProvider>
       </div>
     )
diff --git a/src/common/styles/style.scss b/src/common/styles/style.scss
index 104cc1e..b8ac018 100644
--- a/src/common/styles/style.scss
+++ b/src/common/styles/style.scss
@@ -2,6 +2,7 @@
 @import "./helper.scss";
 @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=Montserrat');
 @import "./animated.scss";
 
 body {
@@ -9,7 +10,7 @@ body {
   background-color: #f1f5f9;
   text-transform: none;
   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-weight: 400;
   line-height: 1.5;