arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-28 03:08:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into css-fix

Browse Source
This commit is contained in:
Vladimir Volek 2018-09-17 17:13:38 +02:00
commit b3dac4b5ab
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/Tooltip/index.js
View File

@ -15,7 +15,6 @@ const Wrapper = styled.div`
position: absolute; position: absolute;
z-index: 1070; z-index: 1070;
display: block; display: block;
background: red;
visibility: visible; visibility: visible;
border: 1px solid ${colors.DIVIDER}; border: 1px solid ${colors.DIVIDER};
border-radius: 3px; border-radius: 3px;

3
src/views/Wallet/components/LeftNavigation/components/AccountMenu/index.js
View File

@ -20,7 +20,6 @@ import type { Props } from '../common';
import Row from '../Row'; import Row from '../Row';
import RowCoin from '../RowCoin'; import RowCoin from '../RowCoin';
const Wrapper = styled.div``; const Wrapper = styled.div``;
const Text = styled.span` const Text = styled.span`
@ -115,7 +114,7 @@ const AccountMenu = (props: Props): ?React$Element<string> => {
const selectedCoin = config.coins.find(c => c.network === location.state.network); const selectedCoin = config.coins.find(c => c.network === location.state.network);
if (!selected || !selectedCoin) return; if (!selected || !selectedCoin) return;
const fiatRate = props.fiat.find(f => f.network === selectedCoin.network); const fiatRate = props.fiat.find(f => f.network === selectedCoin.network);
const deviceAccounts: Accounts = findDeviceAccounts(accounts, selected, location.state.network); const deviceAccounts: Accounts = findDeviceAccounts(accounts, selected, location.state.network);

6
src/views/Wallet/components/LeftNavigation/index.js
View File

@ -24,15 +24,15 @@ const TransitionContentWrapper = styled.div`
`; `;
const Footer = styled.div` const Footer = styled.div`
position: fixed; position: relative;
width: 320px;
bottom: 0; bottom: 0;
background: ${colors.MAIN}; background: ${colors.MAIN};
border-right: 1px solid ${colors.DIVIDER}; border-right: 1px solid ${colors.DIVIDER};
`; `;
const Body = styled.div` const Body = styled.div`
overflow: auto; width: 320px;
background: ${colors.LANDING};
`; `;
const Help = styled.div` const Help = styled.div`