Skip to content
Snippets Groups Projects
Commit ec24555f authored by Tore.Brede's avatar Tore.Brede
Browse files

Merge branch 'remove_hr_in_p_warnings' into 'master'

Removing <hr> as descendant <p> warnings

See merge request !240
parents 159a9ba3 bb0e370d
No related branches found
No related tags found
1 merge request!240Removing <hr> as descendant <p> warnings
Pipeline #109682 passed
...@@ -234,10 +234,10 @@ const GuestRegisterStep = forwardRef( ...@@ -234,10 +234,10 @@ const GuestRegisterStep = forwardRef(
> >
{t('guestRegisterWizardText.yourContactInformation')} {t('guestRegisterWizardText.yourContactInformation')}
</Typography> </Typography>
<Typography sx={{ paddingBottom: '2rem' }}> <Typography>
{t('guestRegisterWizardText.contactInformationDescription')} {t('guestRegisterWizardText.contactInformationDescription')}
<Divider sx={{ border: '1px solid' }} />
</Typography> </Typography>
<Divider sx={{ marginBottom: '2rem', border: '1px solid' }} />
<form onSubmit={onSubmit}> <form onSubmit={onSubmit}>
<Stack spacing={2}> <Stack spacing={2}>
{/* The name is only editable if it is not coming from some trusted source */} {/* The name is only editable if it is not coming from some trusted source */}
...@@ -476,13 +476,13 @@ const GuestRegisterStep = forwardRef( ...@@ -476,13 +476,13 @@ const GuestRegisterStep = forwardRef(
<Typography variant="h5" sx={{ paddingTop: '1rem' }}> <Typography variant="h5" sx={{ paddingTop: '1rem' }}>
{t('guestRegisterWizardText.identityHeader')} {t('guestRegisterWizardText.identityHeader')}
</Typography> </Typography>
<Typography sx={{ paddingBottom: '1rem' }}> <Typography>
<Trans i18nKey="common:guestRegisterWizardText.identityBody"> <Trans i18nKey="common:guestRegisterWizardText.identityBody">
Enter national identity number if you have one. Enter national identity number if you have one.
<strong>Otherwise</strong> use passport information. <strong>Otherwise</strong> use passport information.
</Trans> </Trans>
<Divider sx={{ border: '1px solid' }} />
</Typography> </Typography>
<Divider sx={{ marginBottom: '1rem', border: '1px solid' }} />
{/* The guest should fill in one of national ID number or passport number */} {/* The guest should fill in one of national ID number or passport number */}
<Controller <Controller
name="nationalIdNumber" name="nationalIdNumber"
...@@ -575,10 +575,10 @@ const GuestRegisterStep = forwardRef( ...@@ -575,10 +575,10 @@ const GuestRegisterStep = forwardRef(
<Typography variant="h5" sx={{ paddingTop: '1rem' }}> <Typography variant="h5" sx={{ paddingTop: '1rem' }}>
{t('guestRegisterWizardText.yourGuestPeriod')} {t('guestRegisterWizardText.yourGuestPeriod')}
</Typography> </Typography>
<Typography sx={{ paddingBottom: '1rem' }}> <Typography>
{t('guestRegisterWizardText.guestPeriodDescription')} {t('guestRegisterWizardText.guestPeriodDescription')}
<Divider sx={{ border: '1px solid' }} />
</Typography> </Typography>
<Divider sx={{ marginBottom: '1rem', border: '1px solid' }} />
<TextField <TextField
id="ou-unit" id="ou-unit"
value={ value={
......
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