fix fonts
Change-Id: I21b0e509152207670d718eaaaafc582343e1c682
diff --git a/client/src/themes/default.js b/client/src/themes/default.js
index 1e4f0ac..6764097 100644
--- a/client/src/themes/default.js
+++ b/client/src/themes/default.js
@@ -14,9 +14,6 @@
main: "#009980",
},
},
-})
-
-export default createTheme(theme, {
typography: {
fontFamily: "Ubuntu",
h1: {
@@ -61,6 +58,69 @@
},
},
components: {
+ MuiCssBaseline: {
+ styleOverrides: `
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-Th.ttf");
+ font-weight: 100;
+ font-style: normal;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-L.ttf");
+ font-weight: 300;
+ font-style: normal;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-LI.ttf");
+ font-weight: 300;
+ font-style: italic;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-R.ttf");
+ font-weight: 400;
+ font-style: normal;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-RI.ttf");
+ font-weight: 400;
+ font-style: italic;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-M.ttf");
+ font-weight: 500;
+ font-style: normal;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-MI.ttf");
+ font-weight: 500;
+ font-style: italic;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-B.ttf");
+ font-weight: 700;
+ font-style: normal;
+ }
+ @font-face {
+ font-family: "Ubuntu";
+ src: url("./fonts/Ubuntu-BI.ttf");
+ font-weight: 700;
+ font-style: italic;
+ }
+ `,
+ },
+ }
+})
+
+export default createTheme(theme, {
+ components: {
MuiButton: {
styleOverrides: {
root: {
@@ -205,63 +265,5 @@
},
},
},
- MuiCssBaseline: {
- styleOverrides: `
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-Th.ttf");
- font-weight: 100;
- font-style: normal;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-L.ttf");
- font-weight: 300;
- font-style: normal;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-LI.ttf");
- font-weight: 300;
- font-style: italic;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-R.ttf");
- font-weight: 400;
- font-style: normal;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-RI.ttf");
- font-weight: 400;
- font-style: italic;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-M.ttf");
- font-weight: 500;
- font-style: normal;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-MI.ttf");
- font-weight: 500;
- font-style: italic;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-B.ttf");
- font-weight: 700;
- font-style: normal;
- }
- @font-face {
- font-family: "Ubuntu";
- src: url("./fonts/Ubuntu-BI.ttf");
- font-weight: 700;
- font-style: italic;
- }
- `,
- },
},
})
diff --git a/client/src/fonts/Ubuntu-B.ttf b/client/src/themes/fonts/Ubuntu-B.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-B.ttf
rename to client/src/themes/fonts/Ubuntu-B.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-BI.ttf b/client/src/themes/fonts/Ubuntu-BI.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-BI.ttf
rename to client/src/themes/fonts/Ubuntu-BI.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-L.ttf b/client/src/themes/fonts/Ubuntu-L.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-L.ttf
rename to client/src/themes/fonts/Ubuntu-L.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-LI.ttf b/client/src/themes/fonts/Ubuntu-LI.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-LI.ttf
rename to client/src/themes/fonts/Ubuntu-LI.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-M.ttf b/client/src/themes/fonts/Ubuntu-M.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-M.ttf
rename to client/src/themes/fonts/Ubuntu-M.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-MI.ttf b/client/src/themes/fonts/Ubuntu-MI.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-MI.ttf
rename to client/src/themes/fonts/Ubuntu-MI.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-R.ttf b/client/src/themes/fonts/Ubuntu-R.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-R.ttf
rename to client/src/themes/fonts/Ubuntu-R.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-RI.ttf b/client/src/themes/fonts/Ubuntu-RI.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-RI.ttf
rename to client/src/themes/fonts/Ubuntu-RI.ttf
Binary files differ
diff --git a/client/src/fonts/Ubuntu-Th.ttf b/client/src/themes/fonts/Ubuntu-Th.ttf
similarity index 100%
rename from client/src/fonts/Ubuntu-Th.ttf
rename to client/src/themes/fonts/Ubuntu-Th.ttf
Binary files differ