1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

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

This commit is contained in:
kumavis 2016-06-27 17:00:12 -07:00
commit 99ca02030a
5 changed files with 7 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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

View File

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