diff options
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.js | 7 |
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 +} |