Merge branch 'master' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8
This commit is contained in:
commit
bc07527f46
@ -1,9 +1,9 @@
|
|||||||
<header class="headerbg">
|
<header class="headerbg">
|
||||||
<nav class="navbar navbar-expand navbar-light bg-transparent">
|
<nav class="navbar navbar-expand navbar-light bg-transparent">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
<div class="collapse navbar-collapse home_mble_hdr" id="navbarSupportedContent">
|
||||||
<div >
|
<div class="home_tst_net">
|
||||||
<span>You are on </span>
|
<span>You are viewing </span>
|
||||||
<ul class="list-unstyled d-inline-block mb-0">
|
<ul class="list-unstyled d-inline-block mb-0">
|
||||||
<li class="nav-item dropdown">
|
<li class="nav-item dropdown">
|
||||||
<a
|
<a
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
<div class="ml-auto ">
|
<div class="ml-auto ">
|
||||||
<a class="chart_heading d-sm-none" routerLink="/"><span class="txt_primary">Epic</span><span>Explorer</span></a>
|
<a class="chart_heading d-sm-none" routerLink="/"><span class="txt_primary">Epic</span><span>Explorer</span></a>
|
||||||
<div class="d-inline-block mr-3">
|
<div class=" d-none d-sm-inline-block mr-3">
|
||||||
<span>You are on </span>
|
<span>You are viewing </span>
|
||||||
<ul class="list-unstyled d-inline-block">
|
<ul class="list-unstyled d-inline-block">
|
||||||
<li class="nav-item dropdown">
|
<li class="nav-item dropdown">
|
||||||
|
|
||||||
@ -46,7 +46,9 @@
|
|||||||
src="assets/img/light_theme.png" height="20" class="dark_theme_display"></button>
|
src="assets/img/light_theme.png" height="20" class="dark_theme_display"></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="position-relative d-block d-sm-none w-100 mt-3">
|
<div class="position-relative d-block d-sm-none w-100 mt-3">
|
||||||
|
|
||||||
<input type="text" [(ngModel)]="search" #ctrl="ngModel" class="form-control search_input"
|
<input type="text" [(ngModel)]="search" #ctrl="ngModel" class="form-control search_input"
|
||||||
(keyup.enter)="ctrl.value ? onSearch(ctrl.value) : ''" placeholder="{{'home.SEARCH_TEXT' | translate}}">
|
(keyup.enter)="ctrl.value ? onSearch(ctrl.value) : ''" placeholder="{{'home.SEARCH_TEXT' | translate}}">
|
||||||
<button class="btn search_btn" (click)="ctrl.value ? onSearch(ctrl.value) : ''">
|
<button class="btn search_btn" (click)="ctrl.value ? onSearch(ctrl.value) : ''">
|
||||||
@ -55,5 +57,21 @@
|
|||||||
<!-- </a> -->
|
<!-- </a> -->
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="d-block d-sm-none text-center mt-3 mx-auto">
|
||||||
|
<span>You are viewing </span>
|
||||||
|
<ul class="list-unstyled d-inline-block">
|
||||||
|
<li class="nav-item dropdown">
|
||||||
|
|
||||||
|
<a class="nav-link dropdown-toggle bg-white" href="#" id="navbarDropdown" role="button"
|
||||||
|
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||||
|
Testnet
|
||||||
|
</a>
|
||||||
|
<div class="dropdown-menu net_dropdwn" aria-labelledby="navbarDropdown">
|
||||||
|
<a class="dropdown-item p-2 disabled" href="https://explorer2.epic.tech">Mainnet</a>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<span> Network </span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -301,7 +301,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6 col-lg-4 mb-4">
|
<div *ngIf="viewchartvar" class="col-md-6 col-lg-4 mb-4">
|
||||||
<div class="box_shadow">
|
<div class="box_shadow">
|
||||||
<div class="blocks">
|
<div class="blocks">
|
||||||
<h2 class="chart_heading d-inline-block">{{'home.BLOCKS_MINED' | translate}}</h2>
|
<h2 class="chart_heading d-inline-block">{{'home.BLOCKS_MINED' | translate}}</h2>
|
||||||
|
@ -341,7 +341,6 @@ export class GraphListComponent implements OnInit {
|
|||||||
.apiGetRequest(params, '/blockchain_block/supplygrowth')
|
.apiGetRequest(params, '/blockchain_block/supplygrowth')
|
||||||
.subscribe(
|
.subscribe(
|
||||||
res => {
|
res => {
|
||||||
res = {"status":200,"timestamp":1564734317476,"message":"period of blocks generation per second fetched Successfully","response":{"date":["2019-08-01"],"total_reward_per_day":[4600],"addedreward":[4600]}}
|
|
||||||
if (res['status'] == 200) {
|
if (res['status'] == 200) {
|
||||||
let gDate = res.response.date;
|
let gDate = res.response.date;
|
||||||
let gReward = res.response.total_reward_per_day;
|
let gReward = res.response.total_reward_per_day;
|
||||||
@ -1102,7 +1101,7 @@ export class GraphListComponent implements OnInit {
|
|||||||
type: 'scatter',
|
type: 'scatter',
|
||||||
name: '',
|
name: '',
|
||||||
line: { color: '#ac3333' },
|
line: { color: '#ac3333' },
|
||||||
hovertemplate: '%{DifficultychartDate}<br> Difficulty : %{text:,}',
|
hovertemplate: '%{x}<br> Difficulty : %{text:,}',
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
layout: {
|
layout: {
|
||||||
|
@ -79,8 +79,15 @@
|
|||||||
.view_page_header .navbar-brand{display: block; margin: 0 auto;}
|
.view_page_header .navbar-brand{display: block; margin: 0 auto;}
|
||||||
.view_page_header .ml-auto{margin: 0 !important; display: inherit;}
|
.view_page_header .ml-auto{margin: 0 !important; display: inherit;}
|
||||||
|
|
||||||
|
}
|
||||||
|
@media(max-width: 470px){
|
||||||
|
.navbar-expand .navbar-collapse.home_mble_hdr{display: block !important;}
|
||||||
|
.home_mble_hdr .navbar-nav{margin: 15px auto 0; width: 63%;}
|
||||||
|
.home_tst_net{font-size: 15px; width: 85%; margin: 0 auto;}
|
||||||
|
|
||||||
}
|
}
|
||||||
@media(max-width: 365px){
|
@media(max-width: 365px){
|
||||||
.mobile_table .col-6 {flex: 0 0 100%;max-width: 100%;}
|
.mobile_table .col-6 {flex: 0 0 100%;max-width: 100%;}
|
||||||
.view_page_header .search_btn{display: none;}
|
.view_page_header .search_btn{display: none;}
|
||||||
|
.home_tst_net{font-size: 13px;}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user