aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-06-29 04:11:50 +0800
committerkumavis <aaron@kumavis.me>2016-06-29 04:11:50 +0800
commit57aca116ed33476ce87d9c5f9248013e0b3c5fcc (patch)
tree2ddf55ec9579b579640509686d60468a84da64ff /app/scripts/lib
parent494b62dcf8262e2c9f18e0b59b23129d5b625210 (diff)
parent2fd03a60fb8c536dbe56c86e1836935616ea14d8 (diff)
downloadtangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar
tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.gz
tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.bz2
tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.lz
tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.xz
tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.tar.zst
tangerine-wallet-browser-57aca116ed33476ce87d9c5f9248013e0b3c5fcc.zip
Merge branch 'master' into FixSomeFormatting
# Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
Diffstat (limited to 'app/scripts/lib')
-rw-r--r--app/scripts/lib/notifications.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 2a058db75..a7c21855d 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -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>
@@ -188,4 +193,4 @@ function svgWrapper(content){
function toSvgUri(content){
return 'data:image/svg+xml;utf8,' + encodeURIComponent(content)
-} \ No newline at end of file
+}