Merge pull request #250 from MetaMask/uiFixes

Ui fixes
feature/default_network_editable
Dan Finlay 9 years ago
commit 412c2e0246
  1. 5
      ui/app/account-detail.js
  2. 2
      ui/app/accounts/index.js
  3. 4
      ui/app/components/editable-label.js
  4. 26
      ui/app/css/index.css

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

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

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

@ -223,6 +223,15 @@ app sections
padding: 8px;*/ padding: 8px;*/
} }
.editable-input{
font-size: 1em;
height: 31px;
}
.editable-button{
position: relative;
bottom: 2px;
}
/* Webkit */ /* Webkit */
.unlock-screen input::-webkit-input-placeholder { .unlock-screen input::-webkit-input-placeholder {
text-align: center; 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 */ /* tx confirm */
.unconftx-section { .unconftx-section {

Loading…
Cancel
Save