Merge branch 'master' into fix/difficulty-api
This commit is contained in:
		
						commit
						52ba1b7910
					
				| @ -1,5 +1,5 @@ | |||||||
| <div [style]="style === 'widget' ? 'height: 250px' : ''"> | <div class="map-wrapper" [class]="style"> | ||||||
|   <div *ngIf="channelsObservable | async"> |   <ng-container *ngIf="channelsObservable | async"> | ||||||
|     <div *ngIf="chartOptions" [class]="'full-container ' + style + (fitContainer ? ' fit-container' : '')"> |     <div *ngIf="chartOptions" [class]="'full-container ' + style + (fitContainer ? ' fit-container' : '')"> | ||||||
|       <div *ngIf="style === 'graph'" class="card-header"> |       <div *ngIf="style === 'graph'" class="card-header"> | ||||||
|         <div class="d-flex d-md-block align-items-baseline" style="margin-bottom: -5px"> |         <div class="d-flex d-md-block align-items-baseline" style="margin-bottom: -5px"> | ||||||
| @ -8,14 +8,15 @@ | |||||||
|         <small style="color: #ffffff66" i18n="lightning.tor-nodes-excluded">(Tor nodes excluded)</small> |         <small style="color: #ffffff66" i18n="lightning.tor-nodes-excluded">(Tor nodes excluded)</small> | ||||||
|       </div> |       </div> | ||||||
| 
 | 
 | ||||||
|     <div class="chart" [class]="style" echarts [initOpts]="chartInitOptions" [options]="chartOptions" (chartInit)="onChartInit($event)" |       <div class="chart" [class]="style" echarts [initOpts]="chartInitOptions" [options]="chartOptions" | ||||||
|       (chartFinished)="onChartFinished($event)"> |         (chartInit)="onChartInit($event)" (chartFinished)="onChartFinished($event)"> | ||||||
|  |       </div> | ||||||
|  | 
 | ||||||
|  |       <div *ngIf="!chartOptions && style === 'nodepage'" style="padding-top: 30px"></div> | ||||||
|     </div> |     </div> | ||||||
| 
 | 
 | ||||||
|     <div *ngIf="!chartOptions && style === 'nodepage'" style="padding-top: 30px"></div> |     <div class="text-center loading-spinner" [class]="style" *ngIf="isLoading"> | ||||||
|   </div> |       <div class="spinner-border text-light"></div> | ||||||
| 
 |     </div> | ||||||
|   <div class="text-center loading-spinner" [class]="style" *ngIf="isLoading"> |   </ng-container> | ||||||
|     <div class="spinner-border text-light"></div> |  | ||||||
|   </div> |  | ||||||
| </div> | </div> | ||||||
| @ -1,3 +1,15 @@ | |||||||
|  | .map-wrapper { | ||||||
|  |   height: 100%; | ||||||
|  | 
 | ||||||
|  |   &.widget { | ||||||
|  |     height: 250px; | ||||||
|  |   } | ||||||
|  | 
 | ||||||
|  |   &.graph { | ||||||
|  |     height: auto; | ||||||
|  |   } | ||||||
|  | } | ||||||
|  | 
 | ||||||
| .card-header { | .card-header { | ||||||
|   border-bottom: 0; |   border-bottom: 0; | ||||||
|   font-size: 18px; |   font-size: 18px; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user