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

Merge pull request #258 from MetaMask/uiFixes

fix #213
This commit is contained in:
Dan Finlay 2016-06-08 17:06:08 -07:00
commit 4ebc73d040
3 changed files with 97 additions and 34 deletions

View File

@ -2,6 +2,7 @@
## Current Master ## Current Master
- Style up the info page
- Cache identicon images to optimize for long lists of transactions. - Cache identicon images to optimize for long lists of transactions.
## 2.3.0 2016-06-06 ## 2.3.0 2016-06-06

View File

@ -423,3 +423,23 @@ input.large-input {
.ether-balance-label { .ether-balance-label {
color: #ABA9AA; color: #ABA9AA;
} }
/* Info screen */
.info-gray{
font-family: 'Transat Medium';
text-transform: uppercase;
color: #AEAEAE;
}
.icon-size{
width: 20px;
}
.info{
font-family: 'Transat Standard', Arial;
font-weight: bolder;
padding-bottom: 10px;
display: inline-block;
padding-left: 5px;
}

View File

@ -18,7 +18,7 @@ function InfoScreen() {
InfoScreen.prototype.render = function() { InfoScreen.prototype.render = function() {
var state = this.props var state = this.props
var rpc = state.rpc var rpc = state.rpc
var manifest = chrome.runtime.getManifest();
return ( return (
h('.flex-column.flex-grow', [ h('.flex-column.flex-grow', [
@ -39,50 +39,92 @@ InfoScreen.prototype.render = function() {
padding: '20px', padding: '20px',
} }
}, [ }, [
//current version number
h('div', [ h('.info.info-gray',[
h('a', { h('div','Metamask'),
href: 'http://slack.metamask.io', h('div', {
target: '_blank', style: {
onClick(event) { this.navigateTo(event.target.href) }, marginBottom: '10px',
}, 'Join the conversation on Slack'), }
},`Version: ${manifest.version}`),
]), ]),
h('div', [ h('hr',{
h('a', { style: {
href: 'https://metamask.io/', margin:'20px 0 ',
target: '_blank', width: '7em',
onClick(event) { this.navigateTo(event.target.href) }, }
}, 'Visit our web site'), }),
]),
h('div', [
h('a', {
href: 'https://twitter.com/metamask_io',
target: '_blank',
onClick(event) { this.navigateTo(event.target.href) },
}, 'Follow us on Twitter'),
]),
h('div', [ h('.info',{
h('a', { style: {
href: 'mailto:hello@metamask.io?subject=Feedback', marginBottom: '20px',
target: '_blank', }},
}, 'Email us any questions or comments!'), `For more information on MetaMask
]), you can visit our web site. If you want to
contact us with questions or just
say 'Hi', you can find us on theise platforms:`),
h('div', [ h('div',{
h('a', { style: {
href: 'https://github.com/metamask/talk/issues', paddingLeft: '30px',
target: '_blank', }},
onClick(event) { this.navigateTo(event.target.href) }, [
}, 'Start a thread on Github'), h('div', [
]), h('a', {
href: 'https://metamask.io/',
target: '_blank',
onClick(event) { this.navigateTo(event.target.href) },
},[
h('img.icon-size', {
src: manifest.icons[128]
}),
h('div.info',{
style: {
fontWeight: 800,
}
},'Visit our web site')
])
]),
h('div.fa.fa-slack', [
h('a.info', {
href: 'http://slack.metamask.io',
target: '_blank',
onClick(event) { this.navigateTo(event.target.href) },
}, 'Join the conversation on Slack'),
]),
h('div.fa.fa-twitter', [
h('a.info', {
href: 'https://twitter.com/metamask_io',
target: '_blank',
onClick(event) { this.navigateTo(event.target.href) },
}, 'Follow us on Twitter'),
]),
h('div.fa.fa-envelope', [
h('a.info', {
href: 'mailto:hello@metamask.io?subject=Feedback',
target: '_blank',
}, 'Email us any questions or comments!'),
]),
h('div.fa.fa-github', [
h('a.info', {
href: 'https://github.com/metamask/talk/issues',
target: '_blank',
onClick(event) { this.navigateTo(event.target.href) },
}, 'Start a thread on Github'),
]),
]),
]), ]),
]), ]),
]) ])
) )
} }
InfoScreen.prototype.navigateTo = function(url) { InfoScreen.prototype.navigateTo = function(url) {