Skip to content

Commit 31b2955

Browse files
xidedixxidedix
authoredOct 22, 2018
Merge pull request #114 from coreui/dev-vnext
v2.0.1
2 parents df6465e + e15924f commit 31b2955

File tree

6 files changed

+287
-260
lines changed

6 files changed

+287
-260
lines changed
 

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
## [angular](./README.md) version `changelog`
22

3+
###### `v2.0.1`
4+
- refactor(modals): buttons spacing
5+
- refactor(brand-buttons): buttons spacing
6+
- update: `@coreui/coreui` to `2.0.20`
7+
- update: `@angular/*` to `6.1.10`
8+
- update: `@angular/cli` to `6.2.6`
9+
- update: `chart.js` to `2.7.3`
10+
- update: `flag-icon-css` to `3.2.1`
11+
- update: `ngx-perfect-scrollbar` to `6.3.1`
12+
- update: `rxjs` to `6.3.3`
13+
- update: `rxjs-compat` to `6.3.3`
14+
- update: `tsickle` to `0.33.0`
15+
- update: `@types/jasmine` to `2.8.9`
16+
- update: `@types/jasminewd2` to `2.0.5`
17+
- update: `@types/node` to `10.12.0`
18+
- update: `codelyzer` to `4.5.0`
19+
- update: `karma-coverage-istanbul-reporter` to `2.0.4`
20+
- update: `protractor` to `5.4.1`
21+
322
###### `v2.0.0`
423
- fix(dropdowns): dropup misplaced temp fix
524
- chore: update `@coreui/icons` to `0.3.0`

‎package.json

