aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2018-01-19 04:39:09 +0800
committerGitHub <noreply@github.com>2018-01-19 04:39:09 +0800
commit5fff2e19d8ff6fa50da5696b3c42f5cf1f359744 (patch)
treea13d409a801ca178f8f9863484f860cd92153d2e
parent4fae461a672b89a16c496d09321f11f86b873e32 (diff)
parent853e7f84204226b9cc35fe8bca5cb6ebe7ff03b0 (diff)
downloadtangerine-wallet-browser-5fff2e19d8ff6fa50da5696b3c42f5cf1f359744.tar
tangerine-wallet-browser-5fff2e19d8ff6fa50da5696b3c42f5cf1f359744.tar.gz
tangerine-wallet-browser-5fff2e19d8ff6fa50da5696b3c42f5cf1f359744.tar.bz2
tangerine-wallet-browser-5fff2e19d8ff6fa50da5696b3c42f5cf1f359744.tar.lz
tangerine-wallet-browser-5fff2e19d8ff6fa50da5696b3c42f5cf1f359744.tar.xz
tangerine-wallet-browser-5fff2e19d8ff6fa50da5696b3c42f5cf1f359744.tar.zst
tangerine-wallet-browser-5fff2e19d8ff6fa50da5696b3c42f5cf1f359744.zip
Merge pull request #3024 from alextsg/cb-529
[NewUI] Update popout to fullscreen icon
-rw-r--r--app/images/popout.svg21
-rw-r--r--ui/app/add-token.js2
-rw-r--r--ui/app/components/tx-view.js4
-rw-r--r--ui/app/css/itcss/components/newui-sections.scss2
4 files changed, 26 insertions, 3 deletions
diff --git a/app/images/popout.svg b/app/images/popout.svg
new file mode 100644
index 000000000..760fe4379
--- /dev/null
+++ b/app/images/popout.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
+ <title>popout</title>
+ <desc>Created with Sketch.</desc>
+ <defs>
+ <polygon id="path-1" points="-0.00035 0 10.9999 0 10.9999 10.9997 -0.00035 10.9997"></polygon>
+ </defs>
+ <g id="MetaMascara-Mobile---structured-TOKEN" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-327.000000, -96.000000)">
+ <g id="popout" transform="translate(327.000000, 96.000000)">
+ <g id="Group-3" transform="translate(11.000000, 0.000000)">
+ <mask id="mask-2" fill="white">
+ <use xlink:href="#path-1"></use>
+ </mask>
+ <g id="Clip-2"></g>
+ <path d="M10.9229,0.6177 C10.8209,0.3737 10.6269,0.1787 10.3819,0.0767 C10.2599,0.0267 10.1309,-0.0003 9.9999,-0.0003 L3.9999,-0.0003 C3.4479,-0.0003 2.9999,0.4477 2.9999,0.9997 C2.9999,1.5527 3.4479,1.9997 3.9999,1.9997 L7.5859,1.9997 L0.2929,9.2927 C-0.0981,9.6837 -0.0981,10.3167 0.2929,10.7067 C0.4879,10.9027 0.7439,10.9997 0.9999,10.9997 C1.2559,10.9997 1.5119,10.9027 1.7069,10.7067 L8.9999,3.4137 L8.9999,6.9997 C8.9999,7.5527 9.4479,7.9997 9.9999,7.9997 C10.5519,7.9997 10.9999,7.5527 10.9999,6.9997 L10.9999,0.9997 C10.9999,0.8697 10.9739,0.7407 10.9229,0.6177" id="Fill-1" fill="#4A4A4A" mask="url(#mask-2)"></path>
+ </g>
+ <path d="M19,10 C18.448,10 18,10.448 18,11 L18,19 C18,19.551 17.551,20 17,20 L3,20 C2.449,20 2,19.551 2,19 L2,5 C2,4.449 2.449,4 3,4 L11,4 C11.552,4 12,3.552 12,3 C12,2.448 11.552,2 11,2 L3,2 C1.346,2 0,3.346 0,5 L0,19 C0,20.654 1.346,22 3,22 L17,22 C18.654,22 20,20.654 20,19 L20,11 C20,10.448 19.552,10 19,10" id="Fill-4" fill="#4A4A4A"></path>
+ </g>
+ </g>
+</svg> \ No newline at end of file
diff --git a/ui/app/add-token.js b/ui/app/add-token.js
index e3fe93362..3a806d34b 100644
--- a/ui/app/add-token.js
+++ b/ui/app/add-token.js
@@ -3,7 +3,7 @@ const Component = require('react').Component
const classnames = require('classnames')
const h = require('react-hyperscript')
const connect = require('react-redux').connect
-const R = require('ramda');
+const R = require('ramda')
const Fuse = require('fuse.js')
const contractMap = require('eth-contract-metadata')
const TokenBalance = require('./components/token-balance')
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js
index 0148b32a5..b25d8e0f9 100644
--- a/ui/app/components/tx-view.js
+++ b/ui/app/components/tx-view.js
@@ -100,7 +100,7 @@ TxView.prototype.render = function () {
h('div.flex-row.phone-visible', {
style: {
- margin: '1em 0.9em',
+ margin: '1.5em 1.2em 0',
justifyContent: 'space-between',
alignItems: 'center',
},
@@ -136,7 +136,7 @@ TxView.prototype.render = function () {
!isMascara && h('div.open-in-browser', {
onClick: () => global.platform.openExtensionInBrowser(),
- }, [h('img', { src: 'images/open.svg' })]),
+ }, [h('img', { src: 'images/popout.svg' })]),
]),
diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss
index c9a06a2cc..1c26882b5 100644
--- a/ui/app/css/itcss/components/newui-sections.scss
+++ b/ui/app/css/itcss/components/newui-sections.scss
@@ -40,6 +40,8 @@ $wallet-view-bg: $alabaster;
.open-in-browser {
cursor: pointer;
+ display: flex;
+ justify-content: center;
}
// wallet view and sidebar