More css and layout updates

ArtemKo7v · ArtemKo7v · commit a23ad2a1d5e4 · 2017-01-06T19:34:40.000+07:00
diff --git a/css/ethplorer.css b/css/ethplorer.css
@@ -173,7 +173,7 @@ a.local-link, a.local-link:visited, a.local-link:hover {
 }
 
 #disqus_thread {
-    margin-top: 20px;
+    margin-top: 60px;
     display: none;
     padding-bottom: 70px;
 }
@@ -186,6 +186,11 @@ td.list-field {
     text-overflow: ellipsis;
 }
 
+.token-related .blue td {
+    font-size: 20px;
+    white-space: normal;
+}
+
 .navbar-logo {
     float: left;
     height: 50px;
@@ -302,16 +307,22 @@ a.dashed {
     text-overflow: ellipsis
 }
 
+.same-address {
+    opacity: 0.6;
+}
+
 .incoming {
-    color: #4f9450 !important;
+    font-size: 16px;
+    color: #1e8c1e !important;
 }
 
 .outgoing {
-    color: #900 !important;
+    font-size: 16px;
+    color: #8c1e1e !important;
 }
 
 .hash-from-to {
-    max-width: 50vw;
+    max-width: 40vw;
     overflow: hidden;
     text-overflow: ellipsis
 }
@@ -325,6 +336,7 @@ a.dashed {
     display: block;
     padding-left: 16px;
     color: white;
+    margin-bottom: 20px;
 }
 
 #address-issuances tr td:last-child {
@@ -446,6 +458,10 @@ a.dashed {
 }
 
 @media screen and (max-width: 699px) {
+    .token-related .blue td {
+        font-size: 18px;
+    }
+
     .hash-from-to {
         max-width: 56vw;
     }
@@ -462,6 +478,9 @@ a.dashed {
 }
 
 @media screen and (max-width: 399px) {
+    .token-related .blue td {
+        font-size: 16px;
+    }
     #address-token-transfers td {
         font-size: 11px;
     }
diff --git a/js/ethplorer.js b/js/ethplorer.js
@@ -558,26 +558,33 @@ Ethplorer = {
                     var date = Ethplorer.Utils.ts2date(tx.timestamp, false);
                     var value = Ethplorer.Utils.formatNum(qty, true, txToken.decimals ? txToken.decimals : 18, 2) + ' ' + txToken.symbol;
                     var token = Ethplorer.Utils.getEthplorerLink(tx.contract, txToken.name, false);
-                    var from = tx.from ? ((tx.from !== address) ? Ethplorer.Utils.getEthplorerLink(tx.from) : address) : false;
-                    var to = tx.to ? ((tx.to !== address) ? Ethplorer.Utils.getEthplorerLink(tx.to) : address) : false;
+                    var from = tx.from ? ((tx.from !== address) ? Ethplorer.Utils.getEthplorerLink(tx.from) : ('<span class="same-address">' + address + '</span>')) : false;
+                    var to = tx.to ? ((tx.to !== address) ? Ethplorer.Utils.getEthplorerLink(tx.to) : ('<span class="same-address">' + address + '</span>')) : false;
+                    var _address = (tx.address && (tx.address === address )) ? ('<span class="same-address">' + address + '</span>') : tx.address;
                     var rowClass = '';
                     if(from && (tx.from === address)){
                         value = '-' + value;
                         rowClass = 'outgoing';
                     }else if(to && (tx.to === address)){
                         rowClass = 'incoming';
+                    }else if(tx.address === address){
+                        if('burn' === tx.type){
+                            rowClass = 'outgoing';
+                        }else{
+                            rowClass = 'incoming';
+                        }
                     }
                     tdDate.html(Ethplorer.Utils.getEthplorerLink(tx.transactionHash, date, false));
+                    if(!from && tx.address){
+                        value = (tx.type && ('burn' === tx.type)) ? '-' + value + '<br>&#128293; Burn' : /*'+' + */value + '<br>&#9874; Issuance';
+                    }
                     divData.html(
                         '<span class="show_small">Date:&nbsp;' + date + '<br></span>' +
                         (!data.token ? ('<span class="address-token-inline">Token:&nbsp;' + token + '<br></span>') : '') +
                         '<span class="show_small ' + rowClass + '">Value:&nbsp;' + value + '<br></span>' +                        
                         'Tx:&nbsp;' + Ethplorer.Utils.getEthplorerLink(tx.transactionHash) + '<br>' +
-                        (from ? ('From:&nbsp;' + from + '<br>To:&nbsp;' + to) : ('Address:&nbsp;' + address))
+                        (from ? ('From:&nbsp;' + from + '<br>To:&nbsp;' + to) : ('Address:&nbsp;' + _address))
                     );
-                    if(!from && tx.address){
-                        value = (tx.type && ('burn' === tx.type)) ? '-' + value + '<br>Burn' : /*'+' + */value + '<br>Issuance';
-                    }
                     tdQty.addClass(rowClass);
                     tdQty.html(value);
                     tdData.append(divData);
@@ -593,7 +600,7 @@ Ethplorer = {
                     $('#' + tableId + ' .table').append(row);
                 }
             }
-            if(50 == data.transfers.length){
+            if(50 === data.transfers.length){
                 $('#' + tableId + ' .block-header').html($('#' + tableId + ' .block-header').html().replace('Transfers', 'Last 50 Transfers').replace('Operations', 'Last 50 Operations'))
                 $('#address-transfers-more, #address-token-transfers-more').html(Ethplorer.Utils.getEtherscanLink(address, 'View full history', false));
             }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ a.local-link, a.local-link:visited, a.local-link:hover {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`#disqus_thread {`
`176`		`- margin-top: 20px;`
	`176`	`+ margin-top: 60px;`
`177`	`177`	`display: none;`
`178`	`178`	`padding-bottom: 70px;`
`179`	`179`	`}`
`@@ -186,6 +186,11 @@ td.list-field {`
`186`	`186`	`text-overflow: ellipsis;`
`187`	`187`	`}`
`188`	`188`
	`189`	`+.token-related .blue td {`
	`190`	`+ font-size: 20px;`
	`191`	`+ white-space: normal;`
	`192`	`+}`
	`193`	`+`
`189`	`194`	`.navbar-logo {`
`190`	`195`	`float: left;`
`191`	`196`	`height: 50px;`
`@@ -302,16 +307,22 @@ a.dashed {`
`302`	`307`	`text-overflow: ellipsis`
`303`	`308`	`}`
`304`	`309`
	`310`	`+.same-address {`
	`311`	`+ opacity: 0.6;`
	`312`	`+}`
	`313`	`+`
`305`	`314`	`.incoming {`
`306`		`- color: #4f9450 !important;`
	`315`	`+ font-size: 16px;`
	`316`	`+ color: #1e8c1e !important;`
`307`	`317`	`}`
`308`	`318`
`309`	`319`	`.outgoing {`
`310`		`- color: #900 !important;`
	`320`	`+ font-size: 16px;`
	`321`	`+ color: #8c1e1e !important;`
`311`	`322`	`}`
`312`	`323`
`313`	`324`	`.hash-from-to {`
`314`		`- max-width: 50vw;`
	`325`	`+ max-width: 40vw;`
`315`	`326`	`overflow: hidden;`
`316`	`327`	`text-overflow: ellipsis`
`317`	`328`	`}`
`@@ -325,6 +336,7 @@ a.dashed {`
`325`	`336`	`display: block;`
`326`	`337`	`padding-left: 16px;`
`327`	`338`	`color: white;`
	`339`	`+ margin-bottom: 20px;`
`328`	`340`	`}`
`329`	`341`
`330`	`342`	`#address-issuances tr td:last-child {`
`@@ -446,6 +458,10 @@ a.dashed {`
`446`	`458`	`}`
`447`	`459`
`448`	`460`	`@media screen and (max-width: 699px) {`
	`461`	`+ .token-related .blue td {`
	`462`	`+ font-size: 18px;`
	`463`	`+ }`
	`464`	`+`
`449`	`465`	`.hash-from-to {`
`450`	`466`	`max-width: 56vw;`
`451`	`467`	`}`
`@@ -462,6 +478,9 @@ a.dashed {`
`462`	`478`	`}`
`463`	`479`
`464`	`480`	`@media screen and (max-width: 399px) {`
	`481`	`+ .token-related .blue td {`
	`482`	`+ font-size: 16px;`
	`483`	`+ }`
`465`	`484`	`#address-token-transfers td {`
`466`	`485`	`font-size: 11px;`
`467`	`486`	`}`