Lines changed: 26 additions & 25 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",
3+
"version": "2.0.1",
44
"description": "CoreUI Free Angular 2+ Admin Template",
55
"author": {
66
"name": "Łukasz Holeczek",
@@ -27,52 +27,53 @@
2727
},
2828
"private": true,
2929
"dependencies": {
30-
"@angular/animations": "^6.1.6",
31-
"@angular/common": "^6.1.6",
32-
"@angular/compiler": "^6.1.6",
33-
"@angular/core": "^6.1.6",
34-
"@angular/forms": "^6.1.6",
35-
"@angular/http": "^6.1.6",
36-
"@angular/platform-browser": "^6.1.6",
37-
"@angular/platform-browser-dynamic": "^6.1.6",
38-
"@angular/router": "^6.1.6",
30+
"@angular/animations": "^6.1.10",
31+
"@angular/common": "^6.1.10",
32+
"@angular/compiler": "^6.1.10",
33+
"@angular/core": "^6.1.10",
34+
"@angular/forms": "^6.1.10",
35+
"@angular/http": "^6.1.10",
36+
"@angular/platform-browser": "^6.1.10",
37+
"@angular/platform-browser-dynamic": "^6.1.10",
38+
"@angular/router": "^6.1.10",
3939
"@coreui/angular": "^2.0.0-rc.1",
40-
"@coreui/coreui": "^2.0.4",
40+
"@coreui/coreui": "^2.0.20",
4141
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
4242
"@coreui/icons": "0.3.0",
4343
"bootstrap": "^4.1.3",
44-
"chart.js": "^2.7.2",
44+
"chart.js": "^2.7.3",
4545
"core-js": "^2.5.7",
46-
"flag-icon-css": "^3.0.0",
46+
"flag-icon-css": "^3.2.1",
4747
"font-awesome": "^4.7.0",
4848
"moment": "^2.22.2",
4949
"mutationobserver-shim": "^0.3.2",
5050
"ng2-charts": "^1.6.0",
5151
"ngx-bootstrap": "^3.0.1",
52-
"ngx-perfect-scrollbar": "^6.3.0",
53-
"rxjs": "^6.3.0",
54-
"rxjs-compat": "^6.3.0",
52+
"ngx-perfect-scrollbar": "^6.3.1",
53+
"rxjs": "^6.3.3",
54+
"rxjs-compat": "^6.3.3",
5555
"simple-line-icons": "^2.4.1",
5656
"ts-helpers": "^1.1.2",
57+
"tsickle": "^0.33.0",
5758
"zone.js": "^0.8.26"
5859
},
5960
"devDependencies": {
6061
"@angular-devkit/build-angular": "^0.7.5",
61-
"@angular/cli": "^6.1.5",
62-
"@angular/compiler-cli": "^6.1.6",
63-
"@angular/language-service": "^6.1.6",
64-
"@types/jasmine": "^2.8.8",
65-
"@types/jasminewd2": "^2.0.3",
66-
"@types/node": "^10.9.4",
67-
"codelyzer": "^4.4.4",
62+
"@angular/cli": "^6.2.6",
63+
"@angular/compiler-cli": "^6.1.10",
64+
"@angular/language-service": "^6.1.10",
65+
"@types/jasmine": "^2.8.9",
66+
"@types/jasminewd2": "^2.0.5",
67+
"@types/node": "^10.12.0",
68+
"codelyzer": "^4.5.0",
6869
"jasmine-core": "^3.2.1",
6970
"jasmine-spec-reporter": "^4.2.1",
7071
"karma": "^3.0.0",
7172
"karma-chrome-launcher": "^2.2.0",
72-
"karma-coverage-istanbul-reporter": "^2.0.2",
73+
"karma-coverage-istanbul-reporter": "^2.0.4",
7374
"karma-jasmine": "^1.1.2",
7475
"karma-jasmine-html-reporter": "^1.3.1",
75-
"protractor": "5.4.0",
76+
"protractor": "^5.4.1",
7677
"ts-node": "^7.0.1",
7778
"tslint": "^5.11.0",
7879
"typescript": "^2.9.2"

‎src/app/views/base/forms.component.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@
140140
<span class="help-block">Please enter a complex password</span>
141141
</div>
142142
</div>
143+
<div class="form-group row">
144+
<label class="col-md-3 col-form-label" for="date-input">Date Input</label>
145+
<div class="col-md-9">
146+
<input class="form-control" id="date-input" type="date" name="date-input" placeholder="date">
147+
<span class="help-block">Please enter a valid date</span>
148+
</div>
149+
</div>
143150
<div class="form-group row">
144151
<label class="col-md-3 col-form-label" for="disabled-input">Disabled Input</label>
145152
<div class="col-md-9">

‎src/app/views/buttons/brand-buttons.component.html

Lines changed: 225 additions & 225 deletions
Large diffs are not rendered by default.

‎src/app/views/notifications/modals.component.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
</div>
88
<div class="card-body">
99
<!-- Button trigger modal -->
10-
<button type="button" class="btn btn-secondary" data-toggle="modal" (click)="myModal.show()">
10+
<button type="button" class="btn btn-secondary mr-1" data-toggle="modal" (click)="myModal.show()">
1111
Launch demo modal
1212
</button>
13-
<button type="button" class="btn btn-secondary" data-toggle="modal" (click)="largeModal.show()">
13+
<button type="button" class="btn btn-secondary mr-1" data-toggle="modal" (click)="largeModal.show()">
1414
Launch large modal
1515
</button>
16-
<button type="button" class="btn btn-secondary" data-toggle="modal" (click)="smallModal.show()">
16+
<button type="button" class="btn btn-secondary mr-1" data-toggle="modal" (click)="smallModal.show()">
1717
Launch small modal
1818
</button>
1919
<hr>
20-
<button type="button" class="btn btn-primary" data-toggle="modal" (click)="primaryModal.show()">
20+
<button type="button" class="btn btn-primary mr-1" data-toggle="modal" (click)="primaryModal.show()">
2121
Primary modal
2222
</button>
23-
<button type="button" class="btn btn-success" data-toggle="modal" (click)="successModal.show()">
23+
<button type="button" class="btn btn-success mr-1" data-toggle="modal" (click)="successModal.show()">
2424
Success modal
2525
</button>
26-
<button type="button" class="btn btn-warning" data-toggle="modal" (click)="warningModal.show()">
26+
<button type="button" class="btn btn-warning mr-1" data-toggle="modal" (click)="warningModal.show()">
2727
Warning modal
2828
</button>
29-
<button type="button" class="btn btn-danger" data-toggle="modal" (click)="dangerModal.show()">
29+
<button type="button" class="btn btn-danger mr-1" data-toggle="modal" (click)="dangerModal.show()">
3030
Danger modal
3131
</button>
32-
<button type="button" class="btn btn-info" data-toggle="modal" (click)="infoModal.show()">
32+
<button type="button" class="btn btn-info mr-1" data-toggle="modal" (click)="infoModal.show()">
3333
Info modal
3434
</button>
3535
</div>

‎src/scss/vendors/_variables.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Override Boostrap variables
22
@import "../variables";
3-
@import "node_modules/bootstrap/scss/mixins";
4-
@import "node_modules/@coreui/coreui/scss/variables";
3+
@import "~bootstrap/scss/mixins";
4+
@import "~@coreui/coreui/scss/variables";

0 commit comments

Comments
 (0)
Please sign in to comment.