m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 17:33:23 +01:00
Code

Styling fixes to welcome; hide network component on create password; shown welcoem in popup.

Browse Source
This commit is contained in:
Dan 2018-03-12 14:29:26 -02:30
parent 91c890041c
commit 0dad6db973
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mascara/src/app/first-time/create-password-screen.js
View File

@ -56,7 +56,7 @@ class CreatePasswordScreen extends Component {
render () {
const { isLoading, goToImportWithSeedPhrase, isMascara } = this.props
//
return isLoading
? <LoadingScreen loadingMessage="Creating your new account" />
: (

4
ui/app/app.js
View File

@ -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)
}

4
ui/app/css/itcss/components/welcome-screen.scss
View File

@ -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);
}
}
}

7
ui/app/welcome-screen.js
View File

@ -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.'),