diff --git a/src/assets/chart.png b/src/assets/chart.png deleted file mode 100644 index 7be7b8f4..00000000 Binary files a/src/assets/chart.png and /dev/null differ diff --git a/src/assets/chart.svg b/src/assets/chart.svg new file mode 100644 index 00000000..a933d93d --- /dev/null +++ b/src/assets/chart.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/logo.png b/src/assets/logo.png index 9a70adec..4e032cf3 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/components/Panels/SalePhaseInfoPanel/index.tsx b/src/components/Panels/SalePhaseInfoPanel/index.tsx index 7da6cf44..47ad4fd5 100644 --- a/src/components/Panels/SalePhaseInfoPanel/index.tsx +++ b/src/components/Panels/SalePhaseInfoPanel/index.tsx @@ -50,8 +50,8 @@ export const SalePhaseInfoPanel = () => { variant='text' className={styles.buttonWrapper} sx={{ - background: '#e8eff7', - color: theme.palette.text.secondary, + background: theme.palette.grey[100], + color: theme.palette.text.primary, }} onClick={() => openHistoryModal(true)} data-cy='btn-purchase-history' diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx index b5102e64..8c2c0e56 100644 --- a/src/pages/_document.tsx +++ b/src/pages/_document.tsx @@ -11,11 +11,7 @@ export default class MyDocument extends Document { - {/* default style for MUI is Roboto */} - + {/* Inject MUI styles first to match with the prepend: true configuration. */} {(this.props as any).emotionStyleTags} diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 0a9220eb..df60ff24 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -21,7 +21,7 @@ import { getBalanceString } from '@/utils/functions'; import { PurchaseHistoryTable } from '@/components'; -import Chart from '@/assets/chart.png'; +import Chart from '@/assets/chart.svg'; import Config from '@/assets/config.png'; import Manage from '@/assets/manage.png'; import Trade from '@/assets/trade.png'; diff --git a/src/utils/muiTheme.ts b/src/utils/muiTheme.ts index 5122bf19..e3cbac1e 100644 --- a/src/utils/muiTheme.ts +++ b/src/utils/muiTheme.ts @@ -15,27 +15,27 @@ let theme = createTheme({ default: '#f6f7fa', }, primary: { - contrastText: '#ecedef', - main: '#3868a9', + contrastText: '#f6f7fa', + main: '#3758F9', }, success: { - main: '#68a938', + main: '#13C296', }, grey: { 100: '#eeeff4', 200: '#8c8c8c', }, text: { - primary: '#7e8591', - secondary: '#3868a9', + primary: '#637381', + secondary: '#8899A8', }, common: { white: '#fff', }, warning: { - main: '#A93868', + main: '#FCD34D', }, - divider: '#efefef', + divider: '#F3F4F6', }, typography: { subtitle1: { diff --git a/styles/global.scss b/styles/global.scss index 74e48aba..90a526da 100644 --- a/styles/global.scss +++ b/styles/global.scss @@ -1,4 +1,5 @@ -body, html { +body, +html { height: 100vh; } @@ -8,4 +9,6 @@ body, html { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; -} + font-family: 'Montserrat'; + font-weight: 600; +} \ No newline at end of file