UI updates

This commit is contained in:
djbadders 2019-04-13 11:44:42 +01:00
parent 46f517fc3a
commit e757679e66
8 changed files with 101 additions and 87 deletions

View File

@ -19,7 +19,6 @@
</div> </div>
</div> </div>
} else { } else {
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="card-box"> <div class="card-box">
@ -29,6 +28,7 @@
<thead> <thead>
<tr> <tr>
<th data-fieldid="Market" data-tablesaw-sortable-col>Market</th> <th data-fieldid="Market" data-tablesaw-sortable-col>Market</th>
<th data-sortable-numeric="true" data-fieldid="Amount" data-tablesaw-sortable-col>Amount</th>
<th data-fieldid="TotalCost" data-tablesaw-sortable-col data-sortable-numeric="true" class="text-left" data-toggle="tooltip" data-placement="top" title="Spent total cost in @Model.Summary.MainMarket">Value</th> <th data-fieldid="TotalCost" data-tablesaw-sortable-col data-sortable-numeric="true" class="text-left" data-toggle="tooltip" data-placement="top" title="Spent total cost in @Model.Summary.MainMarket">Value</th>
<th data-fieldid="BoughtTimes" data-tablesaw-sortable-col data-sortable-numeric="true" class="text-right" data-toggle="tooltip" data-placement="top" title="Current DCA level">DCA</th> <th data-fieldid="BoughtTimes" data-tablesaw-sortable-col data-sortable-numeric="true" class="text-right" data-toggle="tooltip" data-placement="top" title="Current DCA level">DCA</th>
<th data-toggle="tooltip" data-placement="top" title="Active buy strategies">Buy Strats</th> <th data-toggle="tooltip" data-placement="top" title="Active buy strategies">Buy Strats</th>

View File

@ -89,6 +89,9 @@
<th class="align-top"><a href="@Core.Helper.SystemHelper.GetMarketLink(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform,Model.PTMagicConfiguration.GeneralSettings.Application.Exchange, dcaLogEntry.Market, Model.Summary.MainMarket)" target="_blank">@dcaLogEntry.Market</a> <i class="fa fa-exclamation-triangle text-highlight" data-toggle="tooltip" data-placement="top" data-html="true" title="@await Component.InvokeAsync("PairIcon", mps)" data-template="<div class='tooltip' role='tooltip'><div class='tooltip-arrow'></div><div class='tooltip-inner pair-tooltip'></div></div>"></i></th> <th class="align-top"><a href="@Core.Helper.SystemHelper.GetMarketLink(Model.PTMagicConfiguration.GeneralSettings.Monitor.LinkPlatform,Model.PTMagicConfiguration.GeneralSettings.Application.Exchange, dcaLogEntry.Market, Model.Summary.MainMarket)" target="_blank">@dcaLogEntry.Market</a> <i class="fa fa-exclamation-triangle text-highlight" data-toggle="tooltip" data-placement="top" data-html="true" title="@await Component.InvokeAsync("PairIcon", mps)" data-template="<div class='tooltip' role='tooltip'><div class='tooltip-arrow'></div><div class='tooltip-inner pair-tooltip'></div></div>"></i></th>
} }
// Amount
<td class="text-left">@Html.Raw(@dcaLogEntry.Amount)</td>
// Value // Value
<td class="text-left">@Html.Raw(@dcaLogEntry.TotalCost.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) + " (" + Model.MainFiatCurrencySymbol + currentFiatValue.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + ")")</td> <td class="text-left">@Html.Raw(@dcaLogEntry.TotalCost.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) + " (" + Model.MainFiatCurrencySymbol + currentFiatValue.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + ")")</td>

File diff suppressed because one or more lines are too long

View File

@ -2,7 +2,9 @@
color: #33b5e5; color: #33b5e5;
} }
a:hover, a:focus, a:active { a:hover,
a:focus,
a:active {
color: #50cefc; color: #50cefc;
} }
@ -127,6 +129,12 @@
width : 100%; width : 100%;
} }
.table {
color : white;
font-family: "Noto Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size : 12px;
}
.tablesaw-sortable .tablesaw-sortable-head button { .tablesaw-sortable .tablesaw-sortable-head button {
min-width: unset; min-width: unset;
} }
@ -135,13 +143,11 @@
display: none; display: none;
} }
.errorRow .errorRow {
{
background-color: #550000; background-color: #550000;
} }
.errorRow a .errorRow a {
{
color: white; color: white;
} }
@ -179,11 +185,15 @@
padding-right : 10px; padding-right : 10px;
} }
#topnav .navigation-menu > li > a:hover, #topnav .navigation-menu > li > a:focus, #topnav .navigation-menu > li > a:active { #topnav .navigation-menu>li>a:hover,
#topnav .navigation-menu>li>a:focus,
#topnav .navigation-menu>li>a:active {
color: #50cefc; color: #50cefc;
} }
#topnav .navigation-menu > li > a:hover i, #topnav .navigation-menu > li > a:focus i, #topnav .navigation-menu > li > a:active i { #topnav .navigation-menu>li>a:hover i,
#topnav .navigation-menu>li>a:focus i,
#topnav .navigation-menu>li>a:active i {
color: #c6cace; color: #c6cace;
} }

View File

@ -1009,7 +1009,7 @@ select[multiple] {
width: 90%; } width: 90%; }
.wrapper { .wrapper {
padding-top: 148px; } padding-top: 130px; }
.page-title-box { .page-title-box {
padding: 22px 0; } padding: 22px 0; }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -346,7 +346,7 @@
var align = positions[pAlign]; var align = positions[pAlign];
var key = pMain + "|" + pAlign; var key = pMain + "|" + pAlign;
var anchor = globalAnchors[key]; var anchor = globalAnchors[key];
if (!anchor || !document.contains(anchor[0])) { if (!anchor || !document.body.contains(anchor[0])) {
anchor = globalAnchors[key] = createElem("div"); anchor = globalAnchors[key] = createElem("div");
var css = {}; var css = {};
css[main] = 0; css[main] = 0;