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

Merge branch 'GREG-192_resize_loginbox' into 'master'

GREG-192: Changing to inherit width for large login box

See merge request !260
parents f1553bc4 febcce89
No related branches found
No related tags found
1 merge request!260GREG-192: Changing to inherit width for large login box
Pipeline #112487 passed
...@@ -18,7 +18,7 @@ interface LoginBoxProps { ...@@ -18,7 +18,7 @@ interface LoginBoxProps {
header: string header: string
info: string info: string
manual?: boolean manual?: boolean
large?: boolean inheritWidth?: boolean
onClickLogin?: () => any onClickLogin?: () => any
} }
...@@ -26,14 +26,14 @@ const LoginBox = ({ ...@@ -26,14 +26,14 @@ const LoginBox = ({
header, header,
info, info,
manual, manual,
large, inheritWidth,
onClickLogin, onClickLogin,
}: LoginBoxProps) => { }: LoginBoxProps) => {
const { t } = useTranslation('login') const { t } = useTranslation('login')
return ( return (
<StyledBox <StyledBox
sx={{ sx={{
width: large ? '48rem' : '24rem', width: inheritWidth ? 'inherit' : '24rem',
height: '18rem', height: '18rem',
marginBottom: { xs: '2rem', md: '0rem' }, marginBottom: { xs: '2rem', md: '0rem' },
}} }}
...@@ -86,5 +86,5 @@ const LoginBox = ({ ...@@ -86,5 +86,5 @@ const LoginBox = ({
</StyledBox> </StyledBox>
) )
} }
LoginBox.defaultProps = { manual: false, large: false, onClickLogin: {} } LoginBox.defaultProps = { manual: false, inheritWidth: false, onClickLogin: {} }
export default LoginBox export default LoginBox
...@@ -38,7 +38,7 @@ function ChooseRegistrationMethod() { ...@@ -38,7 +38,7 @@ function ChooseRegistrationMethod() {
header={t('guest')} header={t('guest')}
info={t('guestInfo')} info={t('guestInfo')}
manual manual
large inheritWidth
onClickLogin={setCookieLogin} onClickLogin={setCookieLogin}
/> />
</Container> </Container>
......
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