aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-13 00:59:26 +0800
committerDan <danjm.com@gmail.com>2018-03-13 01:03:45 +0800
commit0dad6db9736f2b90000c489b0b452c8d2fa02bb3 (patch)
treedfb60544f55d24f02bd5eefccceae8cc98811728 /ui
parent91c890041c685db8ff7f7ac87009225fa31b3042 (diff)
downloadtangerine-wallet-browser-0dad6db9736f2b90000c489b0b452c8d2fa02bb3.tar.gz
tangerine-wallet-browser-0dad6db9736f2b90000c489b0b452c8d2fa02bb3.tar.zst
tangerine-wallet-browser-0dad6db9736f2b90000c489b0b452c8d2fa02bb3.zip
Styling fixes to welcome; hide network component on create password; shown welcoem in popup.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js4
-rw-r--r--ui/app/css/itcss/components/welcome-screen.scss4
-rw-r--r--ui/app/welcome-screen.js7
3 files changed, 7 insertions, 8 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 11b761639..50514bd3b 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -298,7 +298,7 @@ App.prototype.renderAppBar = function () {
]),
]),
- h('div.header__right-actions', [
+ betaUI && isInitialized && h('div.header__right-actions', [
h('div.network-component-wrapper', {
style: {},
}, [
@@ -385,7 +385,7 @@ App.prototype.renderPrimary = function () {
const isMascaraOnboarding = isMascara && isOnboarding
const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
- if (!welcomeScreenSeen && isBetaUIOnboarding && !isInitialized && !isUnlocked) {
+ if (!welcomeScreenSeen && betaUI && !isInitialized && !isUnlocked) {
return h(WelcomeScreen)
}
diff --git a/ui/app/css/itcss/components/welcome-screen.scss b/ui/app/css/itcss/components/welcome-screen.scss
index dc8b38399..86fc7d04d 100644
--- a/ui/app/css/itcss/components/welcome-screen.scss
+++ b/ui/app/css/itcss/components/welcome-screen.scss
@@ -6,7 +6,7 @@
font-family: Roboto;
font-weight: 400;
width: 100%;
- height: 100%;
+ flex: 1 0 auto;
padding: 70px 0;
background: $white;
@@ -44,4 +44,4 @@
transition: 200ms ease-in-out;
background-color: rgba(247, 134, 28, 0.9);
}
-} \ No newline at end of file
+}
diff --git a/ui/app/welcome-screen.js b/ui/app/welcome-screen.js
index 0c1aced8c..cdbb6dba8 100644
--- a/ui/app/welcome-screen.js
+++ b/ui/app/welcome-screen.js
@@ -11,8 +11,8 @@ class WelcomeScreen extends Component {
closeWelcomeScreen: PropTypes.func.isRequired,
}
- constructor () {
- super()
+ constructor(props) {
+ super(props)
this.animationEventEmitter = new EventEmitter()
}
@@ -21,7 +21,6 @@ class WelcomeScreen extends Component {
}
render () {
- // t
return h('div.welcome-screen', [
h('div.welcome-screen__info', [
@@ -32,7 +31,7 @@ class WelcomeScreen extends Component {
height: '225',
}),
- h('div.welcome-screen__info__header', 'Welcome to MetaMask Beta.'),
+ h('div.welcome-screen__info__header', 'Welcome to MetaMask Beta'),
h('div.welcome-screen__info__copy', 'MetaMask is a secure identity vault for Ethereum.'),