aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-06-22 08:00:03 +0800
committerGitHub <noreply@github.com>2016-06-22 08:00:03 +0800
commit03550b7e9a8462947a681d57d1ab15a0f596366d (patch)
tree4eec5aa90162e57b02563256b718570744f27a7c
parentdc2ef967028723afe9fe1efd669754723e38a4f0 (diff)
parentea564e51fcbd67223d13eb7d03136164fb3bdc9f (diff)
downloadtangerine-wallet-browser-03550b7e9a8462947a681d57d1ab15a0f596366d.tar.gz
tangerine-wallet-browser-03550b7e9a8462947a681d57d1ab15a0f596366d.tar.zst
tangerine-wallet-browser-03550b7e9a8462947a681d57d1ab15a0f596366d.zip
Merge pull request #304 from MetaMask/buttons
use key as export and unify the copy to clipboard icon.
-rw-r--r--CHANGELOG.md3
-rw-r--r--app/images/key-32.pngbin0 -> 1110 bytes
-rw-r--r--ui/app/account-detail.js7
-rw-r--r--ui/app/accounts/account-panel.js3
-rw-r--r--ui/app/css/index.css3
5 files changed, 13 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15f5446fd..a890737c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
## Current Master
+- Change out export icon for key.
+- Unify copy to clipboard icon
+
## 2.4.0 2016-06-20
- Clean up UI.
diff --git a/app/images/key-32.png b/app/images/key-32.png
new file mode 100644
index 000000000..ca11cacd9
--- /dev/null
+++ b/app/images/key-32.png
Binary files differ
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 93702f77d..f0d359106 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -128,10 +128,15 @@ AccountDetailScreen.prototype.render = function () {
}),
h('img.cursor-pointer.color-orange', {
- src: 'images/download.svg',
+ src: 'images/key-32.png',
onClick: () => this.requestAccountExport(selected),
style: {
margin: '0px 5px',
+ width: '20px',
+ height: '20px',
+ position: 'relative',
+ top: '3px',
+ right: '4px',
},
}),
diff --git a/ui/app/accounts/account-panel.js b/ui/app/accounts/account-panel.js
index 53ccf7d2c..af3d0d347 100644
--- a/ui/app/accounts/account-panel.js
+++ b/ui/app/accounts/account-panel.js
@@ -60,7 +60,8 @@ NewComponent.prototype.render = function () {
margin: '0 20px',
},
}, [
- h('i.fa.fa-clipboard.fa-md.cursor-pointer.color-orange', {
+ h('img.cursor-pointer.color-orange', {
+ src: 'images/copy.svg',
onClick: (event) => {
event.stopPropagation()
event.preventDefault()
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 7055b0d5c..65ff1705f 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -36,7 +36,8 @@ button {
font-family: 'Transat Black';
outline: none;
cursor: pointer;
- /*margin: 10px;*/
+ box-shadow: 0px 3px 6px rgba(247, 134, 28, 0.36);
+ /*margin: 10px;*/
padding: 8px 12px;
border: none;
background: #F7861C;