Skip to content
Snippets Groups Projects
Commit fed86eea authored by Sivert Kronen Hatteberg's avatar Sivert Kronen Hatteberg
Browse files

Merge branch 'GREG-98-styling-fixes' into 'master'

Greg 98 styling fixes

See merge request !176
parents fc4e3498 0e2f35db
No related branches found
No related tags found
1 merge request!176Greg 98 styling fixes
Pipeline #101287 passed
...@@ -6,6 +6,4 @@ REACT_APP_INST=uio ...@@ -6,6 +6,4 @@ REACT_APP_INST=uio
REACT_APP_SUPPORT_URL=https://example.org REACT_APP_SUPPORT_URL=https://example.org
REACT_APP_RESPONSIBLE_ORGANIZATION='Seksjon for integrasjon og elektroniske identiteter (INT)' 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_RESPONSIBLE_ORGANIZATION_LINK='https://www.usit.uio.no/om/organisasjon/bnt/usitint/'
\ No newline at end of file
REACT_APP_THEME=default
...@@ -58,10 +58,7 @@ const LogoSection = styled('div')(({ theme }) => ({ ...@@ -58,10 +58,7 @@ const LogoSection = styled('div')(({ theme }) => ({
padding: '1rem 0 1rem 2rem', padding: '1rem 0 1rem 2rem',
})) }))
const LogoContainer = styled('div')({ const LogoContainer = styled('div')({})
maxWidth: '20rem',
minWidth: '10rem',
})
function Footer() { function Footer() {
const { t } = useTranslation(['common', 'footer']) const { t } = useTranslation(['common', 'footer'])
......
...@@ -32,8 +32,6 @@ const LogoContainer = styled('div')({ ...@@ -32,8 +32,6 @@ const LogoContainer = styled('div')({
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
alignItems: 'flex-end', alignItems: 'flex-end',
minWidth: '5rem',
maxWidth: '10rem',
paddingTop: '0.5rem', paddingTop: '0.5rem',
paddingBottom: '0.5rem', paddingBottom: '0.5rem',
}) })
......
...@@ -13,9 +13,22 @@ function getHeaderLogo() { ...@@ -13,9 +13,22 @@ function getHeaderLogo() {
switch (appInst) { switch (appInst) {
case 'uio': case 'uio':
if (i18n.language === 'en') { 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': case 'uib':
return <></> return <></>
default: default:
...@@ -29,14 +42,30 @@ function getFooterLogo() { ...@@ -29,14 +42,30 @@ function getFooterLogo() {
switch (appInst) { switch (appInst) {
case 'uio': case 'uio':
if (i18n.language === 'en') { 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': case 'uib':
if (i18n.language === 'en') { 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: default:
return <></> return <></>
} }
......
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