diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-09-09 02:20:55 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-09-09 02:22:04 +0800 |
commit | 20ae4c2689ed82016a71e74b36565eaed78f3f4c (patch) | |
tree | 2da4463b327ba33bc3180ee52ab6f0507069efb6 | |
parent | 452ce14fda683a92c6c34518ccec53cfc6fd863d (diff) | |
download | tangerine-wallet-browser-20ae4c2689ed82016a71e74b36565eaed78f3f4c.tar tangerine-wallet-browser-20ae4c2689ed82016a71e74b36565eaed78f3f4c.tar.gz tangerine-wallet-browser-20ae4c2689ed82016a71e74b36565eaed78f3f4c.tar.bz2 tangerine-wallet-browser-20ae4c2689ed82016a71e74b36565eaed78f3f4c.tar.lz tangerine-wallet-browser-20ae4c2689ed82016a71e74b36565eaed78f3f4c.tar.xz tangerine-wallet-browser-20ae4c2689ed82016a71e74b36565eaed78f3f4c.tar.zst tangerine-wallet-browser-20ae4c2689ed82016a71e74b36565eaed78f3f4c.zip |
Fix logo usage for metamask-logo v2.0.0
- No longer need to check for webGL compliance (svg rendered!)
- logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element.
Otherwise, worked with very little effort!!
Fixes #624
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | ui/app/components/mascot.js | 17 |
2 files changed, 4 insertions, 15 deletions
diff --git a/package.json b/package.json index 63754f417..8a6665ee1 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "inject-css": "^0.1.1", "jazzicon": "^1.1.3", "menu-droppo": "^1.1.0", - "metamask-logo": "^1.3.1", + "metamask-logo": "^2.0.0", "mississippi": "^1.2.0", "multiplex": "^6.7.0", "once": "^1.3.3", diff --git a/ui/app/components/mascot.js b/ui/app/components/mascot.js index f2b00262b..d0d599ea0 100644 --- a/ui/app/components/mascot.js +++ b/ui/app/components/mascot.js @@ -14,7 +14,6 @@ function Mascot () { pxNotRatio: true, width: 200, height: 200, - staticImage: './images/icon-512.png', }) if (!this.logo.webGLSupport) return this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000) @@ -27,28 +26,18 @@ Mascot.prototype.render = function () { // and we dont get that until render this.handleAnimationEvents() - return ( - - h('#metamask-mascot-container') - - ) + return h('#metamask-mascot-container') } Mascot.prototype.componentDidMount = function () { var targetDivId = 'metamask-mascot-container' var container = document.getElementById(targetDivId) - if (!this.logo.webGLSupport) { - var staticLogo = this.logo.staticLogo - staticLogo.style.marginBottom = '40px' - container.appendChild(staticLogo) - } else { - container.appendChild(this.logo.canvas) - } + container.appendChild(this.logo.container) } Mascot.prototype.componentWillUnmount = function () { if (!this.logo.webGLSupport) return - this.logo.canvas.remove() + this.logo.container.remove() } Mascot.prototype.handleAnimationEvents = function () { |