Skip to content
Snippets Groups Projects
Verified Commit 11b788af authored by Andreas Ellewsen's avatar Andreas Ellewsen
Browse files

Increase margins around text

parent 25347903
No related branches found
No related tags found
1 merge request!294Greg 217 padding margin font
Pipeline #118486 passed
...@@ -233,7 +233,10 @@ const InvitedGuests = ({ persons }: GuestProps) => { ...@@ -233,7 +233,10 @@ const InvitedGuests = ({ persons }: GuestProps) => {
</Typography> </Typography>
</StyledAccordionSummary> </StyledAccordionSummary>
<AccordionDetails> <AccordionDetails>
<Typography variant="body1"> <Typography
variant="body1"
sx={{ marginTop: '1rem', marginBottom: '1rem' }}
>
{t('common:sentInvitationsDescription')} {t('common:sentInvitationsDescription')}
</Typography> </Typography>
<GuestTable guests={guests} emptyText={t('common:noInvitations')} /> <GuestTable guests={guests} emptyText={t('common:noInvitations')} />
...@@ -266,7 +269,10 @@ const ActiveGuests = ({ persons }: GuestProps) => { ...@@ -266,7 +269,10 @@ const ActiveGuests = ({ persons }: GuestProps) => {
</Typography> </Typography>
</StyledAccordionSummary> </StyledAccordionSummary>
<AccordionDetails> <AccordionDetails>
<Typography variant="body1"> <Typography
variant="body1"
sx={{ marginTop: '1rem', marginBottom: '1rem' }}
>
{t('common:activeGuestsDescription')} {t('common:activeGuestsDescription')}
</Typography> </Typography>
<GuestTable guests={guests} emptyText={t('common:noActiveGuests')} /> <GuestTable guests={guests} emptyText={t('common:noActiveGuests')} />
...@@ -305,7 +311,10 @@ const WaitingGuests = ({ persons }: GuestProps) => { ...@@ -305,7 +311,10 @@ const WaitingGuests = ({ persons }: GuestProps) => {
</Typography> </Typography>
</StyledAccordionSummary> </StyledAccordionSummary>
<AccordionDetails> <AccordionDetails>
<Typography variant="body1"> <Typography
variant="body1"
sx={{ marginTop: '1rem', marginBottom: '1rem' }}
>
<Trans i18nKey="common:waitingGuestsDescription"> <Trans i18nKey="common:waitingGuestsDescription">
Her godkjenner du gjester som har <b>registrert seg manuelt</b>. Her godkjenner du gjester som har <b>registrert seg manuelt</b>.
Gjester som har FEIDE-bruker trenger ikke godkjenning. Gjester som har FEIDE-bruker trenger ikke godkjenning.
......
...@@ -162,8 +162,10 @@ export default function GuestInfo({ ...@@ -162,8 +162,10 @@ export default function GuestInfo({
<SponsorInfoButtons to="/sponsor" name={`${guest.first} ${guest.last}`} /> <SponsorInfoButtons to="/sponsor" name={`${guest.first} ${guest.last}`} />
<form onSubmit={onSubmit}> <form onSubmit={onSubmit}>
<Box sx={{ marginBottom: '2rem' }}> <Box sx={{ marginBottom: '2rem' }}>
<Typography variant="h2">{t('guestInfo.contactInfo')}</Typography> <Typography sx={{ marginBottom: '1rem' }} variant="h2">
<Typography variant="body1"> {t('guestInfo.contactInfo')}
</Typography>
<Typography sx={{ marginBottom: '1rem' }} variant="body1">
{t('guestInfo.contactInfoBody')} {t('guestInfo.contactInfoBody')}
</Typography> </Typography>
...@@ -173,7 +175,6 @@ export default function GuestInfo({ ...@@ -173,7 +175,6 @@ export default function GuestInfo({
<TableRow> <TableRow>
<TableHeadCell align="left" colSpan={2}> <TableHeadCell align="left" colSpan={2}>
{t('guestInfo.contactInfoTableText')} {t('guestInfo.contactInfoTableText')}
</TableHeadCell> </TableHeadCell>
</TableRow> </TableRow>
</TableHead> </TableHead>
...@@ -204,7 +205,7 @@ export default function GuestInfo({ ...@@ -204,7 +205,7 @@ export default function GuestInfo({
defaultValue={guest.email} defaultValue={guest.email}
inputRef={ref} inputRef={ref}
onChange={onChange} onChange={onChange}
{...inputProps} {...inputProps}
/> />
{/* If the guest has not completed the registration process, he should have an invitation he has not responded to */} {/* If the guest has not completed the registration process, he should have an invitation he has not responded to */}
...@@ -284,8 +285,12 @@ export default function GuestInfo({ ...@@ -284,8 +285,12 @@ export default function GuestInfo({
</Button> </Button>
</Box> </Box>
</form> </form>
<Typography variant="h2">{t('guestInfo.roleInfoHead')}</Typography> <Typography sx={{ marginBottom: '1rem' }} variant="h2">
<Typography variant="body1">{t('guestInfo.roleInfoBody')}</Typography> {t('guestInfo.roleInfoHead')}
</Typography>
<Typography sx={{ marginBottom: '1rem' }} variant="body1">
{t('guestInfo.roleInfoBody')}
</Typography>
<TableContainer> <TableContainer>
<Table sx={{ minWidth: 650 }} aria-label="simple table"> <Table sx={{ minWidth: 650 }} aria-label="simple table">
<TableHead> <TableHead>
......
...@@ -84,7 +84,7 @@ const TableCell = styled(TableCellMui)({ ...@@ -84,7 +84,7 @@ const TableCell = styled(TableCellMui)({
}) })
const TableContainer = styled(TableContainerMui)({ const TableContainer = styled(TableContainerMui)({
marginBottom: '0.8rem', marginBottom: '1rem',
borderRadius: '1%', borderRadius: '1%',
borderStyle: 'solid', borderStyle: 'solid',
borderColor: 'black', borderColor: 'black',
...@@ -194,8 +194,12 @@ export default function GuestRoleInfo({ ...@@ -194,8 +194,12 @@ export default function GuestRoleInfo({
to={`/sponsor/guest/${pid}`} to={`/sponsor/guest/${pid}`}
name={`${guest.first} ${guest.last}`} name={`${guest.first} ${guest.last}`}
/> />
<Typography variant="h2">{t('sponsor.roleInfoHead')}</Typography> <Typography sx={{ marginBottom: '1rem' }} variant="h2">
<Typography variant="body1">{t('sponsor.roleInfoText')}</Typography> {t('sponsor.roleInfoHead')}
</Typography>
<Typography sx={{ marginBottom: '1rem' }} variant="body1">
{t('sponsor.roleInfoText')}
</Typography>
<form onSubmit={onSubmit}> <form onSubmit={onSubmit}>
<TableContainer> <TableContainer>
<Table sx={{ minWidth: 650 }} aria-label="simple table"> <Table sx={{ minWidth: 650 }} aria-label="simple table">
......
...@@ -182,8 +182,12 @@ function NewGuestRole({ guest, reloadGuestInfo }: NewGuestRoleProps) { ...@@ -182,8 +182,12 @@ function NewGuestRole({ guest, reloadGuestInfo }: NewGuestRoleProps) {
to={`/sponsor/guest/${pid}`} to={`/sponsor/guest/${pid}`}
name={`${guest.first} ${guest.last}`} name={`${guest.first} ${guest.last}`}
/> />
<Typography variant="h2">{t('guest.headerText')}</Typography> <Typography sx={{ marginBottom: '1rem' }} variant="h2">
<Typography variant="body1">{t('guest.bodyText')}</Typography> {t('guest.headerText')}
</Typography>
<Typography sx={{ marginBottom: '1rem' }} variant="body1">
{t('guest.bodyText')}
</Typography>
<form onSubmit={onSubmit}> <form onSubmit={onSubmit}>
<Stack spacing={2}> <Stack spacing={2}>
<FormControl> <FormControl>
......
...@@ -57,14 +57,19 @@ function FrontPage() { ...@@ -57,14 +57,19 @@ function FrontPage() {
return ( return (
<Page> <Page>
<SponsorGuestButtons registerNewGuestActive /> <SponsorGuestButtons registerNewGuestActive />
<Typography variant="h2">{t('register.registerHeading')}</Typography> <Typography variant="h2" sx={{ marginBottom: '1rem' }}>
<Typography variant="body1">{t('register.registerText')}</Typography> {t('register.registerHeading')}
</Typography>
<Typography variant="body1" sx={{ marginBottom: '1rem' }}>
{t('register.registerText')}
</Typography>
<Box <Box
sx={{ sx={{
borderStyle: () => (guests.length > 0 ? 'solid' : 'none'), borderStyle: () => (guests.length > 0 ? 'solid' : 'none'),
borderRadius: '0.3125rem', borderRadius: '0.3125rem',
borderColor: 'secondary.main', borderColor: 'secondary.main',
padding: '0.4375 0.75rem', padding: '0.4375 0.75rem',
marginBottom: '2rem',
}} }}
> >
<TextField <TextField
...@@ -105,7 +110,6 @@ function FrontPage() { ...@@ -105,7 +110,6 @@ function FrontPage() {
}) })
)} )}
</Box> </Box>
<br />
<Button <Button
variant="contained" variant="contained"
color="secondary" color="secondary"
......
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