Merge branch 'master' into simon/configurable-main-module
# Conflicts: # frontend/src/app/components/api-docs/api-docs.component.ts # frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts # frontend/src/app/components/master-page/master-page.component.html # frontend/src/app/components/mempool-blocks/mempool-blocks.component.html # frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts # frontend/src/app/dashboard/dashboard.component.html
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<div class="blocks-container" *ngIf="loadingBlocks">
|
||||
<div class="blocks-container" *ngIf="(loadingBlocks$ | async) === false; else loadingBlocksTemplate">
|
||||
<div *ngFor="let block of blocks; let i = index; trackBy: trackByBlocksFn" >
|
||||
<div class="text-center bitcoin-block mined-block" id="bitcoin-block-{{ block.height }}" [ngStyle]="blockStyles[i]">
|
||||
<a [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }" class="blockLink"> </a>
|
||||
@@ -25,11 +25,13 @@
|
||||
<div [hidden]="!arrowVisible" id="arrow-up" [style.transition]="transition" [ngStyle]="{'left': arrowLeftPx + 'px' }"></div>
|
||||
</div>
|
||||
|
||||
<div class="blocks-container" *ngIf="!loadingBlocks">
|
||||
<div class="flashing">
|
||||
<div *ngFor="let block of blocks; let i = index; trackBy: trackByBlocksFn" >
|
||||
<div class="text-center bitcoin-block mined-block" id="bitcoin-block-{{ block.height }}" [ngStyle]="blockStyles[i]"></div>
|
||||
<ng-template #loadingBlocksTemplate >
|
||||
<div class="blocks-container">
|
||||
<div class="flashing">
|
||||
<div *ngFor="let block of emptyBlocks; let i = index; trackBy: trackByBlocksFn" >
|
||||
<div class="text-center bitcoin-block mined-block" id="bitcoin-block-{{ block.height }}" [ngStyle]="emptyBlockStyles[i]"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user