- Import an Account with Seed Phrase
+
+
+
+
{
+ e.preventDefault()
+ this.props.back()
+ }}
+ href="#"
+ >
+ {`< Back`}
+
+
+ Import an Account with Seed Phrase
+
+
+ Enter your secret twelve word phrase here to restore your vault.
+
+
+ Wallet Seed
+
+
+ {this.props.warning}
+
+
+ New Password
+ this.onChange({password: e.target.value})}
+ />
+
+
+ Confirm Password
+ this.onChange({confirmPassword: e.target.value})}
+ disabled={password.length < 8}
+ />
+
+
!importDisabled && this.onClick()}
+ disabled={importDisabled}
+ >
+ Import
+
+
-
- Enter your secret twelve word phrase here to restore your vault.
-
-
- Wallet Seed
-
-
- {this.props.warning}
-
-
- New Password
- this.onChange({password: e.target.value})}
- />
-
-
- Confirm Password
- this.onChange({confirmPassword: e.target.value})}
- disabled={password.length < 8}
- />
-
-
!importDisabled && this.onClick()}
- disabled={importDisabled}
- >
- Import
-
)
}
diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css
index 6c45816bd..d7b146e51 100644
--- a/mascara/src/app/first-time/index.css
+++ b/mascara/src/app/first-time/index.css
@@ -17,12 +17,34 @@
font-family: Roboto;
}
+.alpha-warning__container {
+ display: flex;
+ justify-content: center;
+ background: #f7861c;
+}
+
.alpha-warning,
.alpha-warning-welcome-screen {
- background: #f7861c;
color: #fff;
line-height: 2em;
- padding-left: 10vw;
+}
+
+@media screen and (min-width: 576px) {
+ .alpha-warning {
+ width: 85vw;
+ }
+}
+
+@media screen and (min-width: 769px) {
+ .alpha-warning {
+ width: 80vw;
+ }
+}
+
+@media screen and (min-width: 1281px) {
+ .alpha-warning {
+ width: 62vw;
+ }
}
.alpha-warning-welcome-screen {
@@ -33,26 +55,22 @@
.first-view-main-wrapper {
display: flex;
width: 100%;
- padding-left: 10vw;
+ height: 100%;
+ justify-content: center;
+ padding: 0 10px;
}
.first-view-main,
.first-view-main__mascara {
display: flex;
- flex-direction: row-reverse;
- justify-content: center;
+ flex-direction: row;
+ justify-content: flex-start;
}
.first-view-main__mascara {
justify-content: space-between;
}
-@media screen and (max-width: 575px) {
- .first-view-main-wrapper {
- padding: 0;
- }
-}
-
@media screen and (min-width: 1281px) {
.first-view-main {
width: 62vw;
@@ -83,12 +101,8 @@
.buy-ether {
display: flex;
flex-flow: column nowrap;
- margin: 67px 0 50px;
- max-width: 35rem;
-}
-
-.create-password {
- margin: 67px 0 50px;
+ margin: 60px 0 30px 0;
+ position: relative;
}
.import-account {
@@ -133,10 +147,6 @@
margin-top: 12px;
}
- .first-view-main .create-password {
- margin-top: 0px;
- }
-
.mascara-info {
margin-top: 0px;
width: 100%;
@@ -212,7 +222,7 @@
}
.backup-phrase {
- max-width: 100%;
+ width: 100%;
}
.create-password__title,
@@ -298,7 +308,18 @@
.backup-phrase__content-wrapper {
display: flex;
- flex: row nowrap;
+ flex-flow: row wrap;
+ justify-content: space-between;
+}
+
+.backup-phrase__phrase {
+ flex-grow: .5;
+ min-width: 0;
+}
+
+.backup-phrase__next-button {
+ flex-grow: 1;
+ width: 100%;
}
.backup-phrase__body-text {
@@ -306,8 +327,10 @@
}
.backup-phrase__tips {
- margin: 40px 85px;
+ margin-top: 40px;
width: 285px;
+ flex-grow: .5;
+ min-width: 0;
}
.backup-phrase__tips-text {
@@ -315,6 +338,22 @@
font-size: 16px;
line-height: 23px;
font-family: Roboto;
+ min-width: 0;
+}
+
+@media only screen and (max-width: 768px) {
+ .backup-phrase__content-wrapper {
+ flex-direction: column;
+ }
+
+ .backup-phrase__phrase {
+ flex: 1 0 auto;
+ }
+
+ .backup-phrase__tips {
+ width: 100%;
+ flex: 1 0 auto;
+ }
}
.backup-phrase__secret {
@@ -371,13 +410,17 @@
}
.backup-phrase__back-button,
-.backup-phrase__back-button:hover,
-.import-account__back-button,
-.import-account__back-button:hover {
+.import-account__back-button {
margin-bottom: 18px;
- color: #22232C;
+ color: #22232c;
font-size: 16px;
line-height: 21px;
+ position: absolute;
+ top: -25px;
+}
+
+.backup-phrase__back-button {
+ top: -30px;
}
button.backup-phrase__reveal-button:hover {
diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js
index 0f0a7e95d..cbd8f9f5b 100644
--- a/mascara/src/app/first-time/notice-screen.js
+++ b/mascara/src/app/first-time/notice-screen.js
@@ -63,26 +63,32 @@ class NoticeScreen extends Component {
return (
isLoading
?
- :
-
-
{title}
-
-
- Accept
-
-
-
+ : (
+
+
+
+
+
{title}
+
+
+ Accept
+
+
+
+
+
+ )
)
}
}
diff --git a/mascara/src/app/first-time/unique-image-screen.js b/mascara/src/app/first-time/unique-image-screen.js
index 46448aacf..ede17ee3d 100644
--- a/mascara/src/app/first-time/unique-image-screen.js
+++ b/mascara/src/app/first-time/unique-image-screen.js
@@ -12,22 +12,26 @@ class UniqueImageScreen extends Component {
render () {
return (
-
-
-
Your unique account image
-
- This image was programmatically generated for you by your new account number.
+
+
+
+
+
Your unique account image
+
+ This image was programmatically generated for you by your new account number.
+
+
+ You’ll see this image everytime you need to confirm a transaction.
+
+
+ Next
+
+
+
-
- You’ll see this image everytime you need to confirm a transaction.
-
-
- Next
-
-
)
}
diff --git a/ui/app/app.js b/ui/app/app.js
index 9708a2485..954299a6a 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -329,12 +329,14 @@ App.prototype.renderAppBar = function () {
]),
]),
- !isInitialized && !isPopup && betaUI && h('h2', {
- className: classnames({
- 'alpha-warning': welcomeScreenSeen,
- 'alpha-warning-welcome-screen': !welcomeScreenSeen,
- }),
- }, 'Please be aware that this version is still under development'),
+ !isInitialized && !isPopup && betaUI && h('.alpha-warning__container', {}, [
+ h('h2', {
+ className: classnames({
+ 'alpha-warning': welcomeScreenSeen,
+ 'alpha-warning-welcome-screen': !welcomeScreenSeen,
+ }),
+ }, 'Please be aware that this version is still under development'),
+ ]),
])
)