poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix css merge conflicts

This commit is contained in:
Chi Kei Chan 2017-09-07 11:25:31 -07:00
parent a0ca3fab77
commit 687d2f755d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/components/tx-list.js
View File

@ -96,7 +96,7 @@ TxList.prototype.renderTransactionListItem = function (transaction) {
address, address,
transactionAmount, transactionAmount,
transactionHash, transactionHash,
className: '.tx-list-clickable', className: '.tx-list-item.tx-list-clickable',
} }
if (transactionStatus === 'unapproved') { if (transactionStatus === 'unapproved') {

2
ui/app/css/itcss/components/transaction-list.scss
View File

@ -67,7 +67,7 @@
} }
@media screen and (min-width: $break-large) { @media screen and (min-width: $break-large) {
margin: 0 2.37em; // margin: 0 2.37em;
} }
} }