From 55f97b2e813bee1226b115707d6bc0e53ba5c0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= Date: Wed, 18 Sep 2019 19:02:35 +0200 Subject: [PATCH] Update notifications styles --- .../layout/PageFrame/assets/alert.svg | 6 ++ .../layout/PageFrame/assets/check.svg | 6 ++ .../layout/PageFrame/assets/error.svg | 6 ++ src/components/layout/PageFrame/index.jsx | 81 +++++++++++++++---- src/components/layout/PageFrame/index.scss | 16 ---- src/theme/mui.js | 12 +++ 6 files changed, 95 insertions(+), 32 deletions(-) create mode 100644 src/components/layout/PageFrame/assets/alert.svg create mode 100644 src/components/layout/PageFrame/assets/check.svg create mode 100644 src/components/layout/PageFrame/assets/error.svg diff --git a/src/components/layout/PageFrame/assets/alert.svg b/src/components/layout/PageFrame/assets/alert.svg new file mode 100644 index 00000000..0e20a926 --- /dev/null +++ b/src/components/layout/PageFrame/assets/alert.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/layout/PageFrame/assets/check.svg b/src/components/layout/PageFrame/assets/check.svg new file mode 100644 index 00000000..ad3cd87b --- /dev/null +++ b/src/components/layout/PageFrame/assets/check.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/layout/PageFrame/assets/error.svg b/src/components/layout/PageFrame/assets/error.svg new file mode 100644 index 00000000..b4948e8f --- /dev/null +++ b/src/components/layout/PageFrame/assets/error.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/layout/PageFrame/index.jsx b/src/components/layout/PageFrame/index.jsx index 126e774f..5ff4c89f 100644 --- a/src/components/layout/PageFrame/index.jsx +++ b/src/components/layout/PageFrame/index.jsx @@ -2,31 +2,80 @@ import * as React from 'react' import { SnackbarProvider } from 'notistack' import SidebarProvider from '~/components/Sidebar' -import Footer from '~/components/Footer' +import { withStyles } from '@material-ui/core/styles' import Header from '~/components/Header' +import Img from '~/components/layout/Img' +import AlertLogo from './assets/alert.svg' +import CheckLogo from './assets/check.svg' +import ErrorLogo from './assets/error.svg' import styles from './index.scss' +const classes = { + success: { + background: '#ffffff', + fontFamily: 'Averta', + fontSize: '14px', + lineHeight: 1.43, + color: '#001428', + minHeight: '58px', + boxShadow: '0 0 10px 0 rgba(212, 212, 211, 0.59)', + }, + error: { + background: '#ffe6ea', + fontFamily: 'Averta', + fontSize: '14px', + lineHeight: 1.43, + color: '#001428', + minHeight: '58px', + boxShadow: '0 0 10px 0 rgba(212, 212, 211, 0.59)', + }, + warning: { + background: '#fff3e2', + fontFamily: 'Averta', + fontSize: '14px', + lineHeight: 1.43, + color: '#001428', + minHeight: '58px', + boxShadow: '0 0 10px 0 rgba(212, 212, 211, 0.59)', + }, + info: { + background: '#e8673c', + fontFamily: 'Averta', + fontSize: '14px', + lineHeight: 1.43, + color: '#001428', + minHeight: '58px', + boxShadow: '0 0 10px 0 rgba(212, 212, 211, 0.59)', + }, +} + type Props = { children: React.Node, } -const PageFrame = ({ children }: Props) => ( - -
+const PageFrame = ({ children, classes }: Props) => ( +
+ , + error: , + warning: , + }} + ><>
{children} - -
- + + +
) -export default PageFrame +export default withStyles(classes)(PageFrame) diff --git a/src/components/layout/PageFrame/index.scss b/src/components/layout/PageFrame/index.scss index 54ceec03..9727c40e 100644 --- a/src/components/layout/PageFrame/index.scss +++ b/src/components/layout/PageFrame/index.scss @@ -4,19 +4,3 @@ flex: 1 1 auto; max-width: 100%; } - -.success { - background: 'purple'; -} - -.error { - background: 'blue'; -} - -.warning { - background: 'green'; -} - -.info { - background: 'yellow'; -} diff --git a/src/theme/mui.js b/src/theme/mui.js index 0b6cb1f3..aa7dbebe 100644 --- a/src/theme/mui.js +++ b/src/theme/mui.js @@ -204,6 +204,18 @@ export default createMuiTheme({ color: secondaryText, }, }, + /* MuiSnackbar: { + anchorOriginTopRight: { + marginTop: '50px', + }, + }, */ + MuiSnackbarContent: { + message: { + '& img': { + marginRight: '5px', + }, + }, + }, MuiTab: { root: { fontFamily: 'Averta, monospace',