trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Monitor/Pages/BagAnalyzer.cshtml
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>

3
Monitor/Pages/_get/BagList.cshtml
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>

8
Monitor/wwwroot/assets/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

154
Monitor/wwwroot/assets/css/custom.css
View File

@ -2,14 +2,16 @@
color: #33b5e5; color: #33b5e5;
} }
a:hover, a:focus, a:active { a:hover,
color: #50cefc; a:focus,
} a:active {
color: #50cefc;
}
.logo > .logo-version { .logo>.logo-version {
font-size: 12px; font-size : 12px;
font-weight: normal; font-weight: normal;
color: #33b5e5 !important; color : #33b5e5 !important;
margin-left: 10px; margin-left: 10px;
} }
@ -22,7 +24,7 @@
} }
.pair-tooltip { .pair-tooltip {
min-width: 400px; min-width : 400px;
background: none; background: none;
} }
@ -43,47 +45,47 @@
} }
.btn-ptmagic { .btn-ptmagic {
border: 1px solid #33b5e5 !important; border : 1px solid #33b5e5 !important;
background: #33b5e5; background: #33b5e5;
color: #ffffff; color : #ffffff;
} }
.btn-ptmagic:hover { .btn-ptmagic:hover {
border: 1px solid #33b5e5 !important; border : 1px solid #33b5e5 !important;
background: #33b5e5 !important; background: #33b5e5 !important;
color: #ffffff !important; color : #ffffff !important;
} }
.btn-custom.btn-ptmagic { .btn-custom.btn-ptmagic {
color: #33b5e5; color: #33b5e5;
} }
.btn-ptmagic.btn-mini { .btn-ptmagic.btn-mini {
padding: .15rem .5rem; padding : .15rem .5rem;
font-size: .475rem; font-size : .475rem;
line-height: 1.2; line-height : 1.2;
border-radius: .1rem; border-radius: .1rem;
} }
.btn-xs { .btn-xs {
line-height: 1.4; line-height: 1.4;
padding: 0.14286rem 0.5rem; padding : 0.14286rem 0.5rem;
font-size: 0.78571rem; font-size : 0.78571rem;
} }
.ticker-widgets div { .ticker-widgets div {
display: inline-block; display : inline-block;
margin-top: 12px; margin-top : 12px;
margin-left: 10px; margin-left: 10px;
} }
.ticker-widget { .ticker-widget {
margin-top: 12px; margin-top : 12px;
margin-right: 12px; margin-right: 12px;
} }
.card-box-mini { .card-box-mini {
padding: 7px; padding : 7px;
margin-bottom: 0px; margin-bottom: 0px;
} }
@ -92,39 +94,45 @@
} }
.card-box-success-outlined { .card-box-success-outlined {
background: none; background : none;
border: 1px solid #81c868; border : 1px solid #81c868;
border-radius: 5px; border-radius: 5px;
color: #81c868; color : #81c868;
} }
.card-box-warning-outlined { .card-box-warning-outlined {
background: none; background : none;
border: 1px solid #ffbd4a; border : 1px solid #ffbd4a;
border-radius: 5px; border-radius: 5px;
color: #ffbd4a; color : #ffbd4a;
} }
.card-box-ptmagic-outlined { .card-box-ptmagic-outlined {
background: none; background : none;
border: 1px solid #33b5e5; border : 1px solid #33b5e5;
border-radius: 5px; border-radius: 5px;
color: #33b5e5; color : #33b5e5;
} }
.card-box-ptmagic-status-outlined { .card-box-ptmagic-status-outlined {
background: none; background : none;
border: 1px solid #33b5e5; border : 1px solid #33b5e5;
border-radius: 5px; border-radius: 5px;
color: #33b5e5; color : #33b5e5;
padding: 7px; padding : 7px;
} }
.ptmagic-version { .ptmagic-version {
text-align: center; text-align: center;
position: absolute; position : absolute;
bottom: 10px; bottom : 10px;
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 {
@ -135,20 +143,18 @@
display: none; display: none;
} }
.errorRow .errorRow {
{
background-color: #550000; background-color: #550000;
} }
.errorRow a .errorRow a {
{
color: white; color: white;
} }
.table-scroll-hori { .table-scroll-hori {
display: block; display : block;
width: 100%; width : 100%;
overflow-x: auto; overflow-x : auto;
-ms-overflow-style: -ms-autohiding-scrollbar; -ms-overflow-style: -ms-autohiding-scrollbar;
} }
@ -156,7 +162,7 @@
.trades-chart .nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point, .trades-chart .nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point,
.profit-chart .nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point, .profit-chart .nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point,
.balance-chart .nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point { .balance-chart .nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point {
fill-opacity: 1 !important; fill-opacity : 1 !important;
stroke-opacity: 1 !important; stroke-opacity: 1 !important;
} }
@ -166,32 +172,36 @@
text-align: left; text-align: left;
} }
#topnav .navigation-menu > li > a i { #topnav .navigation-menu>li>a i {
display: inline-block; display : inline-block;
padding-right: 5px; padding-right: 5px;
color: #33b5e5; color : #33b5e5;
} }
#topnav .navigation-menu > li > a { #topnav .navigation-menu>li>a {
padding-top: 12px; padding-top : 12px;
padding-bottom: 10px; padding-bottom: 10px;
padding-left: 10px; padding-left : 10px;
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,
color: #50cefc; #topnav .navigation-menu>li>a:focus,
} #topnav .navigation-menu>li>a:active {
#topnav .navigation-menu > li > a:hover i, #topnav .navigation-menu > li > a:focus i, #topnav .navigation-menu > li > a:active i {
color: #c6cace;
}
#topnav .navigation-menu > li .submenu li a i {
color: #33b5e5;
width: 20px;
}
#topnav .has-submenu.active > a {
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 {
color: #c6cace;
}
#topnav .navigation-menu>li .submenu li a i {
color: #33b5e5;
width: 20px;
}
#topnav .has-submenu.active>a {
color: #50cefc;
}

2
Monitor/wwwroot/assets/css/style.css
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; }

11
Monitor/wwwroot/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
Monitor/wwwroot/assets/js/popper.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
Monitor/wwwroot/assets/plugins/notifyjs/js/notify.js
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;