Merge branch 'ICSHWI-10708_Modifying_fonts' into 'develop'

Icshwi 10708 modifying fonts

See merge request !227

src/components/common/Console/ConsoleOutput.js

@@ -13,6 +13,7 @@ const useStyles = makeStyles((theme) => ({
     maxHeight: "500px",
     width: "100%",
     color: "white",
+    fontSize: '0.8rem'
   },
   dialogOutput: {
     backgroundColor:"black",

src/components/common/table/CustomTable.css

@@ -32,17 +32,30 @@
 .ccce-custom-table .p-ccce-custom-table .p-column-title {
   font-family: 'Segoe UI', 'Roboto', 'Noto Sans';
   font-weight: 600;
-  
+  font-size: 0.875rem;
 }
 
 .ccce-custom-table .p-ccce-custom-table .p-datatable-tbody {
   font-family: 'Segoe UI', 'Roboto', 'Noto Sans';
+  font-size: 0.875rem;
 
 }
 
+.ccce-custom-table .p-ccce-custom-table .p-datatable-tbody .MuiTypography-body1 {
+  font-size: 0.875rem;
+}
+
 .ccce-custom-table .p-ccce-custom-table .p-paginator {
   font-family: 'Segoe UI', 'Roboto', 'Noto Sans';
-  
+  font-size: 0.875rem;
+}
+
+.ccce-custom-table .p-ccce-custom-table .p-paginator .p-link {
+  font-size: 0.875rem;
+}
+
+.ccce-custom-table .p-ccce-custom-table .p-paginator .p-dropdown-label {
+  font-size: 0.875rem;
 }
 
 .ccce-custom-table .p-ccce-custom-table .p-datatable-tbody > tr.inconsistentState { 

src/style/Theme.js

@@ -9,7 +9,7 @@ export const theme = createMuiTheme({
   overrides: {
       MuiTooltip: {
           tooltip: {
-            fontSize: 15,
+            fontSize: '0.875rem',
             backgroundColor: "#707070ff",
           },
       },
@@ -25,6 +25,16 @@ export const theme = createMuiTheme({
           }
         },
     },
+    MuiInputBase: {
+      root: {
+        fontSize: '0.875rem'
+      }
+    },
+    MuiTypography: {
+      body1: {
+        fontSize: '0.875rem'
+      }
+    },
   },
   props: { MuiWithWidth: { initialWidth: 'lg' } },
   drawer: {
@@ -60,14 +70,14 @@ export const theme = createMuiTheme({
       '"Segoe UI Emoji"',
       '"Segoe UI Symbol"',
       '"Noto Color Emoji"',
-    ].join(','),
+    ].join(','), 
     h1: {
       fontFamily: 'Titillium Web, sans-serif',
       [breakpoints.down('md')]: {
-        fontSize: 18,
+        fontSize: '0.98rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 24,
+        fontSize: '1.31rem',
       },
     },
     h2: {
@@ -77,10 +87,10 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 25,
+        fontSize: '1.3rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 34,
+        fontSize: '1.7rem',
       },
       fontWeight: 600,
     },
@@ -91,10 +101,10 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 23,
+        fontSize: '1.25rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 32,
+        fontSize: '1.75rem',
       },
       fontWeight: 600,
     },
@@ -105,10 +115,10 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 18,
+        fontSize: '0,98rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 20,
+        fontSize: '1.09rem',
       },
       fontWeight: 600,
     },
@@ -119,10 +129,10 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 15,
+        fontSize: '0.98rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 16,
+        fontSize: '0.875rem',
       },
       fontWeight: 600,
     },
@@ -133,10 +143,10 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 14,
+        fontSize: '0.765rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 16,
+        fontSize: '0.875rem',
       },
       fontWeight: 600,
     },
@@ -147,10 +157,10 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 12,
+        fontSize: '0.656rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 16,
+        fontSize: '0.875rem',
       },
       fontWeight: 600,
     },
@@ -161,11 +171,11 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 14,
+        fontSize: '0.765rem !important',
         fontWeight: 600,
       },
       [breakpoints.down('md')]: {
-        fontSize: 16,
+        fontSize: '0.875rem !important',
       },
     },
     button: {
@@ -175,16 +185,16 @@ export const theme = createMuiTheme({
         'Noto Sans',
       ].join(','),
       [breakpoints.down('md')]: {
-        fontSize: 12,
+        fontSize: '0,656rem',
       },
       [breakpoints.up('md')]: {
-        fontSize: 14,
+        fontSize: '0,765rem',
       },
       fontWeight: 500,
     }
   },
   'cccecustomtable': {
-    fontSize: 14,
+    fontSize: '0.765rem',
   },
   infoBadge: {
     bgColor: '#ececec'

src/views/statistics/StatisticsView.js

 import React, { useEffect } from "react";
-import { Paper, Grid, useTheme, makeStyles, LinearProgress } from "@material-ui/core";
+import { Paper, Grid, useTheme, makeStyles, LinearProgress, Typography } from "@material-ui/core";
 import { useStatistics } from "../../api/SwaggerApi";
 import { useGlobalAppBar } from "../../components/navigation/GlobalAppBar/GlobalAppBar";
 import { RootContainer } from "../../components/common/Container/RootContainer";
@@ -54,7 +54,9 @@ export function StatisticsView() {
         <RootContainer>
             <Grid container direction="column" spacing={theme.spacing(0.5)}>
                 <Grid item xs={12}>
-                    <h2>Statistics</h2>
+                <Typography variant="h2">
+                    Statistics
+                </Typography>
                 </Grid>
                 
                 {statistics ?