Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-02-17 05:28:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update to Angular 8, Nebular 4 (#2114)

Browse source
This commit is contained in:
Dmitry Nehaychik 2019-07-02 16:18:09 +03:00 • committed by Sergey Andrievskiy
parent 537e6a77b0
commit e9600b4a07
323 changed files with 7421 additions and 14161 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/pages/maps/bubble/bubble-map.component.scss
View file

@ -3,7 +3,7 @@
@include nb-install-component() {
nb-card-body {
padding: nb-theme(card-padding) 0 0 0;
padding-top: 1.25rem;
}
.echarts {

8
src/app/pages/maps/bubble/bubble-map.component.ts
View file

@ -10,10 +10,8 @@ import { registerMap } from 'echarts';
styleUrls: ['./bubble-map.component.scss'],
template: `
<nb-card>
<nb-card-header>Bubble Maps</nb-card-header>
<nb-card-body>
<div echarts [options]="options" class="echarts"></div>
</nb-card-body>
<nb-card-header>Bubble Maps</nb-card-header>
<div echarts [options]="options" class="echarts"></div>
</nb-card>
`,
})
@ -473,7 +471,7 @@ export class BubbleMapComponent implements OnDestroy {
title: {
text: 'World Population (2011)',
left: 'center',
top: 'top',
top: '16px',
textStyle: {
color: this.bubbleTheme.titleColor,
},

2
src/app/pages/maps/gmaps/gmaps.component.scss
View file

@ -6,7 +6,7 @@
padding: 0;
}
/deep/ agm-map {
::ng-deep agm-map {
width: 100%;
height: nb-theme(card-height-large);
}

4
src/app/pages/maps/leaflet/leaflet.component.scss
View file

@ -6,11 +6,11 @@
padding: 0;
}
/deep/ .leaflet-top, /deep/ .leaflet-bottom {
::ng-deep .leaflet-top, ::ng-deep .leaflet-bottom {
z-index: 997;
}
/deep/ .leaflet-container {
::ng-deep .leaflet-container {
width: 100%;
height: nb-theme(card-height-large);
}

2
src/app/pages/maps/maps.module.ts
View file

@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { AgmCoreModule } from '@agm/core';
import { LeafletModule } from '@asymmetrik/ngx-leaflet';
import { NgxEchartsModule } from 'ngx-echarts';
import { NbCardModule } from '@nebular/theme';
import { ThemeModule } from '../../@theme/theme.module';
import { MapsRoutingModule, routedComponents } from './maps-routing.module';
@ -16,6 +17,7 @@ import { MapsRoutingModule, routedComponents } from './maps-routing.module';
LeafletModule.forRoot(),
MapsRoutingModule,
NgxEchartsModule,
NbCardModule,
],
exports: [],
declarations: [

2
src/app/pages/maps/search-map/map/map.component.scss
View file

@ -6,7 +6,7 @@
padding: 0;
}
/deep/ agm-map {
::ng-deep agm-map {
width: 100%;
height: nb-theme(card-height-large);
}

2
src/app/pages/maps/search-map/search/search.component.ts
View file

@ -11,7 +11,7 @@ export class SearchComponent implements OnInit {
@Output() positionChanged = new EventEmitter<Location>();
@ViewChild('search')
@ViewChild('search', { static: true })
public searchElementRef: ElementRef;
constructor(private mapsAPILoader: MapsAPILoader,