mirror of
https://github.com/akveo/ngx-admin.git
synced 2025-12-17 16:00:14 +01:00
feat(dependencies): update dependencies, angular 5+, nebular rc.4 (#1477)
This commit is contained in:
parent
630c2496ef
commit
f6e8c57d66
11 changed files with 2436 additions and 2063 deletions
|
|
@ -29,12 +29,6 @@ export class ChartjsPieComponent implements OnDestroy {
|
|||
this.options = {
|
||||
maintainAspectRatio: false,
|
||||
responsive: true,
|
||||
scale: {
|
||||
pointLabels: {
|
||||
fontSize: 14,
|
||||
fontColor: chartjs.textColor,
|
||||
},
|
||||
},
|
||||
scales: {
|
||||
xAxes: [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 {}
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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: [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
@include nb-install-component() {
|
||||
text-align: center;
|
||||
|
||||
.dropdown, .btn-group {
|
||||
.dropdown, .dropup, .btn-group {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ if (environment.production) {
|
|||
}
|
||||
|
||||
platformBrowserDynamic().bootstrapModule(AppModule)
|
||||
.catch(err => console.log(err));
|
||||
.catch(err => console.error(err));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue