Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-02-12 19:34:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	src/app/theme/baCard/index.ts
This commit is contained in:
nixa 2016-05-04 17:19:16 +03:00
commit 673e2430c7
10 changed files with 165 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app/theme/components/baCard/baCard.component.ts
View file

@ -1,8 +1,11 @@
import {Component, ViewEncapsulation, Input} from 'angular2/core';
import {BaCardBlur} from './baCardBlur.directive';
@Component({
selector: 'ba-card',
styles: [require('./baCard.scss')],
directives: [BaCardBlur],
template: require('./baCard.html'),
encapsulation: ViewEncapsulation.None
})

4
src/app/theme/components/baCard/baCard.html
View file

@ -1,8 +1,8 @@
<div class="card {{cardType}} {{baCardClass || ''}}" zoom-in ba-panel-blur>
<div class="card {{cardType}} card-blur {{baCardClass || ''}}" zoom-in baCardBlur>
<div *ngIf="title" class="card-header clearfix">
<h3 class="card-title">{{title}}</h3>
</div>
<div class="card-body">
<ng-content></ng-content>
</div>
</div>
</div>