diff options
| author | Dan Finlay <dan@danfinlay.com> | 2018-03-07 06:57:01 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2018-03-07 06:57:01 +0800 |
| commit | cb4ad608003b17098a71e6919a3d22b2ff0a6dbf (patch) | |
| tree | fd46ab07abd61370f5e566612dc38f7ae373d9e8 /ui | |
| parent | b87687110da62adbe28e92743898e79ba28945b2 (diff) | |
| parent | 303801d2768a264a27a51916e5debf778739ee0c (diff) | |
| download | tangerine-wallet-browser-cb4ad608003b17098a71e6919a3d22b2ff0a6dbf.tar tangerine-wallet-browser-cb4ad608003b17098a71e6919a3d22b2ff0a6dbf.tar.gz tangerine-wallet-browser-cb4ad608003b17098a71e6919a3d22b2ff0a6dbf.tar.bz2 tangerine-wallet-browser-cb4ad608003b17098a71e6919a3d22b2ff0a6dbf.tar.lz tangerine-wallet-browser-cb4ad608003b17098a71e6919a3d22b2ff0a6dbf.tar.xz tangerine-wallet-browser-cb4ad608003b17098a71e6919a3d22b2ff0a6dbf.tar.zst tangerine-wallet-browser-cb4ad608003b17098a71e6919a3d22b2ff0a6dbf.zip | |
Merge branch 'master' into i2475-UnifyLogInWording
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/add-token.js | 2 | ||||
| -rw-r--r-- | ui/app/app.js | 8 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/header.scss | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/ui/app/add-token.js b/ui/app/add-token.js index a1729ba8e..51c577987 100644 --- a/ui/app/add-token.js +++ b/ui/app/add-token.js @@ -52,7 +52,7 @@ function AddTokenScreen () { isShowingConfirmation: false, customAddress: '', customSymbol: '', - customDecimals: null, + customDecimals: '', searchQuery: '', isCollapsed: true, selectedTokens: {}, diff --git a/ui/app/app.js b/ui/app/app.js index d243e72a4..4e6da24c3 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -288,10 +288,10 @@ App.prototype.renderAppBar = function () { }), // metamask name - h('h1', 'MetaMask'), - - h('div.beta-label', 'BETA'), - + h('.flex-row', [ + h('h1', 'MetaMask'), + h('div.beta-label', 'BETA'), + ]), ]), h('div.header__right-actions', [ diff --git a/ui/app/css/itcss/components/header.scss b/ui/app/css/itcss/components/header.scss index d91ab3c48..eeed9ee06 100644 --- a/ui/app/css/itcss/components/header.scss +++ b/ui/app/css/itcss/components/header.scss @@ -80,11 +80,10 @@ font-family: Roboto; text-transform: uppercase; font-weight: 500; - font-size: 0.8rem; - padding-left: 9px; + font-size: .8rem; color: $buttercup; - align-self: flex-start; - margin-top: 10px; + margin-left: 5px; + line-height: initial; @media screen and (max-width: 575px) { display: none; |