diff --git a/src/components/Header.js b/src/components/Header.js index 37d579eb..dc8e28eb 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -65,9 +65,9 @@ const useStyles = makeStyles((theme) => ({ }, whiteIcons: { '& button, & a.MuiIconButton-root': { - color: theme.palette.icons.light, + color: theme.palette.icons.purple100, '&:hover': { - color: theme.palette.icons.lightHover, + color: theme.palette.icons.purple200, background: 'transparent', }, }, diff --git a/src/components/Notifications.js b/src/components/Notifications.js index 45959213..34eba732 100644 --- a/src/components/Notifications.js +++ b/src/components/Notifications.js @@ -37,7 +37,7 @@ const useStyles = makeStyles((theme) => ({ iconButtonClose: { borderRadius: '8px', '&:hover': { - background: theme.custom.colors.lightWhite, + background: theme.custom.colors.blue600, }, '& .MuiSvgIcon-root': { fontSize: '1.3rem', @@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({ }, }, '&:hover': { - background: theme.custom.colors.white, + background: theme.custom.colors.blue600, '& .MuiSvgIcon-root': { '& path': { fill: theme.custom.colors.purple200, diff --git a/src/styles/fonts.js b/src/styles/fonts.js index 572f7423..112833a2 100644 --- a/src/styles/fonts.js +++ b/src/styles/fonts.js @@ -6,11 +6,12 @@ import dmSansTtf from '%/fonts/DMSans-Regular.ttf'; import dmSansSemiBoldTtf from '%/fonts/DMSans-SemiBold.ttf'; export const fontFamily = 'DM Sans'; +export const fontWeightBold = 700; export const fontWeightLight = 300; -export const fontWeightRegular = 400; export const fontWeightMedium = 500; export const fontWeightMediumBold = 600; -export const fontWeightBold = 700; +export const fontWeightRegular = 400; + export const fontSizeSmallest = 10; export const fontSizeSmaller = 12; export const fontSizeSmall = 14; diff --git a/src/styles/theme.js b/src/styles/theme.js index bb30488a..f1101057 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -1,6 +1,12 @@ import { createTheme } from '@mui/material/styles'; import { + dmSans, + dmSansBold, + dmSansItalic, + dmSansLight, + dmSansLightItalic, + dmSansMedium, fontFamily as fontFamilyDmSans, fontSizeLarge, fontSizeLarger, @@ -14,12 +20,6 @@ import { fontWeightMedium, fontWeightMediumBold, fontWeightRegular, - dmSans, - dmSansBold, - dmSansItalic, - dmSansLight, - dmSansLightItalic, - dmSansMedium, } from '~/styles/fonts'; const foundation = {