diff --git a/src/components/Alert/index.js b/src/components/Alert/index.js index 680f8da5a..179b0fb29 100644 --- a/src/components/Alert/index.js +++ b/src/components/Alert/index.js @@ -1,17 +1,60 @@ import React from 'react'; import clsx from 'classnames'; +import styled from 'styled-components'; -import Style from './style.module.scss'; - -export function Alert({ title, description, intent }) { +export function Alert({ title, description, children, intent, className }) { return ( -
- {title &&

{title}

} - {description &&

{description}

} -
+ + {title && {title}} + {description && {description}} + {children && {children}} + ); } + +const AlertRoot = styled.div` + border: 1px solid rgb(223, 227, 230); + padding: 12px; + border-radius: 6px; + margin-bottom: 20px; + + ${(props) => + props.intent === 'danger' && + ` + border-color: rgb(249, 198, 198); + background: rgb(255, 248, 248); + + ${AlertDesc} { + color: #d95759; + } + ${AlertTitle} { + color: rgb(205, 43, 49); + } + `} + + ${(props) => + props.intent === 'primary' && + ` + background: #fff; + border-color: #98a8ee; + + ${AlertTitle} { + color: #1a3bd4; + } + ${AlertDesc} { + color: #455883; + } + `} +`; + +const AlertTitle = styled.h3` + color: rgb(17, 24, 28); + margin-bottom: 4px; + font-size: 14px; + font-weight: 600; +`; + +const AlertDesc = styled.p` + color: rgb(104, 112, 118); + margin: 0; +`; diff --git a/src/components/Alert/style.module.scss b/src/components/Alert/style.module.scss index be866addf..74b4e9a5a 100644 --- a/src/components/Alert/style.module.scss +++ b/src/components/Alert/style.module.scss @@ -1,32 +1,26 @@ .root { - border: 1px solid rgb(223, 227, 230); - padding: 12px; - border-radius: 6px; - margin-bottom: 20px; + &_danger { - border-color: rgb(249, 198, 198); - background: rgb(255, 248, 248); + - .description { - color: #d95759; - } + + } - .title { - color: rgb(205, 43, 49); + &__primary{ + + + .title{ + color: #1a3bd4; } } } .title { - color: rgb(17, 24, 28); - margin-bottom: 4px; - font-size: 14px; - font-weight: 600; + } .description { - color: rgb(104, 112, 118); - margin: 0; + } \ No newline at end of file diff --git a/src/containers/TransactionsLocking/TransactionsLockingList.js b/src/containers/TransactionsLocking/TransactionsLockingList.js index 77c2c0375..1dc1474ec 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingList.js +++ b/src/containers/TransactionsLocking/TransactionsLockingList.js @@ -2,6 +2,9 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; import clsx from 'classnames'; +import { Intent } from '@blueprintjs/core'; + +import { Alert } from 'components'; import { TransactionsLockingProvider } from './TransactionsLockingProvider'; import { TransactionLockingContent } from './components'; import withDialogActions from 'containers/Dialog/withDialogActions'; @@ -67,8 +70,17 @@ function TransactionsLockingListPage({ ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. - Lock All Transactions At Once.{' '} - {''}Lock All Transactions At Once → + + +

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do + eiusmod tempor incididunt ut labore et dolore magna aliqua. +

+ Lock All Transactions At Once → +
@@ -81,7 +93,7 @@ export default compose(withDialogActions)(TransactionsLockingListPage); const TransactionsLocking = styled.div` display: flex; flex-direction: column; - padding: 32px; + padding: 32px 40px; max-width: 800px; `; @@ -94,3 +106,9 @@ const TransLockingTitle = styled.h2` `; const TransLockingDesc = styled.p``; + +const LockAllAlert = styled(Alert)` + margin-bottom: 0; + margin-top: 20px; + background: transparent; +`;