Merge branch 'master' into dev-vnext

xidedix · xidedix · commit a1829eb426d5 · 2018-08-13T17:22:10.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,38 @@
 ## [angular](./README.md) version `changelog`
 
-###### `v2.0.0-rc.2`
-- chore: dependencies update
+###### `v2.0.0-rc.3`
 - fix(carousels): move to `loremflickr` image placeholders
 - refactor: code cleanup
 - tests: fix minimal testing
+- update: `@angular/*` to `6.1.2`
+- update: `@angular/cli` to `6.1.3`
+- update: `@angular-devkit/build-angular` to `0.7.3`
+- update: `ngx-perfect-scrollbar` to `6.3.0`
+- update: `rxjs` to `6.2.2`
+- update: `rxjs-compat` to `6.2.2`
+- update: `@types/node` to `10.5.8`
+- update: `codelyzer` to `4.4.3`
+- update: `jasmine-core` to `3.2.0`
+- update: `karma` to `3.0.0`
+- update: `protractor": "5.4.0`
+- update: `ts-node` to `7.0.1`
+- update: `tslint` to `5.11.0`
+
+###### `v2.0.0-rc.2`
+- update: @angular/animations to 6.0.9
+- update: @angular/common to 6.0.9
+- update: @angular/compiler to 6.0.9
+- update: @angular/core to 6.0.9
+- update: @angular/forms to 6.0.9
+- update: @angular/http to 6.0.9
+- update: @angular/platform-browser to 6.0.9
+- update: @angular/platform-browser-dynamic to 6.0.9
+- update: @angular/router to 6.0.9
+- update: @coreui/coreui to 2.0.4
+- update: @coreui/icons to 0.3.0
+- update: bootstrap to 4.1.2
+- update: codelyzer to 4.4.2
+- update: karma-jasmine-html-reporter to 1.2.0
 
 ###### `v2.0.0-rc.1`
 - chore: dependencies update
@@ -15,15 +43,14 @@
 
 ###### `v1.0.9`
 - update: bootstrap to `v4.0.0`
-- update: dependencies 
+- update: dependencies
 
 ###### `v1.0.8`
 - update: bootstrap to `4.0.0-beta.3`
 - update: ngx-bootstrap to `2.0.0-rc.0`
 - fix(forms): duplicate `select` ids, toggleCollapse
-- fix(dashboard): btnRadio 
-- refactor: `input-group-addon` to new `4.0.0-beta.3` classes 
+- fix(dashboard): btnRadio
+- refactor: `input-group-addon` to new `4.0.0-beta.3` classes
 - feature: some Bootstrap4 components added
 - feat: mobile sidebar link click closes the sidebar
 - update: dependencies
-
diff --git a/angular.json b/angular.json
@@ -26,6 +26,9 @@
               "node_modules/simple-line-icons/css/simple-line-icons.css",
               "src/scss/style.scss"
             ],
+            "stylePreprocessorOptions": {
+              "includePaths": ["./node_modules"]
+            },
             "scripts": [
               "node_modules/chart.js/dist/Chart.min.js"
             ]
@@ -83,6 +86,9 @@
               "node_modules/simple-line-icons/css/simple-line-icons.css",
               "src/scss/style.scss"
             ],
+            "stylePreprocessorOptions": {
+              "includePaths": ["./node_modules"]
+            },
             "assets": [
               "src/assets",
               "src/favicon.ico"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/coreui-free-angular-admin-template",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "description": "CoreUI Free Angular 2+ Admin Template",
   "author": {
     "name": "Łukasz Holeczek",
@@ -39,7 +39,8 @@
     "@coreui/angular": "^2.0.0-rc.1",
     "@coreui/coreui": "^2.0.4",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
-    "@coreui/icons": "^0.2.0",
+    "@coreui/icons": "0.2.0",
+    "bootstrap": "^4.1.3",
     "chart.js": "^2.7.2",
     "core-js": "^2.5.7",
     "flag-icon-css": "^3.0.0",
diff --git a/src/index.html b/src/index.html
@@ -15,7 +15,7 @@
   <meta name="description" content="CoreUI - Free Angular Admin Template">
   <meta name="author" content="Łukasz Holeczek">
   <meta name="keyword" content="Bootstrap,Admin,Template,Free,Angular,Dashboard,Typescript">
-	<link rel="shortcut icon" href="assets/img/favicon.ico">
+	<link rel="shortcut icon" href="assets/favicon.ico">
 	<title>CoreUI - Free Angular Admin Template</title>
 </head>
 <body class="app">
diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -2,7 +2,7 @@
 @import "variables";
 
 // Import styles
-@import "node_modules/@coreui/coreui/scss/coreui";
+@import "~@coreui/coreui/scss/coreui";
 
 // If you want to add something do it here
 @import "custom";
diff --git a/src/scss/vendors/_variables.scss b/src/scss/vendors/_variables.scss
@@ -1,7 +1,4 @@
 // Override Boostrap variables
 @import "../variables";
-@import "node_modules/@coreui/coreui/scss/bootstrap-variables";
 @import "node_modules/bootstrap/scss/mixins";
-@import "node_modules/bootstrap/scss/functions";
-@import "node_modules/bootstrap/scss/variables";
 @import "node_modules/@coreui/coreui/scss/variables";
