From 3d849592082f76887590a033c49e9dfc82a8f468 Mon Sep 17 00:00:00 2001
From: Abhishek-kumar09 <abhimait1909@gmail.com>
Date: Sun, 9 Aug 2020 22:16:14 +0530
Subject: [PATCH 1/3] Add Montserrat font family

---
 public/index.html       | 3 +++
 src/theme/typography.js | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index ef921fa3..ae25597f 100755
--- a/public/index.html
+++ b/public/index.html
@@ -10,6 +10,9 @@
     />
     <meta name="theme-color" content="#000000" />
     <link rel="manifest" crossorigin="use-credentials" href="%PUBLIC_URL%/manifest.json" />
+    <link
+     href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" 
+    rel="stylesheet"> 
     <link
       href="https://fonts.googleapis.com/css?family=Roboto+Mono|Roboto+Slab|Roboto:300,400,500,700"
       rel="stylesheet"
diff --git a/src/theme/typography.js b/src/theme/typography.js
index eef1363d..a095d4fa 100755
--- a/src/theme/typography.js
+++ b/src/theme/typography.js
@@ -2,34 +2,41 @@ export default {
   h1: {
     fontWeight: 500,
     fontSize: 35,
-    letterSpacing: '-0.24px'
+    letterSpacing: '-0.24px',
+    fontFamily: `"Montserrat", "Roboto", sans-serif`,
   },
   h2: {
+    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 29,
     letterSpacing: '-0.24px'
   },
   h3: {
+    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 24,
     letterSpacing: '-0.06px'
   },
   h4: {
+    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 20,
     letterSpacing: '-0.06px'
   },
   h5: {
+    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 16,
     letterSpacing: '-0.05px'
   },
   h6: {
+    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 14,
     letterSpacing: '-0.05px'
   },
   overline: {
+    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500
   }
 };

From da3be177312e50ef3b021b466f7fda547d67bb77 Mon Sep 17 00:00:00 2001
From: Abhishek-kumar09 <abhimait1909@gmail.com>
Date: Thu, 13 Aug 2020 16:03:11 +0530
Subject: [PATCH 2/3] font changes and fix some margins

---
 src/layouts/MainLayout/TopBar/index.js |  4 ++--
 src/theme/typography.js                | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/layouts/MainLayout/TopBar/index.js b/src/layouts/MainLayout/TopBar/index.js
index 458fcbc3..f0d7e14a 100755
--- a/src/layouts/MainLayout/TopBar/index.js
+++ b/src/layouts/MainLayout/TopBar/index.js
@@ -33,7 +33,8 @@ const useStyles = makeStyles(theme => ({
     }
   },
   toolbar: {
-    minHeight: 64
+    minHeight: 64,
+    maxHeight: 64
   },
   menuButton: {
     float: 'right',
@@ -147,7 +148,6 @@ function TopBar({ className, onMobileNavOpen, ...rest }) {
           <Box ml={2}>
             <OpenSource />
           </Box>
-          <Box ml={2} flexGrow={0.05} />
         </Hidden>
         <Hidden mdUp>
           <Box
diff --git a/src/theme/typography.js b/src/theme/typography.js
index a095d4fa..b9c0ef9b 100755
--- a/src/theme/typography.js
+++ b/src/theme/typography.js
@@ -1,42 +1,44 @@
 export default {
+  fontFamily: [
+    '"Montserrat"',
+    'Roboto',
+    'Arial',
+    'sans-serif',
+    '"Segoe UI Emoji"',
+    '"Segoe UI Symbol"',
+  ].join(','),
+
   h1: {
     fontWeight: 500,
     fontSize: 35,
     letterSpacing: '-0.24px',
-    fontFamily: `"Montserrat", "Roboto", sans-serif`,
   },
   h2: {
-    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 29,
     letterSpacing: '-0.24px'
   },
   h3: {
-    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 24,
     letterSpacing: '-0.06px'
   },
   h4: {
-    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 20,
     letterSpacing: '-0.06px'
   },
   h5: {
-    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500,
     fontSize: 16,
     letterSpacing: '-0.05px'
   },
   h6: {
-    fontFamily: `"Montserrat", "Roboto", sans-serif`,
-    fontWeight: 500,
+    fontWeight: 600,
     fontSize: 14,
     letterSpacing: '-0.05px'
   },
   overline: {
-    fontFamily: `"Montserrat", "Roboto", sans-serif`,
     fontWeight: 500
   }
 };

From 1ce797debe9fe1e9204f490250c4b536b81b988e Mon Sep 17 00:00:00 2001
From: Abhishek-kumar09 <abhimait1909@gmail.com>
Date: Mon, 21 Sep 2020 18:39:06 +0530
Subject: [PATCH 3/3] rebased branch and removed roboto

---
 public/index.html                      | 14 +++-----------
 src/layouts/MainLayout/TopBar/index.js |  1 +
 src/theme/typography.js                |  7 +------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/public/index.html b/public/index.html
index ae25597f..9279bd06 100755
--- a/public/index.html
+++ b/public/index.html
@@ -10,17 +10,9 @@
     />
     <meta name="theme-color" content="#000000" />
     <link rel="manifest" crossorigin="use-credentials" href="%PUBLIC_URL%/manifest.json" />
-    <link
-     href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" 
-    rel="stylesheet"> 
-    <link
-      href="https://fonts.googleapis.com/css?family=Roboto+Mono|Roboto+Slab|Roboto:300,400,500,700"
-      rel="stylesheet"
-    />
-    <link
-      href="https://fonts.googleapis.com/css?family=Roboto+Mono&display=swap" 
-      rel="stylesheet"
-    >
+    <link 
+      href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,400;0,500;0,600;0,700;0,800;0,900;1,500&display=swap" 
+      rel="stylesheet"> 
     <title>Code for Cause</title>
     <meta
       name="description"
diff --git a/src/layouts/MainLayout/TopBar/index.js b/src/layouts/MainLayout/TopBar/index.js
index f0d7e14a..40e5e39d 100755
--- a/src/layouts/MainLayout/TopBar/index.js
+++ b/src/layouts/MainLayout/TopBar/index.js
@@ -148,6 +148,7 @@ function TopBar({ className, onMobileNavOpen, ...rest }) {
           <Box ml={2}>
             <OpenSource />
           </Box>
+          <Box ml={2} flexGrow={0.05} />
         </Hidden>
         <Hidden mdUp>
           <Box
diff --git a/src/theme/typography.js b/src/theme/typography.js
index b9c0ef9b..03bd9f13 100755
--- a/src/theme/typography.js
+++ b/src/theme/typography.js
@@ -1,11 +1,6 @@
 export default {
   fontFamily: [
     '"Montserrat"',
-    'Roboto',
-    'Arial',
-    'sans-serif',
-    '"Segoe UI Emoji"',
-    '"Segoe UI Symbol"',
   ].join(','),
 
   h1: {
@@ -29,7 +24,7 @@ export default {
     letterSpacing: '-0.06px'
   },
   h5: {
-    fontWeight: 500,
+    fontWeight: 600,
     fontSize: 16,
     letterSpacing: '-0.05px'
   },