From 7d8bf31e826e168d8995ca9e71714969b9498d3b Mon Sep 17 00:00:00 2001 From: Frankie Date: Thu, 9 Jun 2016 23:58:33 -0400 Subject: [PATCH 1/6] Fix edit text and edit label alighment --- ui/app/account-detail.js | 2 +- ui/app/components/editable-label.js | 2 +- ui/app/css/index.css | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 7a0d5b23b..549fcca33 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -101,7 +101,7 @@ AccountDetailScreen.prototype.render = function() { // 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) + h('h2.font-medium.color-forest', {name: 'edit'}, identity && identity.name), ]), ]), diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js index c35f3261c..cdd0c4c10 100644 --- a/ui/app/components/editable-label.js +++ b/ui/app/components/editable-label.js @@ -30,7 +30,7 @@ EditableLabel.prototype.render = function() { ]) } else { - return h('div', { + return h('div.name-label', { onClick:(event) => { this.setState({ isEditingLabel: true }) }, diff --git a/ui/app/css/index.css b/ui/app/css/index.css index c33753888..ffe496458 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -367,20 +367,19 @@ input.large-input { } .edit-text { - height: 15px; + height: 100%; visibility: hidden; } .editing-label { cursor: text; - width: 60px; - height: 20px; - position: absolute; + width: 100%; + position: relative; + top: 7px; text-align: right; font-size: small; - padding-top: 15px; color: #F7861C; } -.editing-label:hover div{ +.name-label:hover .edit-text { visibility: visible; } /* tx confirm */ From 88ed93afd91a6a15f1c9df52347c8e5e3ebda841 Mon Sep 17 00:00:00 2001 From: Frankie Date: Fri, 10 Jun 2016 12:54:57 -0400 Subject: [PATCH 2/6] Remove qr code icon and reorder to have clipboard first --- ui/app/account-detail.js | 19 +++++++++++-------- ui/app/css/index.css | 5 ++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 549fcca33..5d74e571b 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -118,16 +118,19 @@ AccountDetailScreen.prototype.render = function() { }, }, addressSummary(selected)), - h('i.fa.fa-download.fa-md.cursor-pointer.color-orange', { - onClick: () => this.requestAccountExport(selected), - }), - - h('i.fa.fa-qrcode.fa-md.cursor-disabled.color-orange', { - onClick: () => console.warn('QRCode not implented...'), + h('i.fa.fa-clipboard.fa-md.cursor-pointer.color-orange', { + onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)), + style:{ + marginLeft: '64px', + }, }), - h('i.fa.fa-clipboard.fa-md.cursor-pointer.color-orange', { - onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)), + h('i.fa.fa-download.fa-md.cursor-pointer.color-orange', { + onClick: () => this.requestAccountExport(selected), + style:{ + position: 'relative', + right: '32px', + }, }), ]), diff --git a/ui/app/css/index.css b/ui/app/css/index.css index ffe496458..2e0775724 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -365,7 +365,10 @@ input.large-input { .account-detail-section { } - +.name-label{ + position: relative; + bottom: 14px; +} .edit-text { height: 100%; visibility: hidden; From ff2f5cd58a297e26550cfdc05e2f9231b2ee4e96 Mon Sep 17 00:00:00 2001 From: Frankie Date: Fri, 10 Jun 2016 13:52:38 -0400 Subject: [PATCH 3/6] Change name-label css bug --- ui/app/css/index.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/app/css/index.css b/ui/app/css/index.css index 2e0775724..1e59928d0 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -366,8 +366,7 @@ input.large-input { } .name-label{ - position: relative; - bottom: 14px; + margin-bottom: 14px; } .edit-text { height: 100%; From e9208be096e8193331b06e1738fd1d3e8afab025 Mon Sep 17 00:00:00 2001 From: Frankie Date: Sun, 12 Jun 2016 13:22:03 -0400 Subject: [PATCH 4/6] Size export confirmation input --- ui/app/components/account-export.js | 6 +++++- ui/app/components/editable-label.js | 2 +- ui/app/css/index.css | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/app/components/account-export.js b/ui/app/components/account-export.js index eab9baf65..e31951a7d 100644 --- a/ui/app/components/account-export.js +++ b/ui/app/components/account-export.js @@ -42,8 +42,12 @@ ExportAccountView.prototype.render = function() { }, [ h('p.error', warning), h('p', confirmation), - h('input#exportAccount', { + h('input#exportAccount.sizing-input', { onKeyPress: this.onExportKeyPress.bind(this), + style: { + position: 'relative', + top: '1.5px', + } }), h('button', { onClick: () => this.onExportKeyPress({ key: 'Enter', preventDefault: () => {} }), diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js index cdd0c4c10..41c129d4e 100644 --- a/ui/app/components/editable-label.js +++ b/ui/app/components/editable-label.js @@ -18,7 +18,7 @@ EditableLabel.prototype.render = function() { if (state && state.isEditingLabel) { return h('div.editable-label', [ - h('input.editable-input', { + h('input.sizing-input', { defaultValue: props.textValue, onKeyPress:(event) => { this.saveIfEnter(event) diff --git a/ui/app/css/index.css b/ui/app/css/index.css index 1e59928d0..7055b0d5c 100644 --- a/ui/app/css/index.css +++ b/ui/app/css/index.css @@ -223,7 +223,7 @@ app sections padding: 8px;*/ } -.editable-input{ +.sizing-input{ font-size: 1em; height: 31px; } From 5efef313812828e1a97a555a1be40615da660daf Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 9 Jun 2016 15:25:11 -0700 Subject: [PATCH 5/6] Version 2.3.1 --- CHANGELOG.md | 3 +++ app/manifest.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa7149e9d..0d10f208f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,11 @@ ## Current Master +## 2.3.1 2016-06-09 + - Style up the info page - Cache identicon images to optimize for long lists of transactions. +- Fix out of gas errors ## 2.3.0 2016-06-06 diff --git a/app/manifest.json b/app/manifest.json index 8cb797e03..d037fb22f 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "Metamask", - "version": "2.3.0", + "version": "2.3.1", "manifest_version": 2, "description": "__MSG_appDescription__", "icons": { From 0384f0cb0fb35e9bfa88d27614b44d4cb345f5f1 Mon Sep 17 00:00:00 2001 From: Frankie Date: Sun, 12 Jun 2016 13:33:17 -0400 Subject: [PATCH 6/6] Write to CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d10f208f..31b4aff7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Current Master +- Clean up UI +- Remove nonfunctional QR code button + ## 2.3.1 2016-06-09 - Style up the info page