diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountImportOptions/AccountImportOptions.js b/packages/fether-react/src/Accounts/CreateAccount/AccountImportOptions/AccountImportOptions.js index b55663450..8f18e2481 100644 --- a/packages/fether-react/src/Accounts/CreateAccount/AccountImportOptions/AccountImportOptions.js +++ b/packages/fether-react/src/Accounts/CreateAccount/AccountImportOptions/AccountImportOptions.js @@ -146,7 +146,7 @@ class AccountImportOptions extends Component { const jsonCard = (
-
+

Recover from JSON Keyfile

-
+

Recover from Seed Phrase

{error}

- + )}
); diff --git a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js index cc9b6890d..28c1adf38 100644 --- a/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js +++ b/packages/fether-react/src/Accounts/CreateAccount/CreateAccount.js @@ -91,14 +91,14 @@ class CreateAccount extends Component {
- + )} ); } diff --git a/packages/fether-react/src/assets/sass/components/_account-import.scss b/packages/fether-react/src/assets/sass/components/_account-import.scss new file mode 100644 index 000000000..3cf4df597 --- /dev/null +++ b/packages/fether-react/src/assets/sass/components/_account-import.scss @@ -0,0 +1,12 @@ +.error-import-account { + color: red; + font-size: ms(0); + margin-top: 0.25rem; + text-align: center; +} + +.recover-from-seed-phrase { + .form_field textarea { + height: 2.5rem; + } +} diff --git a/packages/fether-react/src/assets/sass/shared/_basics.scss b/packages/fether-react/src/assets/sass/shared/_basics.scss index 7f10e9898..0de9dad0f 100644 --- a/packages/fether-react/src/assets/sass/shared/_basics.scss +++ b/packages/fether-react/src/assets/sass/shared/_basics.scss @@ -14,8 +14,6 @@ body { font-size: ms(0); line-height: ms(0) * 1.3; position: relative; - /* https://electronjs.org/docs/api/frameless-window#draggable-region */ - -webkit-app-region: drag; } .hidden { @@ -54,10 +52,22 @@ textarea, .header-nav_left, /* i.e. back button in header */ .header-nav_right, /* i.e. menu */ .window_content, /* i.e. main body (e.g. accounts list) */ +.footer-nav, .text { -webkit-app-region: no-drag; } +.header-nav_title, +.footer-nav { + /** + * Right-clicking to trigger the 'contextmenu' event that displays the Fether context menu + * only works on elements whose styles are `-webkit-app-region: drag;` + * + * Reference: https://electronjs.org/docs/api/frameless-window#draggable-region + */ + -webkit-app-region: drag; +} + h1, /* i.e. Send Ether title */ .account.-header, .status, diff --git a/packages/fether-react/src/index.sass b/packages/fether-react/src/index.sass index ed177d4ee..525375f25 100644 --- a/packages/fether-react/src/index.sass +++ b/packages/fether-react/src/index.sass @@ -23,6 +23,7 @@ @import './assets/sass/components/logo' @import './assets/sass/components/token' @import './assets/sass/components/account' +@import './assets/sass/components/account-import' @import './assets/sass/components/accounts-list' @import './assets/sass/components/status' @import './assets/sass/components/header-nav' diff --git a/packages/fether-ui/src/Form/InputFile/InputFile.js b/packages/fether-ui/src/Form/InputFile/InputFile.js index a140261a0..f1041724f 100644 --- a/packages/fether-ui/src/Form/InputFile/InputFile.js +++ b/packages/fether-ui/src/Form/InputFile/InputFile.js @@ -65,7 +65,7 @@ export class InputFile extends React.PureComponent { disableClick > {({ open }) => ( -
+