From 6c199d5a64658e17648d480ea96340b286f98e06 Mon Sep 17 00:00:00 2001 From: Petro Silenius Date: Sun, 13 Feb 2022 23:49:14 +0200 Subject: [PATCH 1/5] Add first iteration of brand update --- components/Footer.tsx | 4 ++-- components/Header.tsx | 11 ++++++++--- theme.ts | 8 +++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index 4d14fb7..892e47d 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -2,7 +2,7 @@ import { Container, Divider, Grid, Link, Paper, Typography } from '@mui/material const Header = () => { return ( - + Business Finlandin mukaan sertifiointi on laadun tae kansainvälisessä kaupassa. @@ -10,7 +10,7 @@ const Header = () => { tarjoajia on hyvin paljon. Ideana on tuottaa nyt hankalasti ja pirstoutuneena oleva tieto yhteen paikkaan kaikkien toimijoiden avoimesti saataville. - + diff --git a/components/Header.tsx b/components/Header.tsx index 66a3580..954e851 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -5,7 +5,7 @@ import { useRouter } from 'next/router'; const Header = () => { const router = useRouter(); return ( - + @@ -13,7 +13,7 @@ const Header = () => { Matkailualan
sertifikaatit @@ -24,7 +24,12 @@ const Header = () => { {router.pathname !== '/' && ( - Yrityshakuun + + Yrityshakuun + )} diff --git a/theme.ts b/theme.ts index 4b3c1e0..8a389d0 100644 --- a/theme.ts +++ b/theme.ts @@ -3,7 +3,11 @@ import { createTheme } from '@mui/material/styles'; const theme = createTheme({ palette: { primary: { - main: '#F97C80', + main: '#1D764A', + contrastText: '#DBEEFE', + }, + common: { + black: '#2222222', }, }, typography: { @@ -13,6 +17,8 @@ const theme = createTheme({ MuiButton: { styleOverrides: { root: { + backgroundColor: '#DBEEFE', + color: '#1D764A', textTransform: 'none', }, }, From 9c20cb2dfaf54fddd3ae9c09111f8e3af5590d4f Mon Sep 17 00:00:00 2001 From: Petro Silenius Date: Sun, 13 Feb 2022 23:51:25 +0200 Subject: [PATCH 2/5] Fix type error in Footer bgcolor definement --- components/Footer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index 892e47d..e650f5e 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -2,7 +2,7 @@ import { Container, Divider, Grid, Link, Paper, Typography } from '@mui/material const Header = () => { return ( - + Business Finlandin mukaan sertifiointi on laadun tae kansainvälisessä kaupassa. From 23b8b5bb1f3a9d3ac6c3ab327249839641ba8658 Mon Sep 17 00:00:00 2001 From: Petro Silenius Date: Mon, 14 Feb 2022 00:05:54 +0200 Subject: [PATCH 3/5] Fix button hover color --- theme.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme.ts b/theme.ts index 8a389d0..74a8d41 100644 --- a/theme.ts +++ b/theme.ts @@ -20,6 +20,9 @@ const theme = createTheme({ backgroundColor: '#DBEEFE', color: '#1D764A', textTransform: 'none', + '&:hover': { + backgroundColor: '#E4F2FE', + } }, }, }, From 9b356af11e8cb796ee4061b529f6e526bb7f1619 Mon Sep 17 00:00:00 2001 From: Petro Silenius Date: Mon, 14 Feb 2022 08:22:48 +0200 Subject: [PATCH 4/5] Change button colors based on feedback --- theme.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/theme.ts b/theme.ts index 74a8d41..5e2dacd 100644 --- a/theme.ts +++ b/theme.ts @@ -17,11 +17,11 @@ const theme = createTheme({ MuiButton: { styleOverrides: { root: { - backgroundColor: '#DBEEFE', - color: '#1D764A', + backgroundColor: '#1D764A', + color: '#FFFFFF', textTransform: 'none', '&:hover': { - backgroundColor: '#E4F2FE', + backgroundColor: '#1D764ACC', } }, }, From f753fc61eeaa085a72232b78d68543259fa4be54 Mon Sep 17 00:00:00 2001 From: Petro Silenius Date: Mon, 14 Feb 2022 08:38:30 +0200 Subject: [PATCH 5/5] Add margin between icon and text in buttons --- theme.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme.ts b/theme.ts index 5e2dacd..08663d2 100644 --- a/theme.ts +++ b/theme.ts @@ -22,6 +22,9 @@ const theme = createTheme({ textTransform: 'none', '&:hover': { backgroundColor: '#1D764ACC', + }, + '& .MuiSvgIcon-root': { + marginRight: '4px', } }, },