Merge pull request #3007 from alextsg/uat-master-011618

[NewUI] Merge master into uat branch

1 files changed, 19 insertions, 17 deletions

diff --git a/old-ui/app/account-detail.js b/old-ui/app/account-detail.js
index af189cc79..692d50491 100644
--- a/old-ui/app/account-detail.js
+++ b/old-ui/app/account-detail.js
@@ -78,9 +78,10 @@ AccountDetailScreen.prototype.render = function () {
               address: selected,
             }),
           ]),
-          h('div.flex-column', {
+          h('flex-column', {
             style: {
               lineHeight: '10px',
+              marginLeft: '15px',
               width: '100%',
             },
           }, [
@@ -101,7 +102,7 @@ AccountDetailScreen.prototype.render = function () {
                 {
                   style: {
                     display: 'flex',
-                    justifyContent: 'space-between',
+                    justifyContent: 'flex-start',
                     alignItems: 'center',
                   },
                 },
@@ -131,6 +132,8 @@ AccountDetailScreen.prototype.render = function () {
                     AccountDropdowns,
                     {
                       style: {
+                        marginRight: '8px',
+                        marginLeft: 'auto',
                         cursor: 'pointer',
                       },
                       selected,
@@ -144,6 +147,7 @@ AccountDetailScreen.prototype.render = function () {
             ]),
             h('.flex-row', {
               style: {
+                width: '15em',
                 justifyContent: 'space-between',
                 alignItems: 'baseline',
               },
@@ -157,12 +161,11 @@ AccountDetailScreen.prototype.render = function () {
                   textOverflow: 'ellipsis',
                   paddingTop: '3px',
                   width: '5em',
+                  height: '15px',
                   fontSize: '13px',
                   fontFamily: 'Montserrat Light',
                   textRendering: 'geometricPrecision',
-                  marginTop: '15px',
                   marginBottom: '15px',
-                  marginLeft: '15px',
                   color: '#AEAEAE',
                 },
               }, checksumAddress),
@@ -189,21 +192,20 @@ AccountDetailScreen.prototype.render = function () {
             },
           }),
 
-          h('div', {}, [
+          h('.flex-grow'),
 
-            h('button', {
-              onClick: () => props.dispatch(actions.buyEthView(selected)),
-              style: { marginRight: '10px' },
-            }, 'BUY'),
+          h('button', {
+            onClick: () => props.dispatch(actions.buyEthView(selected)),
+            style: { marginRight: '10px' },
+          }, 'BUY'),
 
-            h('button', {
-              onClick: () => props.dispatch(actions.showSendPage()),
-              style: {
-                marginBottom: '20px',
-              },
-            }, 'SEND'),
-
-          ]),
+          h('button', {
+            onClick: () => props.dispatch(actions.showSendPage()),
+            style: {
+              marginBottom: '20px',
+              marginRight: '8px',
+            },
+          }, 'SEND'),
 
         ]),
       ]),