Skip to content

Commit

Permalink
Token name as link on tx details page
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtemKo7v committed Aug 22, 2016
1 parent 05f473c commit 399aa35
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 95 deletions.
166 changes: 72 additions & 94 deletions css/ethplorer.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ body {
padding: 8px 8px 8px 28px;
}

/*
.content-page tr:nth-child(odd) {
background: #0f0f0f;
}
.content-page tr:nth-child(even) {
background: #1a1a1a;
}
*/

tr.even {
background: #0f0f0f;
}
Expand Down Expand Up @@ -119,11 +109,6 @@ tr.odd {
word-wrap: break-word; /* Internet Explorer 5.5+ */
}

.poka-hz {
background-color: #fc8c84 !important;
display: none;
}

.pre-switcher {
cursor: pointer;
position: absolute;
Expand All @@ -137,13 +122,10 @@ pre.list-field {
padding-right: 36px;
}

.todo {
background-color: #d5f5b2;
}

#search {
margin-top: 8px;
margin-right: 15px !important;
width: 350px;
}

.subnav {
Expand Down Expand Up @@ -180,18 +162,6 @@ a.local-link, a.local-link:visited, a.local-link:hover {
top: 8px;
}

@media screen and (max-width: 640px) {
.footer {
line-height: 12px;
font-size: 12px;
}
.footer .copyrights {
text-align: center;
position:relative;
width: 100%;
}
}

#disqus_thread {
margin-top: 20px;
display: none;
Expand Down Expand Up @@ -220,8 +190,77 @@ td.list-field {
cursor: pointer;
}

#search {
width: 350px;
.table tr.last td:first-child {
border-bottom-left-radius: 8px;
}

.table tr.last td:last-child {
border-bottom-right-radius: 8px;
}

#transfer-tx-message,
#transaction-tx-message,
#address-token-description {
white-space: normal !important;
}

#ethplorer-path {
overflow: hidden;
text-overflow: ellipsis;
max-width: 100vw;
}

/* Timer*/
.timer{
width: 47px;
height: 47px;
background-color: transparent;
box-shadow: inset 0px 0px 0px 2px #fff;
border-radius: 50%;
position: relative;
margin: 38px auto;/* Not necessary- its only for layouting*/
}
.timer:after, .timer:before{
position: absolute;
content:"";
background-color: #fff;
}
.timer:after{
width: 20px;
height: 2px;
top: 22px;
left: 22px;
-webkit-transform-origin: 1px 1px;
-moz-transform-origin: 1px 1px;
transform-origin: 1px 1px;
-webkit-animation: minhand 2s linear infinite;
-moz-animation: minhand 2s linear infinite;
animation: minhand 2s linear infinite;
}

.timer:before{
width: 16px;
height: 2px;
top: 22px;
left: 22px;
-webkit-transform-origin: 1px 1px;
-moz-transform-origin: 1px 1px;
transform-origin: 1px 1px;
-webkit-animation: hrhand 8s linear infinite;
-moz-animation: hrhand 8s linear infinite;
animation: hrhand 8s linear infinite;
}

@media screen and (max-width: 640px) {
.footer {
line-height: 12px;
font-size: 12px;
}
.footer .copyrights {
text-align: center;
position:relative;
width: 100%;
}
}

@media screen and (min-width: 400px) and (max-width: 991px) {
Expand Down Expand Up @@ -293,55 +332,6 @@ td.list-field {
}
}

.table tr.last td:first-child {
border-bottom-left-radius: 8px;
}

.table tr.last td:last-child {
border-bottom-right-radius: 8px;
}

/* Timer*/
.timer{
width: 47px;
height: 47px;
background-color: transparent;
box-shadow: inset 0px 0px 0px 2px #fff;
border-radius: 50%;
position: relative;
margin: 38px auto;/* Not necessary- its only for layouting*/
}
.timer:after, .timer:before{
position: absolute;
content:"";
background-color: #fff;
}
.timer:after{
width: 20px;
height: 2px;
top: 22px;
left: 22px;
-webkit-transform-origin: 1px 1px;
-moz-transform-origin: 1px 1px;
transform-origin: 1px 1px;
-webkit-animation: minhand 2s linear infinite;
-moz-animation: minhand 2s linear infinite;
animation: minhand 2s linear infinite;
}

.timer:before{
width: 16px;
height: 2px;
top: 22px;
left: 22px;
-webkit-transform-origin: 1px 1px;
-moz-transform-origin: 1px 1px;
transform-origin: 1px 1px;
-webkit-animation: hrhand 8s linear infinite;
-moz-animation: hrhand 8s linear infinite;
animation: hrhand 8s linear infinite;
}

@-webkit-keyframes minhand{
0%{-webkit-transform:rotate(0deg)}
100%{-webkit-transform:rotate(360deg)}
Expand All @@ -366,16 +356,4 @@ td.list-field {
@keyframes hrhand{
0%{transform:rotate(0deg)}
100%{transform:rotate(360deg)}
}

#transfer-tx-message,
#transaction-tx-message,
#address-token-description {
white-space: normal !important;
}

#ethplorer-path {
overflow: hidden;
text-overflow: ellipsis;
max-width: 100vw;
}
2 changes: 1 addition & 1 deletion js/ethplorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Ethplorer = {
Ethplorer.fillValues('transaction', txData, ['tx', 'tx.from', 'tx.to', 'tx.creates', 'tx.value', 'tx.timestamp', 'tx.gasLimit', 'tx.gasUsed', 'tx.gasPrice', 'tx.fee', 'tx.nonce', 'tx.blockNumber', 'tx.confirmations', 'tx.data']);

if(txData.token){
$('.token-name').html(txData.token.name);
$('.token-name').html(Ethplorer.Utils.getEthplorerLink(txData.tx.to, txData.token.name, false));
var oToken = txData.token;
if(false === oToken.totalSupply){
oToken.totalSupply = 'N/A';
Expand Down

0 comments on commit 399aa35

Please sign in to comment.