From e87f9efb773c6a00a0505fc92266d87ade7d918b Mon Sep 17 00:00:00 2001 From: Martina Date: Sun, 2 Aug 2020 12:05:57 -0700 Subject: [PATCH] revert button full changes --- components/sidebars/SidebarAddFileToBucket.js | 10 +- .../sidebars/SidebarCreatePaymentChannel.js | 5 +- components/sidebars/SidebarCreateSlate.js | 10 +- .../sidebars/SidebarCreateWalletAddress.js | 10 +- .../sidebars/SidebarDeleteWalletAddress.js | 10 +- components/sidebars/SidebarFileStorageDeal.js | 10 +- components/sidebars/SidebarWalletSendFunds.js | 10 +- components/system/components/Buttons.js | 124 +++++------------- .../system/modules/CreateFilecoinAddress.js | 13 +- .../modules/CreateFilecoinStorageDeal.js | 13 +- components/system/modules/CreateToken.js | 6 +- .../system/modules/SendAddressFilecoin.js | 9 +- pages/system/buttons.js | 26 ++-- pages/system/carousel.js | 13 +- pages/system/modals.js | 10 +- pages/system/notifications.js | 94 ++++++------- scenes/SceneSignIn.js | 5 +- 17 files changed, 151 insertions(+), 227 deletions(-) diff --git a/components/sidebars/SidebarAddFileToBucket.js b/components/sidebars/SidebarAddFileToBucket.js index fc89bcf5..4a84791f 100644 --- a/components/sidebars/SidebarAddFileToBucket.js +++ b/components/sidebars/SidebarAddFileToBucket.js @@ -82,24 +82,22 @@ export default class SidebarAddFileToBucket extends React.Component { ) : null} - Add file - + {!this.props.fileLoading ? ( - Cancel - + ) : null} ); diff --git a/components/sidebars/SidebarCreatePaymentChannel.js b/components/sidebars/SidebarCreatePaymentChannel.js index f7ac812a..11a42cd0 100644 --- a/components/sidebars/SidebarCreatePaymentChannel.js +++ b/components/sidebars/SidebarCreatePaymentChannel.js @@ -87,13 +87,12 @@ export default class SidebarCreatePaymentChannel extends React.Component {
Total Filecoin
- Send - + ); } diff --git a/components/sidebars/SidebarCreateSlate.js b/components/sidebars/SidebarCreateSlate.js index e5dfaf4f..847ecc3c 100644 --- a/components/sidebars/SidebarCreateSlate.js +++ b/components/sidebars/SidebarCreateSlate.js @@ -64,22 +64,20 @@ export default class SidebarCreateSlate extends React.Component { {this.props.viewer.username}/{Strings.createSlug(this.state.name)} - Create {this.state.name} - + - Cancel - + ); } diff --git a/components/sidebars/SidebarCreateWalletAddress.js b/components/sidebars/SidebarCreateWalletAddress.js index 274a763d..12d9d55e 100644 --- a/components/sidebars/SidebarCreateWalletAddress.js +++ b/components/sidebars/SidebarCreateWalletAddress.js @@ -89,22 +89,20 @@ export default class SidebarCreateWalletAddress extends React.Component { Make this wallet the default - Create {this.state.name} - + - Cancel - + ); } diff --git a/components/sidebars/SidebarDeleteWalletAddress.js b/components/sidebars/SidebarDeleteWalletAddress.js index 4f672ed1..fbd3e506 100644 --- a/components/sidebars/SidebarDeleteWalletAddress.js +++ b/components/sidebars/SidebarDeleteWalletAddress.js @@ -27,21 +27,19 @@ export default class SidebarDeleteWalletAddress extends React.Component { Are you sure you want to delete the selected wallet? - Delete - + - Cancel - + ); } diff --git a/components/sidebars/SidebarFileStorageDeal.js b/components/sidebars/SidebarFileStorageDeal.js index 7c84164d..f38085cf 100644 --- a/components/sidebars/SidebarFileStorageDeal.js +++ b/components/sidebars/SidebarFileStorageDeal.js @@ -138,23 +138,21 @@ export default class SidebarFileStorageDeal extends React.Component { options={this.props.viewer.addresses} /> - Make storage deal - + {!this.props.sidebarLoading ? ( - Cancel deal - + ) : null} ); diff --git a/components/sidebars/SidebarWalletSendFunds.js b/components/sidebars/SidebarWalletSendFunds.js index 6ba4d0c8..cbbd5252 100644 --- a/components/sidebars/SidebarWalletSendFunds.js +++ b/components/sidebars/SidebarWalletSendFunds.js @@ -116,22 +116,20 @@ export default class SidebarWalletSendFunds extends React.Component {
Total Filecoin
- Send - + - Cancel - + ); } diff --git a/components/system/components/Buttons.js b/components/system/components/Buttons.js index 5386727b..580142b5 100644 --- a/components/system/components/Buttons.js +++ b/components/system/components/Buttons.js @@ -59,58 +59,7 @@ const STYLES_BUTTON_PRIMARY = css` } `; -const STYLES_BUTTON_PRIMARY_FULL = css` - ${STYLES_BUTTON_FULL} - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.15); - cursor: pointer; - background-color: ${Constants.system.brand}; - color: ${Constants.system.white}; - - :hover { - background-color: #003fe3; - } - - :focus { - box-shadow: inset 0 0 5px 2px rgba(0, 0, 0, 0.3); - background-color: ${Constants.system.brand}; - outline: 0; - border: 0; - } -`; - export const ButtonPrimary = (props) => { - if (props.full) { - if (props.loading) { - return ( - - ); - } - - if (props.type === "label") { - return ( -