From c85eae7e4bc2d4338495adef653719e1f46dabf8 Mon Sep 17 00:00:00 2001 From: Alexander Zhukov Date: Fri, 10 Feb 2017 17:28:53 +0300 Subject: [PATCH] fix(tables): fix #700 --- .../charts/components/chartistJs/chartistJs.component.ts | 2 +- src/app/pages/dashboard/pieChart/pieChart.component.ts | 2 +- src/app/pages/register/register.component.ts | 2 +- .../components/smartTables/smartTables.component.ts | 8 ++++---- src/app/pages/ui/components/buttons/buttons.component.ts | 2 +- .../ui/components/typography/typography.component.ts | 3 +-- src/app/theme/components/baSidebar/baSidebar.component.ts | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/app/pages/charts/components/chartistJs/chartistJs.component.ts b/src/app/pages/charts/components/chartistJs/chartistJs.component.ts index 577eadfc81..9579f08191 100644 --- a/src/app/pages/charts/components/chartistJs/chartistJs.component.ts +++ b/src/app/pages/charts/components/chartistJs/chartistJs.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewEncapsulation} from '@angular/core'; +import {Component} from '@angular/core'; import {ChartistJsService} from './chartistJs.service'; import 'style-loader!./chartistJs.scss'; diff --git a/src/app/pages/dashboard/pieChart/pieChart.component.ts b/src/app/pages/dashboard/pieChart/pieChart.component.ts index e009f4d3a5..a453c58c58 100644 --- a/src/app/pages/dashboard/pieChart/pieChart.component.ts +++ b/src/app/pages/dashboard/pieChart/pieChart.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewEncapsulation} from '@angular/core'; +import {Component} from '@angular/core'; import {PieChartService} from './pieChart.service'; diff --git a/src/app/pages/register/register.component.ts b/src/app/pages/register/register.component.ts index 7901c5f073..5c7e490320 100644 --- a/src/app/pages/register/register.component.ts +++ b/src/app/pages/register/register.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewEncapsulation} from '@angular/core'; +import {Component} from '@angular/core'; import {FormGroup, AbstractControl, FormBuilder, Validators} from '@angular/forms'; import {EmailValidator, EqualPasswordsValidator} from '../../theme/validators'; diff --git a/src/app/pages/tables/components/smartTables/smartTables.component.ts b/src/app/pages/tables/components/smartTables/smartTables.component.ts index fc0a196134..8f34c5eec4 100644 --- a/src/app/pages/tables/components/smartTables/smartTables.component.ts +++ b/src/app/pages/tables/components/smartTables/smartTables.component.ts @@ -1,12 +1,12 @@ -import { Component, ViewEncapsulation } from '@angular/core'; +import { Component } from '@angular/core'; import { SmartTablesService } from './smartTables.service'; import { LocalDataSource } from 'ng2-smart-table'; +import 'style-loader!./smartTables.scss'; + @Component({ - selector: 'basic-tables', - encapsulation: ViewEncapsulation.None, - styleUrls: ['./smartTables.scss'], + selector: 'smart-tables', templateUrl: './smartTables.html', }) export class SmartTables { diff --git a/src/app/pages/ui/components/buttons/buttons.component.ts b/src/app/pages/ui/components/buttons/buttons.component.ts index ac5293b2d0..aadb27144f 100644 --- a/src/app/pages/ui/components/buttons/buttons.component.ts +++ b/src/app/pages/ui/components/buttons/buttons.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewEncapsulation} from '@angular/core'; +import {Component} from '@angular/core'; import 'style-loader!./buttons.scss'; diff --git a/src/app/pages/ui/components/typography/typography.component.ts b/src/app/pages/ui/components/typography/typography.component.ts index 65f229844b..4e311bcdc0 100644 --- a/src/app/pages/ui/components/typography/typography.component.ts +++ b/src/app/pages/ui/components/typography/typography.component.ts @@ -1,9 +1,8 @@ -import {Component, ViewEncapsulation} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'typography', - styles: [], templateUrl: './typography.html', }) export class Typography { diff --git a/src/app/theme/components/baSidebar/baSidebar.component.ts b/src/app/theme/components/baSidebar/baSidebar.component.ts index 298641e83e..c80e1ee67b 100644 --- a/src/app/theme/components/baSidebar/baSidebar.component.ts +++ b/src/app/theme/components/baSidebar/baSidebar.component.ts @@ -1,4 +1,4 @@ -import {Component, ElementRef, HostListener, ViewEncapsulation} from '@angular/core'; +import {Component, ElementRef, HostListener} from '@angular/core'; import {GlobalState} from '../../../global.state'; import {layoutSizes} from '../../../theme';