From dfec4a35d75d75110b4d6523cbe2a362704dd478 Mon Sep 17 00:00:00 2001 From: Chen Wei Date: Tue, 2 Jul 2019 12:48:47 +0800 Subject: part of the style refinement --- app/images/icon-128.png | Bin 5770 -> 6248 bytes app/images/icon-16.png | Bin 564 -> 726 bytes app/images/icon-19.png | Bin 662 -> 726 bytes app/images/icon-32.png | Bin 1730 -> 1416 bytes app/images/icon-38.png | Bin 1450 -> 1416 bytes app/images/icon-512.png | Bin 42078 -> 67947 bytes app/images/icon-64.png | Bin 3573 -> 3000 bytes app/images/info-logo-original.png | Bin 0 -> 32567 bytes app/images/info-logo.png | Bin 32567 -> 4036 bytes app/images/logo/metamask-fox-original.svg | 31 ++++++++ app/images/logo/metamask-fox.svg | 38 ++-------- .../logo/metamask-logo-horizontal-original.svg | 62 ++++++++++++++++ app/images/logo/metamask-logo-horizontal.svg | 82 ++++++--------------- .../first-time-flow/welcome/welcome.component.js | 17 +++-- ui/app/pages/unlock-page/unlock-page.component.js | 35 +++++---- 15 files changed, 156 insertions(+), 109 deletions(-) mode change 100644 => 100755 app/images/icon-128.png mode change 100644 => 100755 app/images/icon-16.png mode change 100644 => 100755 app/images/icon-19.png mode change 100644 => 100755 app/images/icon-32.png mode change 100644 => 100755 app/images/icon-38.png mode change 100644 => 100755 app/images/icon-512.png mode change 100644 => 100755 app/images/icon-64.png create mode 100644 app/images/info-logo-original.png create mode 100644 app/images/logo/metamask-fox-original.svg create mode 100644 app/images/logo/metamask-logo-horizontal-original.svg diff --git a/app/images/icon-128.png b/app/images/icon-128.png old mode 100644 new mode 100755 index ae687147d..0f8d5fcc5 Binary files a/app/images/icon-128.png and b/app/images/icon-128.png differ diff --git a/app/images/icon-16.png b/app/images/icon-16.png old mode 100644 new mode 100755 index ba7529073..c09271924 Binary files a/app/images/icon-16.png and b/app/images/icon-16.png differ diff --git a/app/images/icon-19.png b/app/images/icon-19.png old mode 100644 new mode 100755 index 07ac2f33f..c09271924 Binary files a/app/images/icon-19.png and b/app/images/icon-19.png differ diff --git a/app/images/icon-32.png b/app/images/icon-32.png old mode 100644 new mode 100755 index f801ebb6b..cc63eb5f6 Binary files a/app/images/icon-32.png and b/app/images/icon-32.png differ diff --git a/app/images/icon-38.png b/app/images/icon-38.png old mode 100644 new mode 100755 index 83c04800d..cc63eb5f6 Binary files a/app/images/icon-38.png and b/app/images/icon-38.png differ diff --git a/app/images/icon-512.png b/app/images/icon-512.png old mode 100644 new mode 100755 index 9c0d1384d..c413af929 Binary files a/app/images/icon-512.png and b/app/images/icon-512.png differ diff --git a/app/images/icon-64.png b/app/images/icon-64.png old mode 100644 new mode 100755 index b3019ad65..dd5a61bdb Binary files a/app/images/icon-64.png and b/app/images/icon-64.png differ diff --git a/app/images/info-logo-original.png b/app/images/info-logo-original.png new file mode 100644 index 000000000..f654ed5b1 Binary files /dev/null and b/app/images/info-logo-original.png differ diff --git a/app/images/info-logo.png b/app/images/info-logo.png index f654ed5b1..607eec872 100644 Binary files a/app/images/info-logo.png and b/app/images/info-logo.png differ diff --git a/app/images/logo/metamask-fox-original.svg b/app/images/logo/metamask-fox-original.svg new file mode 100644 index 000000000..60a827b02 --- /dev/null +++ b/app/images/logo/metamask-fox-original.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/logo/metamask-fox.svg b/app/images/logo/metamask-fox.svg index 60a827b02..cd81c8a6f 100644 --- a/app/images/logo/metamask-fox.svg +++ b/app/images/logo/metamask-fox.svg @@ -1,31 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/app/images/logo/metamask-logo-horizontal-original.svg b/app/images/logo/metamask-logo-horizontal-original.svg new file mode 100644 index 000000000..8e0bdb938 --- /dev/null +++ b/app/images/logo/metamask-logo-horizontal-original.svg @@ -0,0 +1,62 @@ + + + + metamask-logo-horizontal-beta + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/images/logo/metamask-logo-horizontal.svg b/app/images/logo/metamask-logo-horizontal.svg index 8e0bdb938..17b172e41 100644 --- a/app/images/logo/metamask-logo-horizontal.svg +++ b/app/images/logo/metamask-logo-horizontal.svg @@ -1,62 +1,22 @@ - - - - metamask-logo-horizontal-beta - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + 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 (
- */} +
{ 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 (
-
- + {/* */} +

-- cgit v1.2.3