Skip to content

Commit ed50098

Browse files
authored
Merge pull request #108 from coreui/dev-vnext
v2.0.0
2 parents 66bc558 + e286203 commit ed50098

File tree

6 files changed

+339
-78
lines changed

6 files changed

+339
-78
lines changed

Diff for: CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
## [angular](./README.md) version `changelog`
22

3+
###### `v2.0.0`
4+
- fix(dropdowns): dropup misplaced temp fix
5+
- chore: update `@coreui/icons` to `0.3.0`
6+
- refactor(coreui-icons): move to `@coreui/icons v0.3.0`
7+
- update: `@angular/*` to `6.1.6`
8+
- update: `angular-devkit/build-angular` to `0.7.5`
9+
- update: `@angular/cli` to `6.1.5`
10+
- update: `rxjs` to `6.3.0`
11+
- update: `rxjs-compat` to `6.3.0`
12+
- update: `@types/node` to `10.9.4`
13+
- update: `jasmine-core` to `3.2.1`
14+
- update: `karma-coverage-istanbul-reporter` to `2.0.2`
15+
- update: `karma-jasmine-html-reporter` to `1.3.1`
16+
317
###### `v2.0.0-rc.4`
418
- fix(forms): validation classes example closes #95
519
- fix(forms): card-header-actions example

Diff for: package.json

+21-21
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.4",
3+
"version": "2.0.0",
44
"description": "CoreUI Free Angular 2+ Admin Template",
55
"author": {
66
"name": "Łukasz Holeczek",
@@ -27,19 +27,19 @@
2727
},
2828
"private": true,
2929
"dependencies": {
30-
"@angular/animations": "^6.1.2",
31-
"@angular/common": "^6.1.2",
32-
"@angular/compiler": "^6.1.2",
33-
"@angular/core": "^6.1.2",
34-
"@angular/forms": "^6.1.2",
35-
"@angular/http": "^6.1.2",
36-
"@angular/platform-browser": "^6.1.2",
37-
"@angular/platform-browser-dynamic": "^6.1.2",
38-
"@angular/router": "^6.1.2",
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",
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.3.0",
4343
"bootstrap": "^4.1.3",
4444
"chart.js": "^2.7.2",
4545
"core-js": "^2.5.7",
@@ -50,28 +50,28 @@
5050
"ng2-charts": "^1.6.0",
5151
"ngx-bootstrap": "^3.0.1",
5252
"ngx-perfect-scrollbar": "^6.3.0",
53-
"rxjs": "^6.2.2",
54-
"rxjs-compat": "^6.2.2",
53+
"rxjs": "^6.3.0",
54+
"rxjs-compat": "^6.3.0",
5555
"simple-line-icons": "^2.4.1",
5656
"ts-helpers": "^1.1.2",
5757
"zone.js": "^0.8.26"
5858
},
5959
"devDependencies": {
60-
"@angular-devkit/build-angular": "^0.7.3",
61-
"@angular/cli": "^6.1.3",
62-
"@angular/compiler-cli": "^6.1.2",
63-
"@angular/language-service": "^6.1.2",
60+
"@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",
6464
"@types/jasmine": "^2.8.8",
6565
"@types/jasminewd2": "^2.0.3",
66-
"@types/node": "^10.7.0",
66+
"@types/node": "^10.9.4",
6767
"codelyzer": "^4.4.4",
68-
"jasmine-core": "^3.2.0",
68+
"jasmine-core": "^3.2.1",
6969
"jasmine-spec-reporter": "^4.2.1",
7070
"karma": "^3.0.0",
7171
"karma-chrome-launcher": "^2.2.0",
72-
"karma-coverage-istanbul-reporter": "^2.0.1",
72+
"karma-coverage-istanbul-reporter": "^2.0.2",
7373
"karma-jasmine": "^1.1.2",
74-
"karma-jasmine-html-reporter": "^1.3.0",
74+
"karma-jasmine-html-reporter": "^1.3.1",
7575
"protractor": "5.4.0",
7676
"ts-node": "^7.0.1",
7777
"tslint": "^5.11.0",

Diff for: src/app/views/buttons/dropdowns.component.css

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.dropup .dropdown-menu {
2+
transform: none!important;
3+
}

Diff for: src/app/views/buttons/dropdowns.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@
162162
</div>
163163
<div class="card-body">
164164
<div class="btn-group" dropdown [dropup]="isDropup">
165-
<button dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
165+
<button id="button-dropup" dropdownToggle type="button" class="btn btn-primary dropdown-toggle">
166166
Dropup <span class="caret"></span>
167167
</button>
168-
<ul *dropdownMenu class="dropdown-menu" role="menu">
168+
<ul id="dropdown-dropup" *dropdownMenu class="dropdown-menu" role="menu" aria-labelledby="button-dropup">
169169
<li role="menuitem"><a class="dropdown-item" href="#">Action</a></li>
170170
<li role="menuitem"><a class="dropdown-item" href="#">Another action</a>
171171
</li>

Diff for: src/app/views/buttons/dropdowns.component.ts

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
22

33
@Component({
44
templateUrl: 'dropdowns.component.html',
5+
styleUrls: ['dropdowns.component.css']
56
})
67
export class DropdownsComponent {
78

0 commit comments

Comments
 (0)