diff --git a/package.json b/package.json old mode 100755 new mode 100644 index faddf6661..530235ce8 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/src/styles-variables.scss b/src/styles-variables.scss index 1832ede76..0707b7c06 100644 --- a/src/styles-variables.scss +++ b/src/styles-variables.scss @@ -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, diff --git a/src/styles.scss b/src/styles.scss index 350ea4032..24c761f34 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -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();