Skip to content

Commit

Permalink
fix(aot): fix styles import
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Zhukov committed Jan 27, 2017
1 parent c15fee6 commit 3fa775f
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 50 deletions.
4 changes: 1 addition & 3 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Routes } from '@angular/router';
import { Component, ViewEncapsulation, ViewContainerRef } from '@angular/core';
import { Component, ViewContainerRef } from '@angular/core';

import { GlobalState } from './global.state';
import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from './theme/services';
Expand All @@ -18,8 +18,6 @@ import 'style-loader!./theme/initial.scss';
*/
@Component({
selector: 'app',
// // encapsulation: ViewEncapsulation.None,
// styleUrls: ['./app.scss'],
template: `
<main [ngClass]="{'menu-collapsed': isMenuCollapsed}" baThemeRun>
<div class="additional-bg"></div>
Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/dashboard/calendar/calendar.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';

import {CalendarService} from './calendar.service';
import 'style-loader!./calendar.scss';

@Component({
selector: 'calendar',
// // encapsulation: ViewEncapsulation.None,
templateUrl: './calendar.html'
})
export class Calendar {
Expand Down
6 changes: 3 additions & 3 deletions src/app/pages/dashboard/feed/feed.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';

import {FeedService} from './feed.service';

import 'style-loader!./feed.scss';

@Component({
selector: 'feed',
// // encapsulation: ViewEncapsulation.None,
styleUrls: ['./feed.scss'],
templateUrl: './feed.html'
})
export class Feed {
Expand Down
6 changes: 3 additions & 3 deletions src/app/pages/dashboard/todo/todo.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';
import {BaThemeConfigProvider} from '../../../theme';

import {TodoService} from './todo.service';

import 'style-loader!./todo.scss';

@Component({
selector: 'todo',
// encapsulation: ViewEncapsulation.None,
styleUrls: ['./todo.scss'],
templateUrl: './todo.html'
})
export class Todo {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
import {Component} from '@angular/core';

import './trafficChart.loader.ts';
import {TrafficChartService} from './trafficChart.service';
import * as Chart from 'chart.js';

import 'style-loader!./trafficChart.scss';

@Component({
selector: 'traffic-chart',
// encapsulation: ViewEncapsulation.None,
styleUrls: ['./trafficChart.scss'],
templateUrl: './trafficChart.html'
})

Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/forms/components/inputs/inputs.component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';

@Component({
selector: 'inputs',
// encapsulation: ViewEncapsulation.None,
templateUrl: './inputs.html',
})
export class Inputs {
Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/forms/components/layouts/layouts.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';
import { NgUploaderOptions } from 'ngx-uploader';

@Component({
selector: 'layouts',
// encapsulation: ViewEncapsulation.None,
styles: [],
templateUrl: './layouts.html',
})
Expand Down
6 changes: 3 additions & 3 deletions src/app/pages/login/login.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';
import {FormGroup, AbstractControl, FormBuilder, Validators} from '@angular/forms';

import 'style-loader!./login.scss';

@Component({
selector: 'login',
// encapsulation: ViewEncapsulation.None,
styleUrls: ['./login.scss'],
templateUrl: './login.html',
})
export class Login {
Expand Down
3 changes: 1 addition & 2 deletions src/app/pages/pages.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';
@Component({
selector: 'pages',
// encapsulation: ViewEncapsulation.None,
styles: [],
template: `
<ba-sidebar></ba-sidebar>
Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/register/register.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import {Component, ViewEncapsulation} from '@angular/core';
import {FormGroup, AbstractControl, FormBuilder, Validators} from '@angular/forms';
import {EmailValidator, EqualPasswordsValidator} from '../../theme/validators';

import 'style-loader!./register.scss';

@Component({
selector: 'register',
// encapsulation: ViewEncapsulation.None,
styleUrls: ['./register.scss'],
templateUrl: './register.html',
})
export class Register {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';

import 'style-loader!./basicTables.scss';

@Component({
selector: 'basic-tables',
// encapsulation: ViewEncapsulation.None,
styleUrls: ['./basicTables.scss'],
templateUrl: './basicTables.html'
})
export class BasicTables {
Expand Down
6 changes: 3 additions & 3 deletions src/app/pages/ui/components/grid/grid.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';

import 'style-loader!./grid.scss';

@Component({
selector: 'grid',
// encapsulation: ViewEncapsulation.None,
styleUrls: ['./grid.scss'],
templateUrl: './grid.html',
})
export class Grid {
Expand Down
6 changes: 3 additions & 3 deletions src/app/pages/ui/components/icons/icons.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';

import {IconsService} from './icons.service';

import 'style-loader!./icons.scss';

@Component({
selector: 'icons',
// encapsulation: ViewEncapsulation.None,
styleUrls: ['./icons.scss'],
templateUrl: './icons.html',
})
export class Icons {
Expand Down
6 changes: 3 additions & 3 deletions src/app/theme/components/baAmChart/baAmChart.component.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import {Component, ViewChild, ViewEncapsulation, Input, Output, ElementRef, EventEmitter} from '@angular/core';
import {Component, ViewChild, Input, Output, ElementRef, EventEmitter} from '@angular/core';

import {BaThemePreloader} from '../../../theme/services';

import './baAmChart.loader.ts';
import {BaAmChartThemeService} from './baAmChartTheme.service';

import 'style-loader!./baAmChart.scss';

@Component({
selector: 'ba-am-chart',
templateUrl: './baAmChart.html',
styleUrls: ['./baAmChart.scss'],
// // encapsulation: ViewEncapsulation.None,
providers: [BaAmChartThemeService],
})
export class BaAmChart {
Expand Down
3 changes: 1 addition & 2 deletions src/app/theme/components/baCard/baCard.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import {Component, ViewEncapsulation, ViewChild, Input} from '@angular/core';
import {Component, Input} from '@angular/core';

@Component({
selector: 'ba-card',
templateUrl: './baCard.html',
// encapsulation: ViewEncapsulation.None
})
export class BaCard {
@Input() title:String;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import {Component, ViewChild, ViewEncapsulation, Input, Output, ElementRef, EventEmitter} from '@angular/core';
import {Component, ViewChild, Input, Output, ElementRef, EventEmitter} from '@angular/core';

import './baFullCalendar.loader.ts';

import 'style-loader!./baFullCalendar.scss';

@Component({
selector: 'ba-full-calendar',
templateUrl: './baFullCalendar.html',
// // encapsulation: ViewEncapsulation.None,
})
export class BaFullCalendar {

Expand Down
6 changes: 3 additions & 3 deletions src/app/theme/components/baMenu/baMenu.component.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Component, ViewEncapsulation, Input, Output, EventEmitter } from '@angular/core';
import { Component, Input, Output, EventEmitter } from '@angular/core';
import { Router, NavigationEnd } from '@angular/router';
import { Subscription } from 'rxjs/Rx';

import { BaMenuService } from '../../services';
import { GlobalState } from '../../../global.state';

import 'style-loader!./baMenu.scss';

@Component({
selector: 'ba-menu',
// // encapsulation: ViewEncapsulation.None,
styleUrls: ['./baMenu.scss'],
templateUrl: './baMenu.html'
})
export class BaMenu {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {Component, ViewEncapsulation, Input, Output, EventEmitter} from '@angular/core';
import {Component, Input, Output, EventEmitter} from '@angular/core';

import 'style-loader!./baMenuItem.scss';

@Component({
selector: 'ba-menu-item',
// // encapsulation: ViewEncapsulation.None,
styleUrls: ['./baMenuItem.scss'],
templateUrl: './baMenuItem.html'
})
export class BaMenuItem {
Expand Down
6 changes: 3 additions & 3 deletions src/app/theme/components/baPageTop/baPageTop.component.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {Component} from '@angular/core';

import {GlobalState} from '../../../global.state';

import 'style-loader!./baPageTop.scss';

@Component({
selector: 'ba-page-top',
styleUrls: ['./baPageTop.scss'],
templateUrl: './baPageTop.html',
// encapsulation: ViewEncapsulation.None
})
export class BaPageTop {

Expand Down

0 comments on commit 3fa775f

Please sign in to comment.