diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-06-29 04:12:15 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-29 04:12:15 +0800 |
commit | d4708828aa780ad3995ef61d6ec8d5130639751b (patch) | |
tree | 2ddf55ec9579b579640509686d60468a84da64ff /app | |
parent | 2fd03a60fb8c536dbe56c86e1836935616ea14d8 (diff) | |
parent | 57aca116ed33476ce87d9c5f9248013e0b3c5fcc (diff) | |
download | tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.gz tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.bz2 tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.lz tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.xz tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.tar.zst tangerine-wallet-browser-d4708828aa780ad3995ef61d6ec8d5130639751b.zip |
Merge pull request #345 from MetaMask/FixSomeFormatting
Fix some formatting
Diffstat (limited to 'app')
-rw-r--r-- | app/scripts/lib/notifications.js | 9 |
1 files changed, 7 insertions, 2 deletions
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> |