Merge branch 'master' into mononaut/audit-highlighting

This commit is contained in:
softsimon
2023-01-27 16:11:03 +04:00
committed by GitHub
22 changed files with 29 additions and 18 deletions

View File

@@ -20,6 +20,8 @@
<ngb-pagination [collectionSize]="assets.length" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)" [maxSize]="paginationMaxSize" [boundaryLinks]="true" [ellipses]="ellipses"></ngb-pagination>
<div class="clearfix"></div>
<br>
</ng-container>
<ng-template #isLoading>

View File

@@ -23,7 +23,6 @@
min-height: 500px;
height: calc(100% - 150px);
@media (max-width: 992px) {
height: 100%;
padding-bottom: 100px;
};
}

View File

@@ -23,7 +23,6 @@
min-height: 500px;
height: calc(100% - 150px);
@media (max-width: 992px) {
height: 100%;
padding-bottom: 100px;
};
}

View File

@@ -23,7 +23,6 @@
min-height: 500px;
height: calc(100% - 150px);
@media (max-width: 992px) {
height: 100%;
padding-bottom: 100px;
};
}

View File

@@ -23,7 +23,6 @@
min-height: 500px;
height: calc(100% - 150px);
@media (max-width: 992px) {
height: 100%;
padding-bottom: 100px;
};
}

View File

@@ -23,7 +23,6 @@
min-height: 500px;
height: calc(100% - 150px);
@media (max-width: 992px) {
height: 100%;
padding-bottom: 100px;
};
}

View File

@@ -346,6 +346,9 @@
</div>
</ng-template>
<ngb-pagination class="pagination-container float-right" [collectionSize]="block.tx_count" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page, blockTxTitle)" [maxSize]="paginationMaxSize" [boundaryLinks]="true" [ellipses]="false"></ngb-pagination>
<div class="clearfix"></div>
<br>
</ng-template>
<ng-template [ngIf]="error">
<div class="text-center">

View File

@@ -616,17 +616,17 @@ export class BlockComponent implements OnInit, OnDestroy {
switch (this.stateService.network) {
case 'testnet':
if (blockHeight < this.stateService.env.TESTNET_BLOCK_AUDIT_START_HEIGHT) {
this.setAuditAvailable(true);
this.setAuditAvailable(false);
}
break;
case 'signet':
if (blockHeight < this.stateService.env.SIGNET_BLOCK_AUDIT_START_HEIGHT) {
this.setAuditAvailable(true);
this.setAuditAvailable(false);
}
break;
default:
if (blockHeight < this.stateService.env.MAINNET_BLOCK_AUDIT_START_HEIGHT) {
this.setAuditAvailable(true);
this.setAuditAvailable(false);
}
}
}

View File

@@ -122,6 +122,9 @@
[collectionSize]="blocksCount" [rotate]="true" [maxSize]="maxSize" [pageSize]="15" [(page)]="page"
(pageChange)="pageChange(page)" [boundaryLinks]="true" [ellipses]="false">
</ngb-pagination>
<div class="clearfix"></div>
<br>
</div>
</div>

View File

@@ -6,7 +6,6 @@
.container-xl {
max-width: 1400px;
padding-bottom: 100px;
}
.container-xl.widget {
padding-left: 0px;

View File

@@ -23,7 +23,6 @@
min-height: 500px;
height: calc(100% - 150px);
@media (max-width: 992px) {
height: 100%;
padding-bottom: 100px;
};
}

View File

@@ -23,7 +23,6 @@
min-height: 500px;
height: calc(100% - 150px);
@media (max-width: 992px) {
height: 100%;
padding-bottom: 100px;
};
}

View File

@@ -1,5 +1,5 @@
.container-graph {
padding: 0px 15px;
padding: 0px 15px 60px;
}
.card-header {

View File

@@ -464,6 +464,8 @@
</ng-template>
</ng-template>
<br>
</div>
<br>