diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-10-17 02:01:54 +0800 |
commit | 13820b6cc1801a420f39cdfecd7ccb5309dc597b (patch) | |
tree | c79832d7077ab03e0afe0c322cb32b204865d8b5 /mascara/src/app/first-time | |
parent | eeecee01540fbad50c4c463a3b1a54142a63f168 (diff) | |
parent | 07ab613d4c647e3fe554bc06eab8cfb833315a88 (diff) | |
download | tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.gz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.bz2 tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.lz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.xz tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.tar.zst tangerine-wallet-browser-13820b6cc1801a420f39cdfecd7ccb5309dc597b.zip |
fix conflicts
Diffstat (limited to 'mascara/src/app/first-time')
-rw-r--r-- | mascara/src/app/first-time/create-password-screen.js | 8 | ||||
-rw-r--r-- | mascara/src/app/first-time/index.css | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js index 6b284f7c5..0908787da 100644 --- a/mascara/src/app/first-time/create-password-screen.js +++ b/mascara/src/app/first-time/create-password-screen.js @@ -63,7 +63,9 @@ class CreatePasswordScreen extends Component { return password === confirmPassword } - createAccount = () => { + createAccount = (event) => { + event.preventDefault() + if (!this.isValid()) { return } @@ -127,7 +129,7 @@ class CreatePasswordScreen extends Component { It allows you to hold ether & tokens, and interact with decentralized applications. </div> </div>} - <div className="create-password"> + <form className="create-password"> <div className="create-password__title"> Create Password </div> @@ -188,7 +190,7 @@ class CreatePasswordScreen extends Component { </a> { */ } <Breadcrumbs total={3} currentIndex={0} /> - </div> + </form> </div> </div> ) diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css index 2d05a48b8..f3df240e7 100644 --- a/mascara/src/app/first-time/index.css +++ b/mascara/src/app/first-time/index.css @@ -17,6 +17,12 @@ font-family: Roboto; } +@media screen and (min-height: 601px) { + .first-time-flow { + height: 100vh; + } +} + .alpha-warning__container { display: flex; justify-content: center; |