From 5d349083f0a2610aecd0ef3c0cd134efa62798d7 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Tue, 21 Jun 2016 13:10:28 -0700
Subject: Change export icon to key

---
 ui/app/account-detail.js | 9 +++++++--
 ui/app/css/index.css     | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 663ba234b..c248d9105 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -130,10 +130,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',
+              margin: "0px 5px",
+              width: "20px",
+              height: "20px",
+              position: "relative",
+              top: "3px",
+              right: "4px",
             },
           }),
 
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;
-- 
cgit v1.2.3


From 265725c6edd62a7f46a9b9cf5a443cf01f0ff00c Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Tue, 21 Jun 2016 13:40:02 -0700
Subject: Change the copy to cliboard icon

---
 ui/app/accounts/account-panel.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/app/accounts/account-panel.js b/ui/app/accounts/account-panel.js
index b49f4c098..ddccfa529 100644
--- a/ui/app/accounts/account-panel.js
+++ b/ui/app/accounts/account-panel.js
@@ -63,12 +63,16 @@ 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()
             copyToClipboard(ethUtil.toChecksumAddress(identity.address))
-          }
+          },
+          style:{
+            margin: '0px 5px',
+          },
         }),
       ]),
     ])
-- 
cgit v1.2.3


From ea564e51fcbd67223d13eb7d03136164fb3bdc9f Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Tue, 21 Jun 2016 15:19:10 -0700
Subject: Fix for lint err

---
 ui/app/account-detail.js         | 14 +++++++-------
 ui/app/accounts/account-panel.js |  6 ------
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'ui')

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index dfafb60cb..f0d359106 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -130,13 +130,13 @@ AccountDetailScreen.prototype.render = function () {
           h('img.cursor-pointer.color-orange', {
             src: 'images/key-32.png',
             onClick: () => this.requestAccountExport(selected),
-            style:{
-              margin: "0px 5px",
-              width: "20px",
-              height: "20px",
-              position: "relative",
-              top: "3px",
-              right: "4px",
+            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 1c9e84414..af3d0d347 100644
--- a/ui/app/accounts/account-panel.js
+++ b/ui/app/accounts/account-panel.js
@@ -67,12 +67,6 @@ NewComponent.prototype.render = function () {
             event.preventDefault()
             copyToClipboard(ethUtil.toChecksumAddress(identity.address))
           },
-<<<<<<< HEAD
-          style:{
-            margin: '0px 5px',
-          },
-=======
->>>>>>> master
         }),
       ]),
     ])
-- 
cgit v1.2.3