mirror of
https://github.com/akveo/ngx-admin.git
synced 2026-01-17 06:55:30 +01:00
Merge branch 'master' into develop/router
Conflicts: package.json
This commit is contained in:
commit
5b66c255ad
9 changed files with 48 additions and 5 deletions
|
|
@ -1,5 +1,4 @@
|
|||
import {Component, ViewEncapsulation, Input} from '@angular/core';
|
||||
|
||||
import {Component, ViewEncapsulation, ViewChild, Input} from '@angular/core';
|
||||
import {BaCardBlur} from './baCardBlur.directive';
|
||||
|
||||
@Component({
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
export * from './baCard.component.ts';
|
||||
export * from './baCardBlur.directive';
|
||||
export * from './baCard.component';
|
||||
|
|
|
|||
|
|
@ -582,3 +582,11 @@ label.custom-input-danger {
|
|||
.sub-little-text {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.rating {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
rating-inputs span {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue