Skip to content

Commit

Permalink
feature(dependencies): add @angular/flex-layout (closes #239) (#334)
Browse files Browse the repository at this point in the history
* chore(): add @angular/flex-layout as dependency

* chore(): add @angular/flex-layout as as a @covalent/core dependency

for the time being, we will be fixed to a specific version since its a beta release.

* feature(paging): leverage flex-layout in paging module.

* feature(search): leverage flex-layout in search module

* revert: chore(): leverage flex-layout in paging module

* revert: chore(): leverage flex-layout in search module
  • Loading branch information
emoralesb05 authored and kyleledbetter committed Feb 15, 2017
1 parent dc7da31 commit 171a69d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"@angular/compiler": "^2.4.5",
"@angular/core": "^2.4.5",
"@angular/forms": "^2.4.5",
"@angular/flex-layout": "2.0.0-beta.5",
"@angular/http": "^2.4.5",
"@angular/material": "2.0.0-beta.1",
"@angular/platform-browser": "^2.4.5",
Expand Down
3 changes: 3 additions & 0 deletions src/platform/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { HttpModule, JsonpModule } from '@angular/http';
import { FormsModule } from '@angular/forms';

import { MaterialModule } from '@angular/material';
import { FlexLayoutModule } from '@angular/flex-layout';

/**
* COMMON
Expand Down Expand Up @@ -118,6 +119,7 @@ export * from './steps/steps.module';
FormsModule,
CommonModule,
MaterialModule.forRoot(),
FlexLayoutModule,
CovalentCommonModule.forRoot(),
CovalentChipsModule.forRoot(),
CovalentDataTableModule.forRoot(),
Expand All @@ -140,6 +142,7 @@ export * from './steps/steps.module';
FormsModule,
CommonModule,
MaterialModule,
FlexLayoutModule,
CovalentCommonModule,
CovalentChipsModule,
CovalentDataTableModule,
Expand Down
1 change: 1 addition & 0 deletions src/platform/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"Jeremy Smartt <[email protected]>"
],
"dependencies": {
"@angular/flex-layout": "2.0.0-beta.5",
"@angular/material": "2.0.0-beta.1"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions src/platform/core/paging/paging-bar.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
}
.td-paging-bar {
height: 48px;
}
[layout="row"] > * {
margin: 0 10px;
> * {
margin: 0 10px;
}
}
[md-icon-button] {
font-size: 12px;
Expand Down

0 comments on commit 171a69d

Please sign in to comment.