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

Merge branch 'GREG-157_uib_colour_update' into 'master'

GREG-157: Updating some UiB theming based on feedback from UI department

See merge request !226
parents 71d1d325 fb024d5d
No related branches found
No related tags found
1 merge request!226GREG-157: Updating some UiB theming based on feedback from UI department
Pipeline #109150 passed
......@@ -30,7 +30,18 @@ function getHeaderLogo() {
/>
)
case 'uib':
return <></>
if (i18n.language === 'en') {
return (
<UiBLogoEn
style={{ minHeight: '7rem', minWidth: '10rem', maxWidth: '30rem' }}
/>
)
}
return (
<UiBLogoNo
style={{ minHeight: '7rem', minWidth: '10rem', maxWidth: '30rem' }}
/>
)
default:
return <></>
}
......@@ -54,18 +65,8 @@ function getFooterLogo() {
/>
)
case 'uib':
if (i18n.language === 'en') {
return (
<UiBLogoEn
style={{ minHeight: '7rem', minWidth: '10rem', maxWidth: '30rem' }}
/>
)
}
return (
<UiBLogoNo
style={{ minHeight: '7rem', minWidth: '10rem', maxWidth: '30rem' }}
/>
)
// No footer logo defined for UiB
return <></>
default:
return <></>
}
......
import { ThemeOptions } from '@mui/material'
/*
Based on guidelines found here: https://manual.uib.no/profilmanual/profilelementer/
UiB style guide: https://manual.uib.no/profilmanual/profilelementer/
The secondary colours are the same as UiO, since these have good contrast
and we do have to only use UiB-colours as long as the overall look of
the pages look similar to other UiB web-sites
*/
const uibTheme: ThemeOptions = {
greg: {
......@@ -17,7 +21,9 @@ const uibTheme: ThemeOptions = {
light: '#ff6c6a',
},
secondary: {
main: '#4ea0b7',
main: '#01579B',
dark: '#1565c0',
light: '#A4C8E4',
},
},
}
......
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