Merge branch 'master' into mononaut/next-block-drift
This commit is contained in:
		
						commit
						b2251d99c9
					
				| @ -205,14 +205,14 @@ | ||||
|   <!-- VISUALIZATIONS --> | ||||
|   <div class="box" *ngIf="!error && webGlEnabled && showAudit"> | ||||
|     <div class="nav nav-tabs" *ngIf="isMobile && showAudit"> | ||||
|       <a class="nav-link" [class.active]="mode === 'projected'" i18n="block.projected" | ||||
|         fragment="projected" (click)="changeMode('projected')">Projected</a> | ||||
|       <a class="nav-link" [class.active]="mode === 'projected'" | ||||
|         fragment="projected" (click)="changeMode('projected')"><ng-container i18n="block.projected">Projected</ng-container>  <span class="badge badge-pill badge-warning" i18n="beta">beta</span></a> | ||||
|       <a class="nav-link" [class.active]="mode === 'actual'" i18n="block.actual" | ||||
|         fragment="actual" (click)="changeMode('actual')">Actual</a> | ||||
|     </div> | ||||
|     <div class="row"> | ||||
|       <div class="col-sm"> | ||||
|         <h3 class="block-subtitle" *ngIf="!isMobile" i18n="block.projected-block">Projected Block</h3> | ||||
|         <h3 class="block-subtitle" *ngIf="!isMobile"><ng-container i18n="block.projected-block">Projected Block</ng-container> <span class="badge badge-pill badge-warning beta" i18n="beta">beta</span></h3> | ||||
|         <div class="block-graph-wrapper"> | ||||
|           <app-block-overview-graph #blockGraphProjected [isLoading]="isLoadingOverview" [resolution]="75" | ||||
|             [blockLimit]="stateService.blockVSize" [orientation]="'top'" [flip]="false" [mirrorTxid]="hoverTx" [auditHighlighting]="showAudit" | ||||
|  | ||||
| @ -227,4 +227,13 @@ h1 { | ||||
|   .ng-fa-icon { | ||||
|     margin-right: 1em; | ||||
|   } | ||||
| } | ||||
| } | ||||
| 
 | ||||
| .beta { | ||||
|   font-size: 10px; | ||||
|   margin: 5p; | ||||
|   padding: 5p; | ||||
|   position: absolute; | ||||
|   top: 11px; | ||||
|   margin-left: 10px; | ||||
| } | ||||
|  | ||||
| @ -42,7 +42,6 @@ | ||||
|       </li> | ||||
|       <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}" id="btn-pools" *ngIf="stateService.env.LIGHTNING"> | ||||
|         <a class="nav-link" [routerLink]="['/lightning' | relativeUrl]" (click)="collapse()"><fa-icon [icon]="['fas', 'bolt']" [fixedWidth]="true" i18n-title="master-page.lightning" title="Lightning Explorer"></fa-icon> | ||||
|           <span class="badge badge-pill badge-warning beta" i18n="beta">beta</span> | ||||
|         </a> | ||||
|       </li> | ||||
|       <li class="nav-item" routerLinkActive="active" id="btn-blocks" *ngIf="!stateService.env.MINING_DASHBOARD"> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user