part of the style refinement

2 files changed, 34 insertions, 18 deletions

diff --git a/ui/app/pages/first-time-flow/welcome/welcome.component.js b/ui/app/pages/first-time-flow/welcome/welcome.component.js
index c720d2572..79b85c111 100644
--- a/ui/app/pages/first-time-flow/welcome/welcome.component.js
+++ b/ui/app/pages/first-time-flow/welcome/welcome.component.js
@@ -17,11 +17,11 @@ export default class Welcome extends PureComponent {
     t: PropTypes.func,
   }
 
-  constructor (props) {
-    super(props)
+  // constructor (props) {
+  //   super(props)
 
-    this.animationEventEmitter = new EventEmitter()
-  }
+  //   // this.animationEventEmitter = new EventEmitter()
+  // }
 
   componentDidMount () {
     const { history, participateInMetaMetrics, welcomeScreenSeen } = this.props
@@ -43,10 +43,17 @@ export default class Welcome extends PureComponent {
     return (
       <div className="welcome-page__wrapper">
         <div className="welcome-page">
-          <Mascot
+          {/* <Mascot
             animationEventEmitter={this.animationEventEmitter}
             width="125"
             height="125"
+          /> */}
+          <img
+            style={{
+              height: '50px',
+              marginBottom: '40px',
+            }}
+            src={'images/logo/metamask-logo-horizontal.svg'}
           />
           <div className="welcome-page__header">
             { t('welcome') }
diff --git a/ui/app/pages/unlock-page/unlock-page.component.js b/ui/app/pages/unlock-page/unlock-page.component.js
index 3aeb2a59b..4d0d5d782 100644
--- a/ui/app/pages/unlock-page/unlock-page.component.js
+++ b/ui/app/pages/unlock-page/unlock-page.component.js
@@ -2,9 +2,9 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import Button from '@material-ui/core/Button'
 import TextField from '../../components/ui/text-field'
-import getCaretCoordinates from 'textarea-caret'
-import { EventEmitter } from 'events'
-import Mascot from '../../components/ui/mascot'
+// import getCaretCoordinates from 'textarea-caret'
+// import { EventEmitter } from 'events'
+// import Mascot from '../../components/ui/mascot'
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes'
 
 export default class UnlockPage extends Component {
@@ -32,7 +32,7 @@ export default class UnlockPage extends Component {
     }
 
     this.submitting = false
-    this.animationEventEmitter = new EventEmitter()
+    // this.animationEventEmitter = new EventEmitter()
   }
 
   componentWillMount () {
@@ -97,13 +97,13 @@ export default class UnlockPage extends Component {
     this.setState({ password: target.value, error: null })
 
     // tell mascot to look at page action
-    const element = target
-    const boundingRect = element.getBoundingClientRect()
-    const coordinates = getCaretCoordinates(element, element.selectionEnd)
-    this.animationEventEmitter.emit('point', {
-      x: boundingRect.left + coordinates.left - element.scrollLeft,
-      y: boundingRect.top + coordinates.top - element.scrollTop,
-    })
+    // const element = target
+    // const boundingRect = element.getBoundingClientRect()
+    // const coordinates = getCaretCoordinates(element, element.selectionEnd)
+    // this.animationEventEmitter.emit('point', {
+    //   x: boundingRect.left + coordinates.left - element.scrollLeft,
+    //   y: boundingRect.top + coordinates.top - element.scrollTop,
+    // })
   }
 
   renderSubmitButton () {
@@ -141,11 +141,20 @@ export default class UnlockPage extends Component {
     return (
       <div className="unlock-page__container">
         <div className="unlock-page">
-          <div className="unlock-page__mascot-container">
-            <Mascot
+          <div
+            className="unlock-page__mascot-container"
+          >
+            {/* <Mascot
               animationEventEmitter={this.animationEventEmitter}
               width="120"
               height="120"
+            /> */}
+            <img
+              style={{
+                height: '50px',
+                marginBottom: '40px',
+              }}
+              src={'images/logo/metamask-logo-horizontal.svg'}
             />
           </div>
           <h1 className="unlock-page__title">