diff --git a/src/renderer/account/components/TransactionsPanel/Receive/Receive.js b/src/renderer/account/components/TransactionsPanel/Receive/Receive.js index f40fe3159..fbeec5e6e 100644 --- a/src/renderer/account/components/TransactionsPanel/Receive/Receive.js +++ b/src/renderer/account/components/TransactionsPanel/Receive/Receive.js @@ -4,7 +4,7 @@ import classNames from 'classnames'; import { CopyToClipboard } from 'react-copy-to-clipboard'; import { string } from 'prop-types'; -import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import styles from './Receive.scss'; @@ -27,7 +27,7 @@ export default class Receive extends React.PureComponent {
{address}
- + Copy to clipboard
My wallet QR code
diff --git a/src/renderer/account/components/TransactionsPanel/Send/Send.js b/src/renderer/account/components/TransactionsPanel/Send/Send.js index 5c0eba7dd..6a42bf41b 100644 --- a/src/renderer/account/components/TransactionsPanel/Send/Send.js +++ b/src/renderer/account/components/TransactionsPanel/Send/Send.js @@ -5,7 +5,7 @@ import { wallet } from '@cityofzion/neon-js'; import { BigNumber } from 'bignumber.js'; import { map, noop } from 'lodash'; -import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import Input from 'shared/components/Forms/Input'; import Select from 'shared/components/Forms/Select'; @@ -73,14 +73,14 @@ export default class Send extends React.PureComponent { value={receiver} onChange={this.handleChangeRecipient} /> - + ); } diff --git a/src/renderer/login/components/LoginFormLedger/LoginFormLedger.js b/src/renderer/login/components/LoginFormLedger/LoginFormLedger.js index d22824855..a9f3836f4 100644 --- a/src/renderer/login/components/LoginFormLedger/LoginFormLedger.js +++ b/src/renderer/login/components/LoginFormLedger/LoginFormLedger.js @@ -3,7 +3,7 @@ import { bool, string, func, shape } from 'prop-types'; import { noop } from 'lodash'; import { progressValues } from 'spunky'; -import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import styles from './LoginFormLedger.scss'; @@ -65,7 +65,7 @@ export default class LoginFormLedger extends React.PureComponent { return (
- + Login
); } diff --git a/src/renderer/login/components/LoginFormPassphrase/LoginFormPassphrase.js b/src/renderer/login/components/LoginFormPassphrase/LoginFormPassphrase.js index 1d6ca341c..03b45ed39 100644 --- a/src/renderer/login/components/LoginFormPassphrase/LoginFormPassphrase.js +++ b/src/renderer/login/components/LoginFormPassphrase/LoginFormPassphrase.js @@ -4,7 +4,7 @@ import { bool, string, func } from 'prop-types'; import { noop } from 'lodash'; import Input from 'shared/components/Forms/Input'; -import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import styles from './LoginFormPassphrase.scss'; @@ -52,13 +52,13 @@ export default class LoginFormWIF extends React.PureComponent { />
- + New to NEO?{' '} Create an account diff --git a/src/renderer/login/components/LoginFormWIF/LoginFormWIF.js b/src/renderer/login/components/LoginFormWIF/LoginFormWIF.js index 5240ceb3f..09b7e0a71 100644 --- a/src/renderer/login/components/LoginFormWIF/LoginFormWIF.js +++ b/src/renderer/login/components/LoginFormWIF/LoginFormWIF.js @@ -3,7 +3,7 @@ import { bool, string, func } from 'prop-types'; import { noop } from 'lodash'; import Input from 'shared/components/Forms/Input'; -import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import styles from './LoginFormWIF.scss'; @@ -38,7 +38,7 @@ export default class LoginFormWIF extends React.PureComponent { />
- + Login
); diff --git a/src/renderer/login/components/LoginFormWalletFile/LoginFormWalletFile.js b/src/renderer/login/components/LoginFormWalletFile/LoginFormWalletFile.js index 2a5406891..04d046cfd 100755 --- a/src/renderer/login/components/LoginFormWalletFile/LoginFormWalletFile.js +++ b/src/renderer/login/components/LoginFormWalletFile/LoginFormWalletFile.js @@ -5,6 +5,7 @@ import { noop, map } from 'lodash'; import { wallet } from '@cityofzion/neon-js'; import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import Select from 'shared/components/Forms/Select'; import Input from 'shared/components/Forms/Input/Input'; @@ -47,7 +48,7 @@ export default class LoginFormWalletFile extends React.PureComponent { {this.renderDescription()}
- + Login
); diff --git a/src/renderer/register/components/AccountDetails/SaveAccount/SaveAccount.js b/src/renderer/register/components/AccountDetails/SaveAccount/SaveAccount.js index d708ee5f2..fcaf63fd0 100644 --- a/src/renderer/register/components/AccountDetails/SaveAccount/SaveAccount.js +++ b/src/renderer/register/components/AccountDetails/SaveAccount/SaveAccount.js @@ -7,7 +7,7 @@ import { noop, isEmpty } from 'lodash'; import { wallet } from '@cityofzion/neon-js'; import Input from 'shared/components/Forms/Input'; -import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import accountShape from '../../../shapes/accountShape'; import styles from './SaveAccount.scss'; @@ -43,20 +43,20 @@ export default class SaveAccount extends React.PureComponent { onChange={this.handleChangeLabel} />
- - +
); diff --git a/src/renderer/register/components/RegisterForm/RegisterForm.js b/src/renderer/register/components/RegisterForm/RegisterForm.js index 61d17ba71..5ec08d6e8 100644 --- a/src/renderer/register/components/RegisterForm/RegisterForm.js +++ b/src/renderer/register/components/RegisterForm/RegisterForm.js @@ -4,7 +4,7 @@ import { bool, string, func } from 'prop-types'; import { noop } from 'lodash'; import Input from 'shared/components/Forms/Input'; -import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import styles from './RegisterForm.scss'; @@ -52,13 +52,13 @@ export default class RegisterForm extends React.PureComponent { />
- + Already have an account?{' '} Login diff --git a/src/renderer/settings/components/NetworkSettings/NetworkSettings.js b/src/renderer/settings/components/NetworkSettings/NetworkSettings.js index e6a8ff155..ea668ced3 100644 --- a/src/renderer/settings/components/NetworkSettings/NetworkSettings.js +++ b/src/renderer/settings/components/NetworkSettings/NetworkSettings.js @@ -5,6 +5,7 @@ import { noop, map } from 'lodash'; import Input from 'shared/components/Forms/Input'; import Button from 'shared/components/Forms/Button'; +import PrimaryButton from 'shared/components/Forms/PrimaryButton'; import Select from 'shared/components/Forms/Select'; import NetworkIcon from 'shared/images/settings/network.svg'; @@ -65,9 +66,9 @@ export default class NetworkSettings extends React.PureComponent { />
- +
- +
diff --git a/src/renderer/shared/components/Confirm/Confirm.js b/src/renderer/shared/components/Confirm/Confirm.js index e4e302841..ca43321a3 100644 --- a/src/renderer/shared/components/Confirm/Confirm.js +++ b/src/renderer/shared/components/Confirm/Confirm.js @@ -5,6 +5,7 @@ import { noop } from 'lodash'; import Modal from '../Modal'; import Button from '../Forms/Button'; +import PrimaryButton from '../Forms/PrimaryButton'; import defaultImage from '../../images/modal-request-icon.png'; import styles from './Confirm.scss'; @@ -57,10 +58,17 @@ export default class Confirm extends React.PureComponent { {children}
- -
diff --git a/src/renderer/shared/components/Confirm/Confirm.scss b/src/renderer/shared/components/Confirm/Confirm.scss index 21225ecdd..8278074bc 100644 --- a/src/renderer/shared/components/Confirm/Confirm.scss +++ b/src/renderer/shared/components/Confirm/Confirm.scss @@ -58,25 +58,5 @@ } } } - - .cancel { - color: #fff; - background-color: #292b2c; - border-color: #292b2c; - - &:focus { - box-shadow: none; - } - - &:not([disabled]) { - cursor: pointer; - - &:active, - &:hover { - background-color: #101112; - border-color: #0a0b0b; - } - } - } } } diff --git a/src/renderer/shared/components/Forms/Button/Button.scss b/src/renderer/shared/components/Forms/Button/Button.scss index 9412b4990..6f3c04f38 100644 --- a/src/renderer/shared/components/Forms/Button/Button.scss +++ b/src/renderer/shared/components/Forms/Button/Button.scss @@ -2,21 +2,20 @@ display: inline-block; height: 36px; padding: 0 24px; - background: radial-gradient(135px at 51% 50%, #5bba47 0%, #8bcd38 100%); + background: #fff; border: 0; border-radius: 4px; - color: #fff; - font-weight: bold; + color: #8bc83c; + font-weight: 500; font-size: 14px; text-align: center; - box-shadow: 0 4px 8px rgba(53, 52, 69, 0.1); - text-shadow: 0 1px 2px rgba(53, 52, 69, 0.45); - letter-spacing: 0.5px; + box-shadow: inset 0 0 0 2px #8bc83c; cursor: pointer; -webkit-font-smoothing: antialiased; &:not([disabled]):hover { - box-shadow: 0 4px 8px rgba(53, 52, 69, 0.2); + box-shadow: inset 0 0 0 2px #8bc83c, + 0 4px 8px rgba(53, 52, 69, 0.2); } &[disabled] { diff --git a/src/renderer/shared/components/Forms/PrimaryButton/PrimaryButton.js b/src/renderer/shared/components/Forms/PrimaryButton/PrimaryButton.js new file mode 100644 index 000000000..f7c159721 --- /dev/null +++ b/src/renderer/shared/components/Forms/PrimaryButton/PrimaryButton.js @@ -0,0 +1,38 @@ +import React from 'react'; +import classNames from 'classnames'; +import { string } from 'prop-types'; + +import Button from '../Button'; +import styles from './PrimaryButton.scss'; + +export default class PrimaryButton extends React.PureComponent { + render() { + return ( +