Merge branch 'master' of github.com:MetaMask/metamask-plugin

feature/default_network_editable
kumavis 9 years ago
commit 99ca02030a
  1. 2
      ui/app/account-detail.js
  2. 1
      ui/app/accounts/account-list-item.js
  3. 1
      ui/app/app.js
  4. 6
      ui/app/css/index.css
  5. 2
      ui/app/info.js

@ -107,6 +107,7 @@ AccountDetailScreen.prototype.render = function () {
h('img.cursor-pointer.color-orange', { h('img.cursor-pointer.color-orange', {
src: 'images/copy.svg', src: 'images/copy.svg',
title: 'Copy Address',
onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)), onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)),
style: { style: {
margin: '0px 5px', margin: '0px 5px',
@ -115,6 +116,7 @@ AccountDetailScreen.prototype.render = function () {
h('img.cursor-pointer.color-orange', { h('img.cursor-pointer.color-orange', {
src: 'images/key-32.png', src: 'images/key-32.png',
title: 'Export Private Key',
onClick: () => this.requestAccountExport(selected), onClick: () => this.requestAccountExport(selected),
style: { style: {
margin: '0px 5px', margin: '0px 5px',

@ -62,6 +62,7 @@ NewComponent.prototype.render = function () {
}, },
}, [ }, [
h('img.cursor-pointer.color-orange', { h('img.cursor-pointer.color-orange', {
title: 'Copy Address',
src: 'images/copy.svg', src: 'images/copy.svg',
onClick: (event) => { onClick: (event) => {
event.stopPropagation() event.stopPropagation()

@ -157,6 +157,7 @@ App.prototype.renderAppBar = function () {
width: '23.5px', width: '23.5px',
marginRight: '8px', marginRight: '8px',
}, },
title: 'Switch Accounts',
onClick: (event) => { onClick: (event) => {
event.stopPropagation() event.stopPropagation()
this.props.dispatch(actions.showAccountsPage()) this.props.dispatch(actions.showAccountsPage())

@ -228,10 +228,8 @@ app sections
font-size: 1em; font-size: 1em;
height: 31px; height: 31px;
} }
.editable-label{
.editable-button{ display: flex;
position: relative;
bottom: 2px;
} }
/* Webkit */ /* Webkit */
.unlock-screen input::-webkit-input-placeholder { .unlock-screen input::-webkit-input-placeholder {

@ -97,9 +97,9 @@ InfoScreen.prototype.render = function () {
h('div.fa.fa-envelope', [ h('div.fa.fa-envelope', [
h('a.info', { h('a.info', {
href: 'mailto:hello@metamask.io?subject=Feedback',
target: '_blank', target: '_blank',
style: { width: '85vw' }, style: { width: '85vw' },
onClick () { chrome.tabs.create({url: 'mailto:help@metamask.io?subject=Feedback'}) },
}, 'Email us any questions or comments!'), }, 'Email us any questions or comments!'),
]), ]),

Loading…
Cancel
Save