Fix css merge conflicts

7 years ago · 687d2f755d
parent a0ca3fab77
commit 687d2f755d
2 changed files with 2 additions and 2 deletions
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@ -96,7 +96,7 @@ TxList.prototype.renderTransactionListItem = function (transaction) {
    address,
    transactionAmount,
    transactionHash,
-    className: '.tx-list-clickable',
+    className: '.tx-list-item.tx-list-clickable',
  }

  if (transactionStatus === 'unapproved') {
--- a/ui/app/css/itcss/components/transaction-list.scss
+++ b/ui/app/css/itcss/components/transaction-list.scss
@ -67,7 +67,7 @@
  }

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