mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #259 from MetaMask/uiFixes
Do a little UI house cleaning
This commit is contained in:
commit
bba1ef1a71
@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
## Current Master
|
## Current Master
|
||||||
|
|
||||||
|
- Clean up UI
|
||||||
|
- Remove nonfunctional QR code button
|
||||||
|
|
||||||
## 2.3.1 2016-06-09
|
## 2.3.1 2016-06-09
|
||||||
|
|
||||||
- Style up the info page
|
- Style up the info page
|
||||||
|
@ -101,7 +101,7 @@ AccountDetailScreen.prototype.render = function() {
|
|||||||
|
|
||||||
// What is shown when not editing + edit text:
|
// What is shown when not editing + edit text:
|
||||||
h('label.editing-label',[h('.edit-text','edit')]),
|
h('label.editing-label',[h('.edit-text','edit')]),
|
||||||
h('h2.font-medium.color-forest', {title: 'edit'}, identity && identity.name)
|
h('h2.font-medium.color-forest', {name: 'edit'}, identity && identity.name),
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
@ -118,16 +118,19 @@ AccountDetailScreen.prototype.render = function() {
|
|||||||
},
|
},
|
||||||
}, addressSummary(selected)),
|
}, addressSummary(selected)),
|
||||||
|
|
||||||
|
h('i.fa.fa-clipboard.fa-md.cursor-pointer.color-orange', {
|
||||||
|
onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)),
|
||||||
|
style:{
|
||||||
|
marginLeft: '64px',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
|
||||||
h('i.fa.fa-download.fa-md.cursor-pointer.color-orange', {
|
h('i.fa.fa-download.fa-md.cursor-pointer.color-orange', {
|
||||||
onClick: () => this.requestAccountExport(selected),
|
onClick: () => this.requestAccountExport(selected),
|
||||||
}),
|
style:{
|
||||||
|
position: 'relative',
|
||||||
h('i.fa.fa-qrcode.fa-md.cursor-disabled.color-orange', {
|
right: '32px',
|
||||||
onClick: () => console.warn('QRCode not implented...'),
|
},
|
||||||
}),
|
|
||||||
|
|
||||||
h('i.fa.fa-clipboard.fa-md.cursor-pointer.color-orange', {
|
|
||||||
onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)),
|
|
||||||
}),
|
}),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
|
@ -42,8 +42,12 @@ ExportAccountView.prototype.render = function() {
|
|||||||
}, [
|
}, [
|
||||||
h('p.error', warning),
|
h('p.error', warning),
|
||||||
h('p', confirmation),
|
h('p', confirmation),
|
||||||
h('input#exportAccount', {
|
h('input#exportAccount.sizing-input', {
|
||||||
onKeyPress: this.onExportKeyPress.bind(this),
|
onKeyPress: this.onExportKeyPress.bind(this),
|
||||||
|
style: {
|
||||||
|
position: 'relative',
|
||||||
|
top: '1.5px',
|
||||||
|
}
|
||||||
}),
|
}),
|
||||||
h('button', {
|
h('button', {
|
||||||
onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }),
|
onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }),
|
||||||
|
@ -18,7 +18,7 @@ EditableLabel.prototype.render = function() {
|
|||||||
if (state && state.isEditingLabel) {
|
if (state && state.isEditingLabel) {
|
||||||
|
|
||||||
return h('div.editable-label', [
|
return h('div.editable-label', [
|
||||||
h('input.editable-input', {
|
h('input.sizing-input', {
|
||||||
defaultValue: props.textValue,
|
defaultValue: props.textValue,
|
||||||
onKeyPress:(event) => {
|
onKeyPress:(event) => {
|
||||||
this.saveIfEnter(event)
|
this.saveIfEnter(event)
|
||||||
@ -30,7 +30,7 @@ EditableLabel.prototype.render = function() {
|
|||||||
])
|
])
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
return h('div', {
|
return h('div.name-label', {
|
||||||
onClick:(event) => {
|
onClick:(event) => {
|
||||||
this.setState({ isEditingLabel: true })
|
this.setState({ isEditingLabel: true })
|
||||||
},
|
},
|
||||||
|
@ -223,7 +223,7 @@ app sections
|
|||||||
padding: 8px;*/
|
padding: 8px;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
.editable-input{
|
.sizing-input{
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
height: 31px;
|
height: 31px;
|
||||||
}
|
}
|
||||||
@ -365,22 +365,23 @@ input.large-input {
|
|||||||
.account-detail-section {
|
.account-detail-section {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
.name-label{
|
||||||
|
margin-bottom: 14px;
|
||||||
|
}
|
||||||
.edit-text {
|
.edit-text {
|
||||||
height: 15px;
|
height: 100%;
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
}
|
}
|
||||||
.editing-label {
|
.editing-label {
|
||||||
cursor: text;
|
cursor: text;
|
||||||
width: 60px;
|
width: 100%;
|
||||||
height: 20px;
|
position: relative;
|
||||||
position: absolute;
|
top: 7px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
padding-top: 15px;
|
|
||||||
color: #F7861C;
|
color: #F7861C;
|
||||||
}
|
}
|
||||||
.editing-label:hover div{
|
.name-label:hover .edit-text {
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
}
|
}
|
||||||
/* tx confirm */
|
/* tx confirm */
|
||||||
|
Loading…
Reference in New Issue
Block a user