Skip to content

Commit

Permalink
Fix french messaging nav string (#1186)
Browse files Browse the repository at this point in the history
  • Loading branch information
annarhughes authored Nov 5, 2024
1 parent d976932 commit 02db886
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
5 changes: 1 addition & 4 deletions components/layout/PrimaryNavigationDrawerLinks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,13 @@ const listButtonStyle = {
backgroundColor: 'primary.main',
opacity: 0.2,
},
':hover': {
backgroundColor: 'unset !important',
},
} as const;

const loginButtonStyle = {
width: 'auto',
ml: 2,
mt: 1,
color: 'text.main !important',
color: 'text.primary !important',
} as const;

interface NavigationItem {
Expand Down
43 changes: 25 additions & 18 deletions components/layout/SecondaryNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,29 @@ interface SecondaryNavIconType {
alt: string;
src: string;
}

const tabsStyle = {
backgroundColor: theme.palette.palePrimaryLight,
} as const;

const tabStyle = {
flexDirection: 'row',
textTransform: 'none',
fontSize: theme.typography.body1.fontSize,
fontWeight: 600,
padding: 0.25,
color: 'text.primary',
'& .material-icons ': { mb: 0, mr: 1.5 },

'&.Mui-selected': {
color: 'text.secondary',
},
':hover': {
borderBottom: '2px solid',
borderColor: 'primary.dark',
},
} as const;

export const SecondaryNavIcon = ({ alt, src }: SecondaryNavIconType) => (
<Icon
sx={{
Expand Down Expand Up @@ -131,16 +154,7 @@ const SecondaryNav = ({ currentPage }: { currentPage: string }) => {
<Tabs
value={tabValue}
aria-label={t('secondaryNavigationMenu')}
sx={{
backgroundColor: theme.palette.palePrimaryLight,
'& a.Mui-selected': {
color: 'text.secondary',
},
'& a:hover': {
borderBottom: '2px solid',
borderColor: 'primary.dark',
},
}}
sx={tabsStyle}
variant="fullWidth"
qa-id="secondary-nav"
// Weird type errors for this prop
Expand All @@ -159,14 +173,7 @@ const SecondaryNav = ({ currentPage }: { currentPage: string }) => {
key={linkData.label}
component={NextLinkComposed}
icon={linkData.icon}
sx={{
textTransform: 'none',
fontSize: theme.typography.body1.fontSize,
fontWeight: 600,
'& .material-icons ': { mb: 0, mr: 1.5 },
padding: 0.25,
flexDirection: 'row',
}}
sx={tabStyle}
aria-label={linkData.ariaLabel}
label={linkData.label}
to={linkData.href}
Expand Down
2 changes: 1 addition & 1 deletion messages/navigation/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"activitiesIcon": "A book with a small yellow fire on its cover.",
"groundingIcon": "A twig with small pink flowers."
},
"messaging": "Mensageria",
"messaging": "Messagerie",
"grounding": "Exercices",
"activities": "Activités"
}
Expand Down
4 changes: 0 additions & 4 deletions styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ body {
sans-serif;
}

a {
color: inherit !important;
}

a span {
color: inherit !important;
}
Expand Down

0 comments on commit 02db886

Please sign in to comment.