Merge branch 'master' into ConfirmationStyle

2 files changed, 39 insertions, 28 deletions

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index aae1d434f..62b9d80ae 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -56,7 +56,7 @@ AccountDetailScreen.prototype.render = function () {
         // header - identicon + nav
         h('div', {
           style: {
-            marginTop: '15px',
+            marginTop: '20px',
             display: 'flex',
             justifyContent: 'flex-start',
             alignItems: 'flex-start',
@@ -107,7 +107,7 @@ AccountDetailScreen.prototype.render = function () {
                   paddingTop: '3px',
                   width: '5em',
                   fontSize: '13px',
-                  fontFamily: 'Montserrat Thin',
+                  fontFamily: 'Montserrat Light',
                   textRendering: 'geometricPrecision',
                   marginTop: '10px',
                   marginBottom: '15px',
@@ -120,6 +120,8 @@ AccountDetailScreen.prototype.render = function () {
               h('.flex-row', {
                 style: {
                   justifyContent: 'flex-end',
+                  position: 'relative',
+                  bottom: '15px',
                 },
               }, [
                 h(CopyButton, {
@@ -150,31 +152,31 @@ AccountDetailScreen.prototype.render = function () {
 
             // account ballence
 
-            h('.flex-row', {
-              style: {
-                justifyContent: 'space-between',
-                alignItems: 'flex-start',
-              },
-            }, [
-
-              h(EtherBalance, {
-                value: account && account.balance,
-                style: {
-                  lineHeight: '7px',
-                },
-              }),
+          ]),
+        ]),
+        h('.flex-row', {
+          style: {
+            justifyContent: 'space-between',
+            alignItems: 'flex-start',
+          },
+        }, [
 
-              h('button', {
-                onClick: () => props.dispatch(actions.showSendPage()),
-                style: {
-                  marginBottom: '20px',
-                  marginRight: '8px',
-                },
-              }, 'SEND'),
+          h(EtherBalance, {
+            value: account && account.balance,
+            style: {
+              lineHeight: '7px',
+              marginTop: '10px',
+            },
+          }),
 
-            ]),
+          h('button', {
+            onClick: () => props.dispatch(actions.showSendPage()),
+            style: {
+              marginBottom: '20px',
+              marginRight: '8px',
+            },
+          }, 'SEND'),
 
-          ]),
         ]),
       ]),
 
diff --git a/ui/app/css/fonts.css b/ui/app/css/fonts.css
index da024ce84..3b9f581b9 100644
--- a/ui/app/css/fonts.css
+++ b/ui/app/css/fonts.css
@@ -20,8 +20,17 @@
 }
 
 @font-face {
-  font-family: 'Montserrat Thin';
-    src: url('/fonts/Montserrat/Montserrat-Regular.woff') format('woff');
-    src: url('/fonts/Montserrat/Montserrat-Regular.ttf') format('truetype');
-  text-rendering: geometricPrecision;
+  font-family: 'Montserrat Light';
+    src: url('/fonts/Montserrat/Montserrat-Light.woff') format('woff');
+    src: url('/fonts/Montserrat/Montserrat-Light.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+  font-family: 'Montserrat UltraLight';
+    src: url('/fonts/Montserrat/Montserrat-UltraLight.woff') format('woff');
+    src: url('/fonts/Montserrat/Montserrat-UltraLight.ttf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
 }