Skip to content

Commit a1829eb

Browse files
xidedixxidedix
committed
Merge branch 'master' into dev-vnext
2 parents 1142f00 + 409a858 commit a1829eb

File tree

6 files changed

+44
-13
lines changed

6 files changed

+44
-13
lines changed

‎CHANGELOG.md‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,38 @@
11
## [angular](./README.md) version `changelog`
22

3-
###### `v2.0.0-rc.2`
4-
- chore: dependencies update
3+
###### `v2.0.0-rc.3`
54
- fix(carousels): move to `loremflickr` image placeholders
65
- refactor: code cleanup
76
- tests: fix minimal testing
7+
- update: `@angular/*` to `6.1.2`
8+
- update: `@angular/cli` to `6.1.3`
9+
- update: `@angular-devkit/build-angular` to `0.7.3`
10+
- update: `ngx-perfect-scrollbar` to `6.3.0`
11+
- update: `rxjs` to `6.2.2`
12+
- update: `rxjs-compat` to `6.2.2`
13+
- update: `@types/node` to `10.5.8`
14+
- update: `codelyzer` to `4.4.3`
15+
- update: `jasmine-core` to `3.2.0`
16+
- update: `karma` to `3.0.0`
17+
- update: `protractor": "5.4.0`
18+
- update: `ts-node` to `7.0.1`
19+
- update: `tslint` to `5.11.0`
20+
21+
###### `v2.0.0-rc.2`
22+
- update: @angular/animations to 6.0.9
23+
- update: @angular/common to 6.0.9
24+
- update: @angular/compiler to 6.0.9
25+
- update: @angular/core to 6.0.9
26+
- update: @angular/forms to 6.0.9
27+
- update: @angular/http to 6.0.9
28+
- update: @angular/platform-browser to 6.0.9
29+
- update: @angular/platform-browser-dynamic to 6.0.9
30+
- update: @angular/router to 6.0.9
31+
- update: @coreui/coreui to 2.0.4
32+
- update: @coreui/icons to 0.3.0
33+
- update: bootstrap to 4.1.2
34+
- update: codelyzer to 4.4.2
35+
- update: karma-jasmine-html-reporter to 1.2.0
836

937
###### `v2.0.0-rc.1`
1038
- chore: dependencies update
@@ -15,15 +43,14 @@
1543

1644
###### `v1.0.9`
1745
- update: bootstrap to `v4.0.0`
18-
- update: dependencies
46+
- update: dependencies
1947

2048
###### `v1.0.8`
2149
- update: bootstrap to `4.0.0-beta.3`
2250
- update: ngx-bootstrap to `2.0.0-rc.0`
2351
- fix(forms): duplicate `select` ids, toggleCollapse
24-
- fix(dashboard): btnRadio
25-
- refactor: `input-group-addon` to new `4.0.0-beta.3` classes
52+
- fix(dashboard): btnRadio
53+
- refactor: `input-group-addon` to new `4.0.0-beta.3` classes
2654
- feature: some Bootstrap4 components added
2755
- feat: mobile sidebar link click closes the sidebar
2856
- update: dependencies
29-

‎angular.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
"node_modules/simple-line-icons/css/simple-line-icons.css",
2727
"src/scss/style.scss"
2828
],
29+
"stylePreprocessorOptions": {
30+
"includePaths": ["./node_modules"]
31+
},
2932
"scripts": [
3033
"node_modules/chart.js/dist/Chart.min.js"
3134
]
@@ -83,6 +86,9 @@
8386
"node_modules/simple-line-icons/css/simple-line-icons.css",
8487
"src/scss/style.scss"
8588
],
89+
"stylePreprocessorOptions": {
90+
"includePaths": ["./node_modules"]
91+
},
8692
"assets": [
8793
"src/assets",
8894
"src/favicon.ico"

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-angular-admin-template",
3-
"version": "2.0.0-rc.2",
3+
"version": "2.0.0-rc.3",
44
"description": "CoreUI Free Angular 2+ Admin Template",
55
"author": {
66
"name": "Łukasz Holeczek",
@@ -39,7 +39,8 @@
3939
"@coreui/angular": "^2.0.0-rc.1",
4040
"@coreui/coreui": "^2.0.4",
4141
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
42-
"@coreui/icons": "^0.2.0",
42+
"@coreui/icons": "0.2.0",
43+
"bootstrap": "^4.1.3",
4344
"chart.js": "^2.7.2",
4445
"core-js": "^2.5.7",
4546
"flag-icon-css": "^3.0.0",

‎src/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<meta name="description" content="CoreUI - Free Angular Admin Template">
1616
<meta name="author" content="Łukasz Holeczek">
1717
<meta name="keyword" content="Bootstrap,Admin,Template,Free,Angular,Dashboard,Typescript">
18-
<link rel="shortcut icon" href="assets/img/favicon.ico">
18+
<link rel="shortcut icon" href="assets/favicon.ico">
1919
<title>CoreUI - Free Angular Admin Template</title>
2020
</head>
2121
<body class="app">

‎src/scss/style.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@import "variables";
33

44
// Import styles
5-
@import "node_modules/@coreui/coreui/scss/coreui";
5+
@import "~@coreui/coreui/scss/coreui";
66

77
// If you want to add something do it here
88
@import "custom";

‎src/scss/vendors/_variables.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
// Override Boostrap variables
22
@import "../variables";
3-
@import "node_modules/@coreui/coreui/scss/bootstrap-variables";
43
@import "node_modules/bootstrap/scss/mixins";
5-
@import "node_modules/bootstrap/scss/functions";
6-
@import "node_modules/bootstrap/scss/variables";
74
@import "node_modules/@coreui/coreui/scss/variables";

0 commit comments

Comments
 (0)