Commit 97bafcfa authored by Benoit Philibert's avatar Benoit Philibert

fix dashboard + transaction details

parent d442966c
...@@ -4,14 +4,11 @@ ...@@ -4,14 +4,11 @@
<!-- JUMBOTRON--> <!-- JUMBOTRON-->
<div class="jumbotron jumbotron-fluid"> <div class="jumbotron jumbotron-fluid">
<div class="container"> <div class="container">
<div class="row d-flex align-items-center"> <div class="col-xs-12 text-left">
<div class="col-xs-12 col-md-3 text-left"> <h5 class="text-capitalize walletName">{{ walletName }}</h5>
<h5>Active Wallet</h5>
<p class="lead">
<span class="walletName text-capitalize">{{ walletName }}</span>
</p>
</div> </div>
<div class="col-xs-12 col-md-3 text-left"> <div class="row d-flex align-items-center">
<div class="col-md-4 text-left">
<h5>Active balance</h5> <h5>Active balance</h5>
<p class="lead"> <p class="lead">
<!--<strong><span class="h2">29</span>.76500293</strong>--> <!--<strong><span class="h2">29</span>.76500293</strong>-->
...@@ -28,7 +25,7 @@ ...@@ -28,7 +25,7 @@
<small class="text-uppercase">usd</small> <small class="text-uppercase">usd</small>
</p> </p>
</div>--> </div>-->
<div class="col-xs-12 col-md-3 text-left"> <div class="col-md-4 text-left">
<h5>Unconfirmed balance</h5> <h5>Unconfirmed balance</h5>
<p class="lead"> <p class="lead">
<strong>{{ (unconfirmedBalance | coinNotation) || (0 | coinNotation) }}</strong> <strong>{{ (unconfirmedBalance | coinNotation) || (0 | coinNotation) }}</strong>
...@@ -36,7 +33,7 @@ ...@@ -36,7 +33,7 @@
</p> </p>
</div> </div>
<!-- /col--> <!-- /col-->
<div class="col-xs-12 col-md-3 text-right"> <div class="col-md-4 text-right">
<p> <p>
<a class="btn btn-secondary" data-toggle="modal" data-target="#modalReceive" role="button" (click)="openReceiveDialog()">Receive</a> <a class="btn btn-secondary" data-toggle="modal" data-target="#modalReceive" role="button" (click)="openReceiveDialog()">Receive</a>
<a class="btn btn-primary ml-2" data-toggle="modal" data-target="#modalSend" role="button" (click)="openSendDialog()">Send</a> <a class="btn btn-primary ml-2" data-toggle="modal" data-target="#modalSend" role="button" (click)="openSendDialog()">Send</a>
......
...@@ -8,28 +8,28 @@ ...@@ -8,28 +8,28 @@
<h5 class="modal-title text-uppercase" id="modalDetail">Transaction Details</h5> <h5 class="modal-title text-uppercase" id="modalDetail">Transaction Details</h5>
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel">Type</li> <li class="list-inline-item col blockLabel">Type</li>
<li class="list-inline-item col-9 blockText text-capitalize">{{ transaction.transactionType }}</li> <li class="list-inline-item col-8 blockText text-capitalize">{{ transaction.transactionType }}</li>
</ul> </ul>
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel">Amount</li> <li class="list-inline-item col blockLabel">Amount</li>
<li *ngIf="transaction.transactionType == 'received'" class="list-inline-item col-9 blockText text-success">{{ transaction.transactionAmount | coinNotation }} {{ coinUnit }}</li> <li *ngIf="transaction.transactionType == 'received'" class="list-inline-item col-8 blockText text-success">{{ transaction.transactionAmount | coinNotation }} {{ coinUnit }}</li>
<li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-9 blockText text-danger">-{{ transaction.transactionAmount + transaction.transactionFee | coinNotation }} {{ coinUnit }}</li> <li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-8 blockText text-danger">-{{ transaction.transactionAmount + transaction.transactionFee | coinNotation }} {{ coinUnit }}</li>
</ul> </ul>
<!-- <ul class="list-inline row" *ngIf="transaction.transactionType == 'sent'"> <!-- <ul class="list-inline row" *ngIf="transaction.transactionType == 'sent'">
<li class="list-inline-item col blockLabel">Fee</li> <li class="list-inline-item col blockLabel">Fee</li>
<li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-9 blockText text-danger">{{ transaction.transactionFee | coinNotation }} {{ coinUnit }}</li> <li *ngIf="transaction.transactionType == 'sent'" class="list-inline-item col-8 blockText text-danger">{{ transaction.transactionFee | coinNotation }} {{ coinUnit }}</li>
</ul> --> </ul> -->
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel">Date</li> <li class="list-inline-item col blockLabel">Date</li>
<li class="list-inline-item col-9 blockText">{{ transaction.transactionTimestamp * 1000 | date:'medium' }}</li> <li class="list-inline-item col-8 blockText">{{ transaction.transactionTimestamp * 1000 | date:'medium' }}</li>
</ul> </ul>
<ul *ngIf="transaction.transactionConfirmedInBlock" class="list-inline row"> <ul *ngIf="transaction.transactionConfirmedInBlock" class="list-inline row">
<li class="list-inline-item col blockLabel">Block</li> <li class="list-inline-item col blockLabel">Block</li>
<li class="list-inline-item col-9 blockText">#{{ transaction.transactionConfirmedInBlock }}</li> <li class="list-inline-item col-8 blockText">#{{ transaction.transactionConfirmedInBlock }}</li>
</ul> </ul>
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel">Confirmations</li> <li class="list-inline-item col blockLabel">Confirmations</li>
<li class="list-inline-item col-9 blockText">{{ confirmations }}</li> <li class="list-inline-item col-8 blockText">{{ confirmations }}</li>
</ul> </ul>
<ul class="list-inline row"> <ul class="list-inline row">
<li class="list-inline-item col blockLabel mb-3">Transaction ID</li> <li class="list-inline-item col blockLabel mb-3">Transaction ID</li>
......
...@@ -136,6 +136,14 @@ em { ...@@ -136,6 +136,14 @@ em {
h5 { h5 {
font-size: .85em; font-size: .85em;
color: $gray-dark; color: $gray-dark;
margin-bottom: 0;
&.walletName {
color: $black;
font-size: 1em;
font-weight: bolder;
margin-bottom: 1.5em;
}
} }
p {margin-bottom: 0 !important;} p {margin-bottom: 0 !important;}
.lead { .lead {
...@@ -144,10 +152,6 @@ em { ...@@ -144,10 +152,6 @@ em {
font-weight: 500; font-weight: 500;
margin-bottom: 0; margin-bottom: 0;
.walletName {
font-size: 0.7em;
font-weight: normal;
}
.h2 { .h2 {
font-size: 2em; font-size: 2em;
font-weight: 600; font-weight: 600;
...@@ -277,6 +281,7 @@ em { ...@@ -277,6 +281,7 @@ em {
color: $blue; color: $blue;
text-transform: uppercase; text-transform: uppercase;
font-size: .825em; font-size: .825em;
line-height: 2em;
} }
.blockText { .blockText {
color: $darkgray; color: $darkgray;
......
...@@ -161,6 +161,14 @@ em.display-4 { ...@@ -161,6 +161,14 @@ em.display-4 {
.jumbotron h5 { .jumbotron h5 {
font-size: .85em; font-size: .85em;
color: #878685; color: #878685;
margin-bottom: 0;
}
.jumbotron h5.walletName {
color: #444;
font-size: 1em;
font-weight: bolder;
margin-bottom: 1.5em;
} }
.jumbotron p { .jumbotron p {
...@@ -174,11 +182,6 @@ em.display-4 { ...@@ -174,11 +182,6 @@ em.display-4 {
margin-bottom: 0; margin-bottom: 0;
} }
.jumbotron .lead .walletName {
font-size: 0.7em;
font-weight: normal;
}
.jumbotron .lead .h2 { .jumbotron .lead .h2 {
font-size: 2em; font-size: 2em;
font-weight: 600; font-weight: 600;
...@@ -334,6 +337,7 @@ em.display-4 { ...@@ -334,6 +337,7 @@ em.display-4 {
color: #7385A0; color: #7385A0;
text-transform: uppercase; text-transform: uppercase;
font-size: .825em; font-size: .825em;
line-height: 2em;
} }
#modalDetail .blockText, #modalCheck .blockText, #modalSettings .blockText { #modalDetail .blockText, #modalCheck .blockText, #modalSettings .blockText {
...@@ -3794,7 +3798,7 @@ tbody.collapse.show { ...@@ -3794,7 +3798,7 @@ tbody.collapse.show {
background-color: #fff; background-color: #fff;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid rgba(68, 68, 68, 0.15); border: 1px solid rgba(68, 68, 68, 0.15);
border-radius: 0.25rem; border-radius: 50px;
} }
.dropdown-divider { .dropdown-divider {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment