feat(dependencies): update dependencies, angular 5+, nebular rc.4 (#1477)

This commit is contained in:
Dmitry Nehaychik 2018-01-04 15:49:27 +03:00 committed by GitHub
parent 630c2496ef
commit f6e8c57d66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 2436 additions and 2063 deletions

View file

@ -29,12 +29,6 @@ export class ChartjsPieComponent implements OnDestroy {
this.options = {
maintainAspectRatio: false,
responsive: true,
scale: {
pointLabels: {
fontSize: 14,
fontColor: chartjs.textColor,
},
},
scales: {
xAxes: [
{

View file

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { AngularEchartsModule } from 'ngx-echarts';
import { NgxEchartsModule } from 'ngx-echarts';
import { NgxChartsModule } from '@swimlane/ngx-charts';
import { ChartModule } from 'angular2-chartjs';
@ -49,7 +49,7 @@ const components = [
];
@NgModule({
imports: [ThemeModule, ChartsRoutingModule, AngularEchartsModule, NgxChartsModule, ChartModule],
imports: [ThemeModule, ChartsRoutingModule, NgxEchartsModule, NgxChartsModule, ChartModule],
declarations: [...routedComponents, ...components],
})
export class ChartsModule {}

View file

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { AngularEchartsModule } from 'ngx-echarts';
import { NgxEchartsModule } from 'ngx-echarts';
import { ThemeModule } from '../../@theme/theme.module';
import { DashboardComponent } from './dashboard.component';
@ -24,7 +24,7 @@ import { TrafficChartComponent } from './traffic/traffic-chart.component';
@NgModule({
imports: [
ThemeModule,
AngularEchartsModule,
NgxEchartsModule,
],
declarations: [
DashboardComponent,

View file

@ -3,7 +3,7 @@
@include nb-install-component() {
.team-photo {
background-image: url('~/assets/images/team.png');
background-image: url('/assets/images/team.png');
background-position: center;
background-size: cover;
position: relative;

View file

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { AgmCoreModule } from '@agm/core';
import { LeafletModule } from '@asymmetrik/angular2-leaflet';
import { AngularEchartsModule } from 'ngx-echarts';
import { LeafletModule } from '@asymmetrik/ngx-leaflet';
import { NgxEchartsModule } from 'ngx-echarts';
import { ThemeModule } from '../../@theme/theme.module';
import { MapsRoutingModule, routedComponents } from './maps-routing.module';
@ -12,7 +12,7 @@ import { MapsRoutingModule, routedComponents } from './maps-routing.module';
AgmCoreModule.forRoot(),
LeafletModule.forRoot(),
MapsRoutingModule,
AngularEchartsModule,
NgxEchartsModule,
],
exports: [],
declarations: [

View file

@ -3,7 +3,7 @@
@include nb-install-component() {
text-align: center;
.dropdown, .btn-group {
.dropdown, .dropup, .btn-group {
margin-bottom: 1rem;
}

View file

@ -14,4 +14,4 @@ if (environment.production) {
}
platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.log(err));
.catch(err => console.error(err));