Skip to content

Commit 4901aad

Browse files
committed
Update to 1.0.5
1 parent 7869b54 commit 4901aad

File tree

10 files changed

+56
-213
lines changed

10 files changed

+56
-213
lines changed

Diff for: Angular4_CLI_Full_Project/.angular-cli.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
4-
"version": "1.0.4",
4+
"version": "1.0.5",
55
"name": "@coreui/angular"
66
},
77
"apps": [

Diff for: Angular4_CLI_Full_Project/package.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/angular",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -16,33 +16,33 @@
1616
},
1717
"private": true,
1818
"dependencies": {
19-
"@angular/common": "4.4.4",
20-
"@angular/compiler": "4.4.4",
21-
"@angular/core": "4.4.4",
22-
"@angular/forms": "4.4.4",
23-
"@angular/http": "4.4.4",
24-
"@angular/platform-browser": "4.4.4",
25-
"@angular/platform-browser-dynamic": "4.4.4",
26-
"@angular/router": "4.4.4",
27-
"@angular/upgrade": "4.4.4",
19+
"@angular/common": "5.0.1",
20+
"@angular/compiler": "5.0.1",
21+
"@angular/core": "5.0.1",
22+
"@angular/forms": "5.0.1",
23+
"@angular/http": "5.0.1",
24+
"@angular/platform-browser": "5.0.1",
25+
"@angular/platform-browser-dynamic": "5.0.1",
26+
"@angular/router": "5.0.1",
27+
"@angular/upgrade": "5.0.1",
2828
"bootstrap": "4.0.0-beta.2",
29-
"chart.js": "2.7.0",
29+
"chart.js": "2.7.1",
3030
"core-js": "2.5.1",
3131
"font-awesome": "^4.7.0",
3232
"moment": "2.19.1",
3333
"ng2-charts": "1.6.0",
3434
"ngx-bootstrap": "1.9.3",
35-
"rxjs": "5.4.3",
35+
"rxjs": "5.5.2",
3636
"simple-line-icons": "^2.4.1",
3737
"ts-helpers": "1.1.2",
3838
"zone.js": "0.8.18"
3939
},
4040
"devDependencies": {
41-
"@angular/cli": "1.4.6",
42-
"@angular/compiler-cli": "4.4.4",
43-
"@types/jasmine": "2.6.0",
44-
"@types/node": "8.0.34",
45-
"codelyzer": "3.2.1",
41+
"@angular/cli": "1.5.0",
42+
"@angular/compiler-cli": "5.0.1",
43+
"@types/jasmine": "2.6.3",
44+
"@types/node": "8.0.50",
45+
"codelyzer": "4.0.1",
4646
"jasmine-core": "2.8.0",
4747
"jasmine-spec-reporter": "4.2.1",
4848
"karma": "1.7.1",
@@ -51,10 +51,10 @@
5151
"karma-jasmine": "1.1.0",
5252
"karma-jasmine-html-reporter": "0.2.2",
5353
"karma-coverage-istanbul-reporter": "1.3.0",
54-
"protractor": "5.1.2",
54+
"protractor": "5.2.0",
5555
"ts-node": "3.3.0",
56-
"tslint": "5.7.0",
57-
"typescript": "2.5.3"
56+
"tslint": "5.8.0",
57+
"typescript": "2.6.1"
5858
},
5959
"engines": {
6060
"node": ">= 6.9.0",

Diff for: Angular4_CLI_Full_Project/src/app/components/app-header/app-header.component.html

+5-160
Original file line numberDiff line numberDiff line change
@@ -18,172 +18,17 @@
1818
</li>
1919
</ul>
2020
<ul class="nav navbar-nav ml-auto">
21-
<li class="nav-item dropdown d-md-down-none" dropdown placement="bottom right">
22-
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" dropdownToggle (click)="false">
23-
<i class="icon-bell"></i><span class="badge badge-pill badge-danger">5</span>
24-
</a>
25-
<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg" *dropdownMenu aria-labelledby="simple-dropdown">
26-
<div class="dropdown-header text-center"><strong>You have 5 notifications</strong></div>
27-
<a href="#" class="dropdown-item">
28-
<i class="icon-user-follow text-success"></i> New user registered
29-
</a>
30-
<a href="#" class="dropdown-item">
31-
<i class="icon-user-unfollow text-danger"></i> User deleted
32-
</a>
33-
<a href="#" class="dropdown-item">
34-
<i class="icon-chart text-info"></i> Sales report is ready
35-
</a>
36-
<a href="#" class="dropdown-item">
37-
<i class="icon-basket-loaded text-primary"></i> New client
38-
</a>
39-
<a href="#" class="dropdown-item">
40-
<i class="icon-speedometer text-warning"></i> Server overloaded
41-
</a>
42-
<div class="dropdown-header text-center"><strong>Server</strong></div>
43-
<a href="#" class="dropdown-item">
44-
<div class="text-uppercase mb-1"><small><b>CPU Usage</b></small></div>
45-
<span class="progress progress-xs">
46-
<div class="progress-bar bg-info" role="progressbar" style="width: 25%" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100"></div>
47-
</span>
48-
<small class="text-muted">348 Processes. 1/4 Cores.</small>
49-
</a>
50-
<a href="#" class="dropdown-item">
51-
<div class="text-uppercase mb-1"><small><b>Memory Usage</b></small></div>
52-
<span class="progress progress-xs">
53-
<div class="progress-bar bg-warning" role="progressbar" style="width: 70%" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100"></div>
54-
</span>
55-
<small class="text-muted">11444GB/16384MB</small>
56-
</a>
57-
<a href="#" class="dropdown-item">
58-
<div class="text-uppercase mb-1"><small><b>SSD 1 Usage</b></small></div>
59-
<span class="progress progress-xs">
60-
<div class="progress-bar bg-danger" role="progressbar" style="width: 95%" aria-valuenow="95" aria-valuemin="0" aria-valuemax="100"></div>
61-
</span>
62-
<small class="text-muted">243GB/256GB</small>
63-
</a>
64-
</div>
65-
</li>
66-
<li class="nav-item dropdown d-md-down-none" dropdown placement="bottom right">
67-
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" dropdownToggle (click)="false">
68-
<i class="icon-list"></i><span class="badge badge-pill badge-warning">15</span>
69-
</a>
70-
<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg" *dropdownMenu aria-labelledby="simple-dropdown">
71-
<div class="dropdown-header text-center"><strong>You have 5 pending tasks</strong></div>
72-
<a href="#" class="dropdown-item">
73-
<div class="small mb-1">Upgrade NPM &amp; Bower <span class="float-right"><strong>0%</strong></span></div>
74-
<span class="progress progress-xs">
75-
<div class="progress-bar bg-info" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
76-
</span>
77-
</a>
78-
<a href="#" class="dropdown-item">
79-
<div class="small mb-1">ReactJS Version <span class="float-right"><strong>25%</strong></span></div>
80-
<span class="progress progress-xs">
81-
<div class="progress-bar bg-danger" role="progressbar" style="width: 25%" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100"></div>
82-
</span>
83-
</a>
84-
<a href="#" class="dropdown-item">
85-
<div class="small mb-1">VueJS Version <span class="float-right"><strong>50%</strong></span></div>
86-
<span class="progress progress-xs">
87-
<div class="progress-bar bg-warning" role="progressbar" style="width: 50%" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
88-
</span>
89-
</a>
90-
<a href="#" class="dropdown-item">
91-
<div class="small mb-1">Add new layouts <span class="float-right"><strong>75%</strong></span></div>
92-
<span class="progress progress-xs">
93-
<div class="progress-bar bg-info" role="progressbar" style="width: 75%" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100"></div>
94-
</span>
95-
</a>
96-
<a href="#" class="dropdown-item">
97-
<div class="small mb-1">Angular 2 Cli Version <span class="float-right"><strong>100%</strong></span></div>
98-
<span class="progress progress-xs">
99-
<div class="progress-bar bg-success" role="progressbar" style="width: 100%" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
100-
</span>
101-
</a>
102-
<a href="#" class="dropdown-item text-center">
103-
<strong>View all tasks</strong>
104-
</a>
105-
</div>
21+
<li class="nav-item d-md-down-none">
22+
<a class="nav-link" href="#"><i class="icon-bell"></i><span class="badge badge-pill badge-danger">5</span></a>
10623
</li>
107-
<li class="nav-item dropdown d-md-down-none" dropdown placement="bottom right">
108-
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" dropdownToggle (click)="false">
109-
<i class="icon-envelope-letter"></i><span class="badge badge-pill badge-info">7</span>
110-
</a>
111-
<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg" *dropdownMenu aria-labelledby="simple-dropdown">
112-
<div class="dropdown-header text-center"><strong>You have 4 messages</strong></div>
113-
<a href="#" class="dropdown-item">
114-
<div class="message">
115-
<div class="py-3 mr-3 float-left">
116-
<div class="avatar">
117-
<img src="assets/img/avatars/7.jpg" class="img-avatar" alt="[email protected]">
118-
<span class="avatar-status badge-success"></span>
119-
</div>
120-
</div>
121-
<div>
122-
<small class="text-muted">John Doe</small>
123-
<small class="text-muted float-right mt-1">Just now</small>
124-
</div>
125-
<div class="text-truncate font-weight-bold"><span class="fa fa-exclamation text-danger"></span> Important message</div>
126-
<div class="small text-muted text-truncate">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt...</div>
127-
</div>
128-
</a>
129-
<a href="#" class="dropdown-item">
130-
<div class="message">
131-
<div class="py-3 mr-3 float-left">
132-
<div class="avatar">
133-
<img src="assets/img/avatars/6.jpg" class="img-avatar" alt="[email protected]">
134-
<span class="avatar-status badge-warning"></span>
135-
</div>
136-
</div>
137-
<div>
138-
<small class="text-muted">John Doe</small>
139-
<small class="text-muted float-right mt-1">5 minutes ago</small>
140-
</div>
141-
<div class="text-truncate font-weight-bold">Lorem ipsum dolor sit amet</div>
142-
<div class="small text-muted text-truncate">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt...</div>
143-
</div>
144-
</a>
145-
<a href="#" class="dropdown-item">
146-
<div class="message">
147-
<div class="py-3 mr-3 float-left">
148-
<div class="avatar">
149-
<img src="assets/img/avatars/5.jpg" class="img-avatar" alt="[email protected]">
150-
<span class="avatar-status badge-danger"></span>
151-
</div>
152-
</div>
153-
<div>
154-
<small class="text-muted">John Doe</small>
155-
<small class="text-muted float-right mt-1">1:52 PM</small>
156-
</div>
157-
<div class="text-truncate font-weight-bold">Lorem ipsum dolor sit amet</div>
158-
<div class="small text-muted text-truncate">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt...</div>
159-
</div>
160-
</a>
161-
<a href="#" class="dropdown-item">
162-
<div class="message">
163-
<div class="py-3 mr-3 float-left">
164-
<div class="avatar">
165-
<img src="assets/img/avatars/4.jpg" class="img-avatar" alt="[email protected]">
166-
<span class="avatar-status badge-info"></span>
167-
</div>
168-
</div>
169-
<div>
170-
<small class="text-muted">John Doe</small>
171-
<small class="text-muted float-right mt-1">4:03 PM</small>
172-
</div>
173-
<div class="text-truncate font-weight-bold">Lorem ipsum dolor sit amet</div>
174-
<div class="small text-muted text-truncate">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt...</div>
175-
</div>
176-
</a>
177-
<a href="#" class="dropdown-item text-center">
178-
<strong>View all messages</strong>
179-
</a>
180-
</div>
24+
<li class="nav-item d-md-down-none">
25+
<a class="nav-link" href="#"><i class="icon-list"></i></a>
18126
</li>
18227
<li class="nav-item d-md-down-none">
18328
<a class="nav-link" href="#"><i class="icon-location-pin"></i></a>
18429
</li>
18530
<li class="nav-item dropdown" dropdown placement="bottom right">
186-
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" dropdownToggle (click)="false">
31+
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" dropdownToggle (click)="false">
18732
<img src="assets/img/avatars/6.jpg" class="img-avatar" alt="[email protected]"/>
18833
</a>
18934
<div class="dropdown-menu dropdown-menu-right" *dropdownMenu aria-labelledby="simple-dropdown">

Diff for: Angular4_CLI_Full_Project/src/scss/core/_layout.scss

+3-4
Original file line numberDiff line numberDiff line change
@@ -338,17 +338,16 @@ app-root {
338338
}
339339
}
340340

