m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #345 from MetaMask/FixSomeFormatting

Browse Source 
Fix some formatting
This commit is contained in:
kumavis 2016-06-28 13:12:15 -07:00 committed by GitHub
commit d4708828aa
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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

9
app/scripts/lib/notifications.js
View File

@ -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>

2
ui/app/account-detail.js
View File

@ -145,7 +145,7 @@ AccountDetailScreen.prototype.render = function () {
style: {
margin: 10,
},
}, 'SEND ETH'),
}, 'SEND'),
]),

2
ui/app/first-time/disclaimer.js
View File

@ -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',