Skip to content
Snippets Groups Projects
Commit ea2882ad authored by Jonas Braathen's avatar Jonas Braathen
Browse files

Merge branch 'GREG-272-change-main-color-ntnu-theme' into 'master'

Change ntnu color palette and header accordingly

See merge request !333
parents 5fa60616 f8dd5733
No related branches found
No related tags found
1 merge request!333Change ntnu color palette and header accordingly
Pipeline #143288 passed
...@@ -13,6 +13,7 @@ import { getHeaderLogo } from './logos' ...@@ -13,6 +13,7 @@ import { getHeaderLogo } from './logos'
const StyledHeader = styled('header')(({ theme }) => ({ const StyledHeader = styled('header')(({ theme }) => ({
color: theme.greg.textWhite, color: theme.greg.textWhite,
backgroundColor: theme.palette.primary.main, backgroundColor: theme.palette.primary.main,
...(appInst === 'ntnu' && { backgroundColor: theme.palette.primary.light}),
a: { a: {
textDecoration: 'none', textDecoration: 'none',
......
...@@ -12,8 +12,8 @@ const ntnuTheme: ThemeOptions = { ...@@ -12,8 +12,8 @@ const ntnuTheme: ThemeOptions = {
}, },
palette: { palette: {
primary: { primary: {
main: '#ffffff', main: '#00509e',
light: '#6096d0', light: '#ffffff',
}, },
secondary: { secondary: {
main: '#00509e', main: '#00509e',
......
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