Fix css merge conflicts
This commit is contained in:
parent
a0ca3fab77
commit
687d2f755d
|
@ -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') {
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue