diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-08 02:25:31 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-08 02:25:31 +0800 |
| commit | 687d2f755d4fe9129d785603e5332c8af71a3481 (patch) | |
| tree | b6e8630e70b253cc580974dfa559125cbfd8b36e /ui/app | |
| parent | a0ca3fab774307e806fc881f1ce2bc6fc3a789ce (diff) | |
| download | tangerine-wallet-browser-687d2f755d4fe9129d785603e5332c8af71a3481.tar.gz tangerine-wallet-browser-687d2f755d4fe9129d785603e5332c8af71a3481.tar.zst tangerine-wallet-browser-687d2f755d4fe9129d785603e5332c8af71a3481.zip | |
Fix css merge conflicts
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/components/tx-list.js | 2 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/transaction-list.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js index 724e86c21..5066ab387 100644 --- 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') { diff --git a/ui/app/css/itcss/components/transaction-list.scss b/ui/app/css/itcss/components/transaction-list.scss index f3bba574e..298cacec0 100644 --- 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; } } |