diff --git a/frontend/.env b/frontend/.env index b53dc49260cb0881c09ead78f8a1e0b63429dc9b..70faa8f9a589740601cce72e8d0c213c2e3fc2e8 100644 --- a/frontend/.env +++ b/frontend/.env @@ -6,6 +6,4 @@ REACT_APP_INST=uio REACT_APP_SUPPORT_URL=https://example.org REACT_APP_RESPONSIBLE_ORGANIZATION='Seksjon for integrasjon og elektroniske identiteter (INT)' -REACT_APP_RESPONSIBLE_ORGANIZATION_LINK='https://www.usit.uio.no/om/organisasjon/bnt/usitint/' - -REACT_APP_THEME=default +REACT_APP_RESPONSIBLE_ORGANIZATION_LINK='https://www.usit.uio.no/om/organisasjon/bnt/usitint/' \ No newline at end of file diff --git a/frontend/src/routes/components/footer.tsx b/frontend/src/routes/components/footer.tsx index b33ae0141accf18ca6ab30a3406e2a9e92d7f27b..8187bb5c7f0813bd0c6bec117a5098c4256770e1 100644 --- a/frontend/src/routes/components/footer.tsx +++ b/frontend/src/routes/components/footer.tsx @@ -58,10 +58,7 @@ const LogoSection = styled('div')(({ theme }) => ({ padding: '1rem 0 1rem 2rem', })) -const LogoContainer = styled('div')({ - maxWidth: '20rem', - minWidth: '10rem', -}) +const LogoContainer = styled('div')({}) function Footer() { const { t } = useTranslation(['common', 'footer']) diff --git a/frontend/src/routes/components/header.tsx b/frontend/src/routes/components/header.tsx index 457379f666763aa509bb7e5861431ba7b5b87779..f107dbc81bdf0961e285408cfac51ff7cb38a735 100644 --- a/frontend/src/routes/components/header.tsx +++ b/frontend/src/routes/components/header.tsx @@ -32,8 +32,6 @@ const LogoContainer = styled('div')({ display: 'flex', flexDirection: 'row', alignItems: 'flex-end', - minWidth: '5rem', - maxWidth: '10rem', paddingTop: '0.5rem', paddingBottom: '0.5rem', }) diff --git a/frontend/src/routes/components/logos/index.tsx b/frontend/src/routes/components/logos/index.tsx index 6ff023b43a940d57b4a56da0968997e050ad481f..49e7e434a2c4c75d183c61d656c0c966753d2229 100644 --- a/frontend/src/routes/components/logos/index.tsx +++ b/frontend/src/routes/components/logos/index.tsx @@ -13,9 +13,22 @@ function getHeaderLogo() { switch (appInst) { case 'uio': if (i18n.language === 'en') { - return <UiOLogoEn /> + return ( + <UiOLogoEn + style={{ minHeight: '5rem', minWidth: '5rem', maxWidth: '15rem' }} + /> + ) } - return <UiOLogoNo /> + return ( + <UiOLogoNo + style={{ + minHeight: '5rem', + minWidth: '5rem', + maxWidth: '15rem', + opacity: '0.99', + }} + /> + ) case 'uib': return <></> default: @@ -29,14 +42,30 @@ function getFooterLogo() { switch (appInst) { case 'uio': if (i18n.language === 'en') { - return <UiOLogoSealEn /> + return ( + <UiOLogoSealEn + style={{ minHeight: '6rem', minWidth: '10rem', maxWidth: '20rem' }} + /> + ) } - return <UiOLogoSealNo /> + return ( + <UiOLogoSealNo + style={{ minHeight: '6rem', minWidth: '10rem', maxWidth: '20rem' }} + /> + ) case 'uib': if (i18n.language === 'en') { - return <UiBLogoEn /> + return ( + <UiBLogoEn + style={{ minHeight: '7rem', minWidth: '10rem', maxWidth: '30rem' }} + /> + ) } - return <UiBLogoNo /> + return ( + <UiBLogoNo + style={{ minHeight: '7rem', minWidth: '10rem', maxWidth: '30rem' }} + /> + ) default: return <></> }