diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/scripts/lib/notifications.js | 9 | ||||
| -rw-r--r-- | ui/app/account-detail.js | 2 | ||||
| -rw-r--r-- | ui/app/first-time/disclaimer.js | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 25a5fedb3..aa0eda9ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,12 @@ - Fixed bug where MetaMask interfered with PDF loading. - Moved switch account icon into menu bar. - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions. +<<<<<<< HEAD +- Fix formatting on terms & conditions page. +======= - Now enforce 30 character limit on wallet names. +>>>>>>> master ## 2.4.4 2016-06-23 diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index a31949108..a7c21855d 100644 --- a/app/scripts/lib/notifications.js +++ b/app/scripts/lib/notifications.js @@ -154,8 +154,8 @@ function renderNotificationSVG(content, cb){ var container = document.createElement('div') var confirmView = h('div.app-primary', { style: { - width: '450px', - height: '300px', + width: '360px', + height: '240px', padding: '16px', // background: '#F7F7F7', background: 'white', @@ -176,8 +176,13 @@ function renderNotificationSVG(content, cb){ } function svgWrapper(content){ +<<<<<<< HEAD + var wrapperSource = ` + <svg xmlns="http://www.w3.org/2000/svg" width="360" height="240"> +======= var wrapperSource = ` <svg xmlns="http://www.w3.org/2000/svg" width="450" height="300"> +>>>>>>> master <foreignObject x="0" y="0" width="100%" height="100%"> <body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body> </foreignObject> diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 695a1a3f9..7daa3a4dd 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -145,7 +145,7 @@ AccountDetailScreen.prototype.render = function () { style: { margin: 10, }, - }, 'SEND ETH'), + }, 'SEND'), ]), diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index bfd6c490d..7f615cfb0 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -38,7 +38,7 @@ DisclaimerScreen.prototype.render = function () { style: { whiteSpace: 'pre-line', background: 'rgb(235, 235, 235)', - height: '336px', + height: '310px', padding: '6px', width: '80%', overflowY: 'scroll', |