1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00

Merge pull request #250 from MetaMask/uiFixes

Ui fixes
This commit is contained in:
Dan Finlay 2016-06-06 10:56:19 -07:00
commit 412c2e0246
4 changed files with 32 additions and 5 deletions

View File

@ -99,8 +99,9 @@ AccountDetailScreen.prototype.render = function() {
},
}, [
// What is shown when not editing:
h('h2.font-medium.color-forest', identity && identity.name)
// What is shown when not editing + edit text:
h('label.editing-label',[h('.edit-text','edit')]),
h('h2.font-medium.color-forest', {title: 'edit'}, identity && identity.name)
]),
]),

View File

@ -102,7 +102,7 @@ AccountsScreen.prototype.render = function() {
alignItems: 'center',
}
}, [
h('i.fa.fa-chevron-down.fa-lg', {key: ''}),
h('i.fa.fa-plus.fa-lg', {key: ''}),
]),
]),

View File

@ -18,13 +18,13 @@ EditableLabel.prototype.render = function() {
if (state && state.isEditingLabel) {
return h('div.editable-label', [
h('input', {
h('input.editable-input', {
defaultValue: props.textValue,
onKeyPress:(event) => {
this.saveIfEnter(event)
},
}),
h('button', {
h('button.editable-button', {
onClick:() => this.saveText(),
}, 'Save')
])

View File

@ -223,6 +223,15 @@ app sections
padding: 8px;*/
}
.editable-input{
font-size: 1em;
height: 31px;
}
.editable-button{
position: relative;
bottom: 2px;
}
/* Webkit */
.unlock-screen input::-webkit-input-placeholder {
text-align: center;
@ -357,6 +366,23 @@ input.large-input {
}
.edit-text {
height: 15px;
visibility: hidden;
}
.editing-label {
cursor: text;
width: 60px;
height: 20px;
position: absolute;
text-align: right;
font-size: small;
padding-top: 15px;
color: #F7861C;
}
.editing-label:hover div{
visibility: visible;
}
/* tx confirm */
.unconftx-section {