diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico index 857aef80d5..551d158eee 100644 Binary files a/frontend/public/favicon.ico and b/frontend/public/favicon.ico differ diff --git a/frontend/src/assets/icons/logo_wbg.svg b/frontend/src/assets/icons/logo_wbg.svg new file mode 100644 index 0000000000..b79f917031 --- /dev/null +++ b/frontend/src/assets/icons/logo_wbg.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/component/common/NotFound/NotFound.tsx b/frontend/src/component/common/NotFound/NotFound.tsx index 8e6909b48a..f63393ac87 100644 --- a/frontend/src/component/common/NotFound/NotFound.tsx +++ b/frontend/src/component/common/NotFound/NotFound.tsx @@ -1,7 +1,7 @@ import { Button, Typography } from '@material-ui/core'; import { useHistory } from 'react-router'; -import logo from '../../../assets/img/logo.png'; +import { ReactComponent as LogoIcon } from '../../../assets/icons/logo_wbg.svg'; import { useStyles } from './NotFound.styles'; @@ -20,7 +20,7 @@ const NotFound = () => { return (
- unleash logo +
Ooops. That's a page we haven't toggled on yet. diff --git a/frontend/src/component/menu/drawer.jsx b/frontend/src/component/menu/drawer.jsx index 3bed45a12f..3736209ca2 100644 --- a/frontend/src/component/menu/drawer.jsx +++ b/frontend/src/component/menu/drawer.jsx @@ -8,7 +8,7 @@ import styles from './drawer.module.scss'; import { baseRoutes as routes } from './routes'; -import logo from '../../assets/img/logo.png'; +import { ReactComponent as LogoIcon } from '../../assets/icons/logo_wbg.svg'; const filterByFlags = flags => r => { if (r.flag && !flags[r.flag]) { @@ -76,15 +76,10 @@ export const DrawerMenu = ({ onClose={() => toggleDrawer()} >
-
+
- Unleash Logo + + {title}
diff --git a/frontend/src/component/menu/drawer.module.scss b/frontend/src/component/menu/drawer.module.scss index f616d8258e..33c52efd4a 100644 --- a/frontend/src/component/menu/drawer.module.scss +++ b/frontend/src/component/menu/drawer.module.scss @@ -4,7 +4,6 @@ } .drawerTitle { - font-size: var(--h1-size); display: flex; align-items: center; } @@ -13,13 +12,14 @@ width: var(--drawer-width); } -.drawerTitleContainer { - padding: var(--drawer-padding); +.drawerTitleLogo { + width: 65px; + height: 65px; } -.drawerTitleLogo { - padding-right: 16px; - width: 48px; +.drawerTitleText { + font-size: 1.1rem; + margin-left: 0.25rem; } .drawerList { diff --git a/frontend/src/themes/main-theme.js b/frontend/src/themes/main-theme.js index 6a214fbe14..70d76a175f 100644 --- a/frontend/src/themes/main-theme.js +++ b/frontend/src/themes/main-theme.js @@ -3,12 +3,12 @@ import { createMuiTheme } from '@material-ui/core/styles'; const theme = createMuiTheme({ palette: { primary: { - main: '#607d8b', - light: '#8eacbb', - dark: '#34515e', + main: '#1A4049', + light: '#B3DAED', + dark: '#0A1A1d', }, secondary: { - main: '#0b5644', + main: '#122D33', light: '#40836f', dark: '#002c1d', }, @@ -59,8 +59,8 @@ const theme = createMuiTheme({ }, cards: { gradient: { - top: '#617D8B', - bottom: '#31627C', + top: '#265f6d', + bottom: '#1A4049', }, container: { bg: '#f1f1f1',