Skip to content
Snippets Groups Projects
Commit 7bf75e76 authored by Andreas Ellewsen's avatar Andreas Ellewsen
Browse files

Merge branch 'GREG-155-no-red-links' into 'master'

Reduce use of red in styling

See merge request !216
parents 9965e093 63927c31
No related branches found
No related tags found
1 merge request!216Reduce use of red in styling
Pipeline #104913 passed
...@@ -58,6 +58,14 @@ const LogoSection = styled('div')(({ theme }) => ({ ...@@ -58,6 +58,14 @@ const LogoSection = styled('div')(({ theme }) => ({
padding: '1rem 0 1rem 2rem', padding: '1rem 0 1rem 2rem',
})) }))
const StyledLink = styled(Link)({
color: 'white',
})
StyledLink.defaultProps = {
underline: 'hover',
}
const LogoContainer = styled('div')({}) const LogoContainer = styled('div')({})
function Footer() { function Footer() {
...@@ -70,31 +78,31 @@ function Footer() { ...@@ -70,31 +78,31 @@ function Footer() {
<LinkContainer> <LinkContainer>
<LinkSection> <LinkSection>
<LinkHeader>{t('footer:link.terms.header')}</LinkHeader> <LinkHeader>{t('footer:link.terms.header')}</LinkHeader>
<Link href={ITRulesLink} sx={{ color: 'white' }}> <StyledLink href={ITRulesLink}>
{t('footer:link.terms.ITRules')} {t('footer:link.terms.ITRules')}
</Link> </StyledLink>
<Link href={privacyPolicyLink} sx={{ color: 'white' }}> <StyledLink href={privacyPolicyLink}>
{t('footer:link.terms.privacy')} {t('footer:link.terms.privacy')}
</Link> </StyledLink>
</LinkSection> </LinkSection>
<LinkSection> <LinkSection>
<LinkHeader>{t('footer:link.help.header')}</LinkHeader> <LinkHeader>{t('footer:link.help.header')}</LinkHeader>
<Link href={helpLink} sx={{ color: 'white' }}> <StyledLink href={helpLink}>
{t('footer:link.help.contact')} {t('footer:link.help.contact')}
</Link> </StyledLink>
<Link href={documentationLink} sx={{ color: 'white' }}> <StyledLink href={documentationLink}>
{t('footer:link.help.doc')} {t('footer:link.help.doc')}
</Link> </StyledLink>
</LinkSection> </LinkSection>
<LinkSection> <LinkSection>
<LinkHeader> <LinkHeader>
{t('footer:link.responsibleOrganization.header')} {t('footer:link.responsibleOrganization.header')}
</LinkHeader> </LinkHeader>
<Link href={responsibleOrganizationLink} sx={{ color: 'white' }}> <StyledLink href={responsibleOrganizationLink}>
{responsibleOrganization} {responsibleOrganization}
</Link> </StyledLink>
</LinkSection> </LinkSection>
</LinkContainer> </LinkContainer>
</InfoSection> </InfoSection>
......
...@@ -43,7 +43,7 @@ export default function SponsorGuestButtons(props: SponsorGuestButtonsProps) { ...@@ -43,7 +43,7 @@ export default function SponsorGuestButtons(props: SponsorGuestButtonsProps) {
<StyledIconButton <StyledIconButton
onClick={goToOverview} onClick={goToOverview}
sx={{ sx={{
color: () => (yourGuestsActive ? 'primary.main' : ''), color: () => (yourGuestsActive ? 'black' : undefined),
textDecorationLine: () => (yourGuestsActive ? 'underline' : ''), textDecorationLine: () => (yourGuestsActive ? 'underline' : ''),
}} }}
> >
...@@ -69,7 +69,7 @@ export default function SponsorGuestButtons(props: SponsorGuestButtonsProps) { ...@@ -69,7 +69,7 @@ export default function SponsorGuestButtons(props: SponsorGuestButtonsProps) {
<StyledIconButton <StyledIconButton
onClick={goToRegister} onClick={goToRegister}
sx={{ sx={{
color: () => (registerNewGuestActive ? 'primary.main' : ''), color: () => (registerNewGuestActive ? 'black' : undefined),
textDecorationLine: () => (registerNewGuestActive ? 'underline' : ''), textDecorationLine: () => (registerNewGuestActive ? 'underline' : ''),
}} }}
> >
......
...@@ -46,14 +46,14 @@ interface FrontPageProps { ...@@ -46,14 +46,14 @@ interface FrontPageProps {
guests: Guest[] guests: Guest[]
} }
const StyledTableRow = styled(TableRow)(({ theme }) => ({ const StyledTableRow = styled(TableRow)({
borderTop: '0', borderTop: '0',
borderLeft: '0', borderLeft: '0',
borderRight: '0', borderRight: '0',
borderBottom: '2px solid', borderBottom: '2px solid',
borderColor: theme.palette.primary.main, borderColor: 'black',
borderRadius: '0', borderRadius: '0',
})) })
const StyledAccordion = styled(Accordion)({ const StyledAccordion = styled(Accordion)({
borderStyle: 'none', borderStyle: 'none',
...@@ -186,9 +186,9 @@ const GuestTable = ({ guests, emptyText }: GuestTableProps) => { ...@@ -186,9 +186,9 @@ const GuestTable = ({ guests, emptyText }: GuestTableProps) => {
)) ))
) )
) : ( ) : (
<TableRow> <StyledTableRow>
<TableCell> {emptyText}</TableCell> <TableCell> {emptyText}</TableCell>
</TableRow> </StyledTableRow>
)} )}
</TableBody> </TableBody>
</Table> </Table>
...@@ -213,7 +213,9 @@ const InvitedGuests = ({ persons }: GuestProps) => { ...@@ -213,7 +213,9 @@ const InvitedGuests = ({ persons }: GuestProps) => {
setActiveExpanded(!activeExpanded) setActiveExpanded(!activeExpanded)
}} }}
> >
<StyledAccordionSummary expandIcon={<ArrowUpwardIcon color="primary" />}> <StyledAccordionSummary
expandIcon={<ArrowUpwardIcon sx={{ fill: 'black' }} />}
>
<h2>{t('common:sentInvitations')}</h2> <h2>{t('common:sentInvitations')}</h2>
</StyledAccordionSummary> </StyledAccordionSummary>
<AccordionDetails> <AccordionDetails>
...@@ -240,7 +242,9 @@ const ActiveGuests = ({ persons }: GuestProps) => { ...@@ -240,7 +242,9 @@ const ActiveGuests = ({ persons }: GuestProps) => {
setActiveExpanded(!activeExpanded) setActiveExpanded(!activeExpanded)
}} }}
> >
<StyledAccordionSummary expandIcon={<ArrowUpwardIcon color="primary" />}> <StyledAccordionSummary
expandIcon={<ArrowUpwardIcon sx={{ fill: 'black' }} />}
>
<h2>{t('common:activeGuests')}</h2> <h2>{t('common:activeGuests')}</h2>
</StyledAccordionSummary> </StyledAccordionSummary>
<AccordionDetails> <AccordionDetails>
...@@ -268,7 +272,9 @@ const WaitingGuests = ({ persons }: GuestProps) => { ...@@ -268,7 +272,9 @@ const WaitingGuests = ({ persons }: GuestProps) => {
setWaitingExpanded(!waitingExpanded) setWaitingExpanded(!waitingExpanded)
}} }}
> >
<StyledAccordionSummary expandIcon={<ArrowUpwardIcon color="primary" />}> <StyledAccordionSummary
expandIcon={<ArrowUpwardIcon sx={{ fill: 'black' }} />}
>
<h2> <h2>
{t('common:waitingGuests')}{' '} {t('common:waitingGuests')}{' '}
{guests.length > 0 && ( {guests.length > 0 && (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment