Flex account-data-subsection

3 files changed, 20 insertions, 19 deletions

diff --git a/old-ui/app/account-detail.js b/old-ui/app/account-detail.js
index 933f6d6a4..121f84a0d 100644
--- a/old-ui/app/account-detail.js
+++ b/old-ui/app/account-detail.js
@@ -78,10 +78,9 @@ AccountDetailScreen.prototype.render = function () {
               address: selected,
             }),
           ]),
-          h('flex-column', {
+          h('div.flex-column', {
             style: {
               lineHeight: '10px',
-              marginLeft: '15px',
               width: '100%',
             },
           }, [
@@ -90,6 +89,9 @@ AccountDetailScreen.prototype.render = function () {
               state: {
                 isEditingLabel: false,
               },
+              nameLabelStyle: {
+                marginLeft: '15px',
+              },
               saveText: (text) => {
                 props.dispatch(actions.saveAccountLabel(selected, text))
               },
@@ -102,7 +104,7 @@ AccountDetailScreen.prototype.render = function () {
                 {
                   style: {
                     display: 'flex',
-                    justifyContent: 'flex-start',
+                    justifyContent: 'space-between',
                     alignItems: 'center',
                   },
                 },
@@ -132,8 +134,6 @@ AccountDetailScreen.prototype.render = function () {
                     AccountDropdowns,
                     {
                       style: {
-                        marginRight: '8px',
-                        marginLeft: 'auto',
                         cursor: 'pointer',
                       },
                       selected,
@@ -147,7 +147,6 @@ AccountDetailScreen.prototype.render = function () {
             ]),
             h('.flex-row', {
               style: {
-                width: '15em',
                 justifyContent: 'space-between',
                 alignItems: 'baseline',
               },
@@ -164,6 +163,7 @@ AccountDetailScreen.prototype.render = function () {
                   fontSize: '13px',
                   fontFamily: 'Montserrat Light',
                   textRendering: 'geometricPrecision',
+                  marginTop: '15px',
                   marginBottom: '15px',
                   color: '#AEAEAE',
                 },
@@ -191,20 +191,21 @@ AccountDetailScreen.prototype.render = function () {
             },
           }),
 
-          h('.flex-grow'),
+          h('div', {}, [
 
-          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',
-              marginRight: '8px',
-            },
-          }, 'SEND'),
+            h('button', {
+              onClick: () => props.dispatch(actions.showSendPage()),
+              style: {
+                marginBottom: '20px',
+              },
+            }, 'SEND'),
+
+          ]),
 
         ]),
       ]),
diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js
index c0ebe3c60..a3908f45d 100644
--- a/old-ui/app/components/account-dropdowns.js
+++ b/old-ui/app/components/account-dropdowns.js
@@ -268,7 +268,6 @@ class AccountDropdowns extends Component {
           'i.fa.fa-ellipsis-h',
           {
             style: {
-              marginRight: '0.5em',
               fontSize: '1.8em',
             },
             onClick: (event) => {
diff --git a/old-ui/app/components/editable-label.js b/old-ui/app/components/editable-label.js
index 8a5c8954f..88993d837 100644
--- a/old-ui/app/components/editable-label.js
+++ b/old-ui/app/components/editable-label.js
@@ -29,6 +29,7 @@ EditableLabel.prototype.render = function () {
     ])
   } else {
     return h('div.name-label', {
+      style: props.nameLabelStyle,
       onClick: (event) => {
         const nameAttribute = event.target.getAttribute('name')
         // checks for class to handle smaller CTA above the account name