341-
.sidebar,
342-
.sidebar-fixed .sidebar {
341+
.sidebar {
343342
position: fixed;
344343
z-index: $zindex-sticky - 1;
345344
width: $mobile-sidebar-width;
346-
// height: 100%;
345+
height: calc(100vh - #{$navbar-height});
347346
margin-left: - $mobile-sidebar-width;
348347

349348
.sidebar-nav,
350349
.nav {
351-
width: $mobile-sidebar-width !important;
350+
width: $mobile-sidebar-width;
352351
min-height: calc(100vh - #{$navbar-height});
353352
}
354353

Diff for: Angular4_CLI_Full_Project/src/scss/style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.4
3+
* @version v1.0.5
44
* @link http://coreui.io
55
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
66
* @license MIT

Diff for: Angular4_CLI_Starter/.angular-cli.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
4-
"version": "1.0.4",
4+
"version": "1.0.5",
55
"name": "@coreui/angular"
66
},
77
"apps": [

Diff for: Angular4_CLI_Starter/package.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/angular",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -16,33 +16,33 @@
1616
},
1717
"private": true,
1818
"dependencies": {
19-
"@angular/common": "4.4.4",
20-
"@angular/compiler": "4.4.4",
21-
"@angular/core": "4.4.4",
22-
"@angular/forms": "4.4.4",
23-
"@angular/http": "4.4.4",
24-
"@angular/platform-browser": "4.4.4",
25-
"@angular/platform-browser-dynamic": "4.4.4",
26-
"@angular/router": "4.4.4",
27-
"@angular/upgrade": "4.4.4",
19+
"@angular/common": "5.0.1",
20+
"@angular/compiler": "5.0.1",
21+
"@angular/core": "5.0.1",
22+
"@angular/forms": "5.0.1",
23+
"@angular/http": "5.0.1",
24+
"@angular/platform-browser": "5.0.1",
25+
"@angular/platform-browser-dynamic": "5.0.1",
26+
"@angular/router": "5.0.1",
27+
"@angular/upgrade": "5.0.1",
2828
"bootstrap": "4.0.0-beta.2",
29-
"chart.js": "2.7.0",
29+
"chart.js": "2.7.1",
3030
"core-js": "2.5.1",
3131
"font-awesome": "^4.7.0",
3232
"moment": "2.19.1",
3333
"ng2-charts": "1.6.0",
3434
"ngx-bootstrap": "1.9.3",
35-
"rxjs": "5.4.3",
35+
"rxjs": "5.5.2",
3636
"simple-line-icons": "^2.4.1",
3737
"ts-helpers": "1.1.2",
3838
"zone.js": "0.8.18"
3939
},
4040
"devDependencies": {
41-
"@angular/cli": "1.4.6",
42-
"@angular/compiler-cli": "4.4.4",
43-
"@types/jasmine": "2.6.0",
44-
"@types/node": "8.0.34",
45-
"codelyzer": "3.2.1",
41+
"@angular/cli": "1.5.0",
42+
"@angular/compiler-cli": "5.0.1",
43+
"@types/jasmine": "2.6.3",
44+
"@types/node": "8.0.50",
45+
"codelyzer": "4.0.1",
4646
"jasmine-core": "2.8.0",
4747
"jasmine-spec-reporter": "4.2.1",
4848
"karma": "1.7.1",
@@ -51,10 +51,10 @@
5151
"karma-jasmine": "1.1.0",
5252
"karma-jasmine-html-reporter": "0.2.2",
5353
"karma-coverage-istanbul-reporter": "1.3.0",
54-
"protractor": "5.1.2",
54+
"protractor": "5.2.0",
5555
"ts-node": "3.3.0",
56-
"tslint": "5.7.0",
57-
"typescript": "2.5.3"
56+
"tslint": "5.8.0",
57+
"typescript": "2.6.1"
5858
},
5959
"engines": {
6060
"node": ">= 6.9.0",

Diff for: Angular4_CLI_Starter/src/scss/core/_layout.scss

+3-4
Original file line numberDiff line numberDiff line change
@@ -338,17 +338,16 @@ app-root {
338338
}
339339
}
340340

341-
.sidebar,
342-
.sidebar-fixed .sidebar {
341+
.sidebar {
343342
position: fixed;
344343
z-index: $zindex-sticky - 1;
345344
width: $mobile-sidebar-width;
346-
// height: 100%;
345+
height: calc(100vh - #{$navbar-height});
347346
margin-left: - $mobile-sidebar-width;
348347

349348
.sidebar-nav,
350349
.nav {
351-
width: $mobile-sidebar-width !important;
350+
width: $mobile-sidebar-width;
352351
min-height: calc(100vh - #{$navbar-height});
353352
}
354353

Diff for: Angular4_CLI_Starter/src/scss/style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.4
3+
* @version v1.0.5
44
* @link http://coreui.io
55
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
66
* @license MIT

0 commit comments

Comments
 (0)