Skip to content

Commit

Permalink
feat(dependency): use angular 5.1, material 5.0 and CLI 1.6, standard…
Browse files Browse the repository at this point in the history
…ize paths in styles
  • Loading branch information
tomastrajan committed Dec 6, 2017
1 parent 110613d commit 8758cb3
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
26 changes: 13 additions & 13 deletions package.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^5.0.0",
"@angular/cdk": "^5.0.0-rc0",
"@angular/common": "^5.0.0",
"@angular/compiler": "^5.0.0",
"@angular/core": "^5.0.0",
"@angular/forms": "^5.0.0",
"@angular/http": "^5.0.0",
"@angular/material": "^5.0.0-rc0",
"@angular/platform-browser": "^5.0.0",
"@angular/platform-browser-dynamic": "^5.0.0",
"@angular/router": "^5.0.0",
"@angular/animations": "^5.1.0",
"@angular/cdk": "^5.0.0",
"@angular/common": "^5.1.0",
"@angular/compiler": "^5.1.0",
"@angular/core": "^5.1.0",
"@angular/forms": "^5.1.0",
"@angular/http": "^5.1.0",
"@angular/material": "^5.0.0",
"@angular/platform-browser": "^5.1.0",
"@angular/platform-browser-dynamic": "^5.1.0",
"@angular/router": "^5.1.0",
"@ngrx/effects": "^4.0.0",
"@ngrx/router-store": "^4.0.0",
"@ngrx/store": "^4.0.0",
Expand All @@ -46,8 +46,8 @@
"zone.js": "0.8.12"
},
"devDependencies": {
"@angular/cli": "1.5.0",
"@angular/compiler-cli": "^5.0.0",
"@angular/cli": "1.6.0",
"@angular/compiler-cli": "^5.1.0",
"@types/jasmine": "2.5.38",
"@types/node": "~6.0.60",
"codelyzer": "~2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/styles-variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$toolbar-breakpoint: 600px;

$fa-font-path: '~font-awesome/fonts';
$fa-font-path: '../node_modules/font-awesome/fonts';

$grid-breakpoints: (
xs: 0,
Expand Down
10 changes: 5 additions & 5 deletions src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@import 'styles-variables';

@import '~bootstrap/scss/bootstrap-reboot';
@import '~bootstrap/scss/bootstrap-grid';
@import '~bootstrap/scss/utilities';
@import '../node_modules/bootstrap/scss/bootstrap-reboot';
@import '../node_modules/bootstrap/scss/bootstrap-grid';
@import '../node_modules/bootstrap/scss/utilities';

@import '~font-awesome/scss/font-awesome';
@import '../node_modules/font-awesome/scss/font-awesome';

@import 'styles-reset';

@import '~@angular/material/theming';
@import '../node_modules/@angular/material/theming';

@include mat-core();

Expand Down

0 comments on commit 8758cb3

Please sign in to comment.