From d90943dc611d6de63cb243a431f9a8c700151485 Mon Sep 17 00:00:00 2001 From: Frankie Date: Fri, 3 Jun 2016 13:31:36 -0400 Subject: [PATCH 1/4] Change chevron-down to fa-plus --- ui/app/accounts/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js index 9cfab54e5..8215a559a 100644 --- a/ui/app/accounts/index.js +++ b/ui/app/accounts/index.js @@ -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: ''}), ]), ]), From 40338571fafbc956f46a7f1c7c8d6a6d7fdd3425 Mon Sep 17 00:00:00 2001 From: Frankie Date: Mon, 6 Jun 2016 03:14:10 -0400 Subject: [PATCH 2/4] Add edit label --- ui/app/account-detail.js | 3 ++- ui/app/css/index.css | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 2f412c5be..d4ed88013 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -100,7 +100,8 @@ AccountDetailScreen.prototype.render = function() { }, [ // What is shown when not editing: - 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) ]), ]), diff --git a/ui/app/css/index.css b/ui/app/css/index.css index f56e9fbc4..484b89f56 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -352,7 +352,28 @@ input.large-input { .account-detail-section { } +.editing-label{ + /* visibility: hidden; + border-color: #F7861C; + border-style: solid; + border-width: 1px;*/ +} +.edit-text { + visibility: hidden; +} +.editing-label { + width: 60px; + height: 40px; + position: absolute; + text-align: right; + font-size: small; + padding-top: 15px; + color: #F7861C; +} +.editing-label:hover div{ + visibility: visible; +} /* tx confirm */ .unconftx-section { From 217dd9c95e2c398c07d5e88ef35bea0aad1e3a37 Mon Sep 17 00:00:00 2001 From: Frankie Date: Mon, 6 Jun 2016 03:30:26 -0400 Subject: [PATCH 3/4] Fix label size for edit label --- ui/app/css/index.css | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ui/app/css/index.css b/ui/app/css/index.css index 484b89f56..3d22a1c33 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -352,19 +352,15 @@ input.large-input { .account-detail-section { } -.editing-label{ - /* visibility: hidden; - border-color: #F7861C; - border-style: solid; - border-width: 1px;*/ -} .edit-text { + height: 15px; visibility: hidden; } .editing-label { + cursor: text; width: 60px; - height: 40px; + height: 20px; position: absolute; text-align: right; font-size: small; From f59ca7a6bf42b0cae70aab838a08a7d15e192d10 Mon Sep 17 00:00:00 2001 From: Frankie Date: Mon, 6 Jun 2016 10:09:21 -0400 Subject: [PATCH 4/4] Add css to resize and alighn input for editable lable --- ui/app/account-detail.js | 2 +- ui/app/components/editable-label.js | 4 ++-- ui/app/css/index.css | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index d4ed88013..7a0d5b23b 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -99,7 +99,7 @@ AccountDetailScreen.prototype.render = function() { }, }, [ - // What is shown when not editing: + // 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) ]), diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js index 20e24a9c7..c35f3261c 100644 --- a/ui/app/components/editable-label.js +++ b/ui/app/components/editable-label.js @@ -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') ]) diff --git a/ui/app/css/index.css b/ui/app/css/index.css index 3d22a1c33..fb2a1f552 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -219,6 +219,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;