diff --git a/src/components/templates/mackenzies-mind/header/Header.tsx b/src/components/templates/mackenzies-mind/header/Header.tsx index 8714385c..92f7e8f3 100644 --- a/src/components/templates/mackenzies-mind/header/Header.tsx +++ b/src/components/templates/mackenzies-mind/header/Header.tsx @@ -9,6 +9,24 @@ import FullTextSearch from "./FullTextSearch"; import AppBarWrapper from './AppBarWrapper'; import {COLORS} from "../../../../theme/common/ColorPalette"; + +import makeStyles from "@mui/styles/makeStyles"; +import {Theme} from "@mui/material/styles"; + +export const useStyles = makeStyles((theme: Theme) => ({ + hover:{ + "&:hover": { + backgroundColor: "lightgray !important", + color: "#383838" + } + }, + hoverSearch:{ + "&:hover": { + color: theme.palette.primary.main + } + } +})) + export type HeaderProps = { pageHeader?: SanityMenuContainer isAppBar?: boolean @@ -18,6 +36,7 @@ export type HeaderProps = { } const Header: FunctionComponent = (props) => { + const classes = useStyles() const customizedTheme = useTheme() const mdDown = useMediaQuery(customizedTheme.breakpoints.down('md')) @@ -26,52 +45,54 @@ const Header: FunctionComponent = (props) => { return ( {props.pageHeader?.title ? - + alignContent='center' alignItems='center' style={{height: "100%", paddingLeft: "8px"}}> + + logoAccentText={props.pageHeader?.logoAccentText}/> - + - { - !mdDown && - + { + !mdDown && + - - } - { - mdDown && - {props.pageHeader && } - - } + + } + { + mdDown && + {props.pageHeader && } + + } {props.isSearch && - { - setIsSearchOpen((state) => !state) - }}/> - + + { + setIsSearchOpen((state) => !state) + }}/> + } @@ -79,16 +100,23 @@ const Header: FunctionComponent = (props) => { } - - { + + { setIsSearchOpen(false) - }}> + }} className={classes.hover}> - + - + diff --git a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx index 443da7eb..b8c59593 100644 --- a/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx +++ b/src/components/templates/my-digital-resume/resume-experience-section/ResumeExperienceItem.tsx @@ -5,6 +5,7 @@ import { Theme} from "@mui/material/styles"; import {Chip, Grid, Typography, useTheme} from "@mui/material"; import {COLORS} from "../../../../theme/common/ColorPalette"; import {ResumeExperience} from "../../../BlockContentTypes"; +import dateUtils from "../../../../utils/dateUtils"; export const useStyles = makeStyles((theme: Theme) => ({ root: { @@ -30,20 +31,17 @@ const ResumeExperienceItem: FunctionComponent = (props:IProps) => { // // padding: theme.spacing(1.75, 0) // }} xs={12}> - + {props.experience.companyName} - - - {props.experience.title} + + {props.experience.companySubtitle} - - - {props.experience.companySubtitle} + + {props.experience.title} @@ -51,7 +49,7 @@ const ResumeExperienceItem: FunctionComponent = (props:IProps) => { {props.experience.dateStart?.toString().replaceAll('-', '.')} + variant='body1'>{dateUtils.YearMonth(new Date(props.experience.dateStart as string))} {/**/} {/**/} @@ -61,7 +59,7 @@ const ResumeExperienceItem: FunctionComponent = (props:IProps) => { {/**/} {/**/} {props.experience.dateEnd?.toString().replaceAll('-', '.')} + variant='body1'>{dateUtils.YearMonth(new Date(props.experience.dateEnd as string))}