Skip to content

Commit 9955ee2

Browse files
rarestomararestoma
authored
Merge pull request #32 from creativetimofficial/feature/v1.7.0
Feature/v1.7.0
2 parents a8aee3d + 4872cc7 commit 9955ee2

File tree

10 files changed

+101
-90
lines changed

10 files changed

+101
-90
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## [1.7.0] - 2020-12-15
2+
### Updates
3+
- update to Angular 11
4+
- update all dependencies to match Angular 11 version
5+
16
## [1.6.0] - 2020-03-12
27
### Updates
38
- update to Angular 9

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,5 +168,5 @@ Instagram: <https://instagram.com/creativetimofficial>
168168

169169
[CHANGELOG]: ./CHANGELOG.md
170170

171-
[version-badge]: https://img.shields.io/badge/version-1.6.0-blue.svg
171+
[version-badge]: https://img.shields.io/badge/version-1.7.0-blue.svg
172172
[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg

‎documentation/tutorial-lbd-angular2.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<div class="filter"></div>
6464
<div class="title-container text-center">
6565
<h1>Light Bootstrap Dashboard Angular</h1>
66-
<h3 class="category">v1.6.0</h3>
66+
<h3 class="category">v1.7.0</h3>
6767
<h4 class="description text-center">We are constantly doing updates for you.</h4>
6868
<a href="http://demos.creative-tim.com/light-bootstrap-dashboard-angular2/documentation/tutorial" class="btn btn-neutral btn-lg btn-round btn-fill" target="_blank">View Documentation</a>
6969
</div>

‎package.json‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lbd-free-angular-cli",
3-
"version": "1.6.0",
3+
"version": "1.7.0",
44
"license": "MIT",
55
"scripts": {
66
"ng": "ng",
@@ -13,47 +13,47 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "9.0.6",
17-
"@angular/common": "9.0.6",
18-
"@angular/compiler": "9.0.6",
19-
"@angular/core": "9.0.6",
20-
"@angular/forms": "9.0.6",
21-
"@angular/platform-browser": "9.0.6",
22-
"@angular/platform-browser-dynamic": "9.0.6",
23-
"@angular/router": "9.0.6",
16+
"@angular/animations": "11.0.4",
17+
"@angular/common": "11.0.4",
18+
"@angular/compiler": "11.0.4",
19+
"@angular/core": "11.0.4",
20+
"@angular/forms": "11.0.4",
21+
"@angular/platform-browser": "11.0.4",
22+
"@angular/platform-browser-dynamic": "11.0.4",
23+
"@angular/router": "11.0.4",
2424
"@ngui/map": "0.30.3",
25-
"@types/googlemaps": "3.39.3",
26-
"animate.css": "3.7.0",
25+
"@types/googlemaps": "3.40.5",
26+
"animate.css": "4.1.1",
2727
"arrive": "2.4.1",
2828
"bootstrap": "3.3.7",
2929
"bootstrap-notify": "3.1.3",
30-
"chartist": "0.11.0",
31-
"core-js": "2.6.9",
32-
"googleapis": "33.0.0",
33-
"jquery": "3.4.1",
34-
"perfect-scrollbar": "1.4.0",
35-
"rxjs": "6.5.4",
36-
"rxjs-compat": "6.5.4",
37-
"zone.js": "0.10.2"
30+
"chartist": "0.11.4",
31+
"core-js": "3.8.1",
32+
"googleapis": "66.0.0",
33+
"jquery": "3.5.1",
34+
"perfect-scrollbar": "1.5.0",
35+
"rxjs": "6.6.3",
36+
"rxjs-compat": "6.6.3",
37+
"zone.js": "0.11.3"
3838
},
3939
"devDependencies": {
40-
"@angular-devkit/build-angular": "0.900.6",
41-
"@angular/cli": "9.0.6",
42-
"@angular/compiler-cli": "9.0.6",
43-
"@types/jasmine": "3.5.9",
44-
"@types/node": "13.9.0",
45-
"codelyzer": "5.2.1",
46-
"jasmine-core": "3.5.0",
47-
"jasmine-spec-reporter": "4.2.1",
48-
"karma": "4.4.1",
40+
"@angular-devkit/build-angular": "0.1100.4",
41+
"@angular/cli": "11.0.4",
42+
"@angular/compiler-cli": "11.0.4",
43+
"@types/jasmine": "3.6.2",
44+
"@types/node": "14.14.13",
45+
"codelyzer": "6.0.1",
46+
"jasmine-core": "3.6.0",
47+
"jasmine-spec-reporter": "6.0.0",
48+
"karma": "5.2.3",
4949
"karma-chrome-launcher": "3.1.0",
5050
"karma-cli": "2.0.0",
51-
"karma-jasmine": "3.1.1",
52-
"karma-jasmine-html-reporter": "1.5.2",
53-
"karma-coverage-istanbul-reporter": "2.1.1",
54-
"protractor": "5.4.3",
55-
"ts-node": "8.6.2",
56-
"tslint": "6.1.0",
57-
"typescript": "3.7.5"
51+
"karma-jasmine": "4.0.1",
52+
"karma-jasmine-html-reporter": "1.5.4",
53+
"karma-coverage-istanbul-reporter": "3.0.3",
54+
"protractor": "7.0.0",
55+
"ts-node": "9.1.1",
56+
"tslint": "6.1.3",
57+
"typescript": "4.0.3"
5858
}
5959
}

‎src/app/shared/navbar/navbar.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646
<ul class="nav navbar-nav navbar-right">
4747
<li>
4848
<a href="#">
49-
<p>Account</p>
49+
Account
5050
</a>
5151
</li>
5252
<li class="dropdown">
5353
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
54-
<p>
54+
5555
Dropdown
5656
<b class="caret"></b>
57-
</p>
57+
5858
</a>
5959
<ul class="dropdown-menu">
6060
<li><a href="#">Action</a></li>
@@ -68,7 +68,7 @@
6868
</li>
6969
<li>
7070
<a href="#">
71-
<p>Log out</p>
71+
Log out
7272
</a>
7373
</li>
7474
<li class="separator hidden-lg hidden-md"></li>

‎src/assets/sass/lbd/_checkbox-radio-switch.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@
266266
user-select: none;
267267

268268
/* this code is for fixing safari bug with hidden overflow for border-radius */
269-
-webkit-mask: url('../img/mask.png') 0 0 no-repeat;
269+
-webkit-mask: url('/img/mask.png') 0 0 no-repeat;
270270
-webkit-mask-size: 60px 24px;
271-
mask: url('../img/mask.png') 0 0 no-repeat;
271+
mask: url('/img/mask.png') 0 0 no-repeat;
272272
}
273273
.has-switch.deactivate {
274274
opacity: 0.5;

‎src/assets/sass/lbd/_navbars.scss‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
44
> a:focus{
55
background-color: transparent;
66
}
7-
}
7+
a{
8+
p{
9+
margin-bottom: 0;
10+
}
11+
}
12+
}
813
}
914
.navbar{
1015
border: $none;
1116
font-size: $font-size-navbar;
1217
border-radius: 0;
13-
18+
1419
.navbar-brand {
1520
font-weight: $font-weight-normal;
1621
margin: $navbar-margin-brand;
@@ -31,12 +36,12 @@
3136
margin: $navbar-margin-a-btn-round;
3237
}
3338
> li > a [class^="fa"]{
34-
font-size: $font-size-large + 1;
39+
font-size: $font-size-large + 1;
3540
position: relative;
3641
line-height: 16px;
3742
top: 1px;
3843
}
39-
44+
4045
.notification{
4146
position: absolute;
4247
background-color: #FB404B;
@@ -63,7 +68,7 @@
6368
.caret{
6469
// @include center-item();
6570
}
66-
71+
6772
&.fixed{
6873
width: calc(100% - $sidebar-width);
6974
right: 0;
@@ -78,11 +83,11 @@
7883
margin-top: -5px;
7984
}
8085

81-
.navbar-transparent, [class*="navbar-ct"]{
86+
.navbar-transparent, [class*="navbar-ct"]{
8287
.navbar-brand{
8388
color: $white-color;
8489
@include opacity(.9);
85-
90+
8691
&:focus,
8792
&:hover{
8893
background-color: transparent;
@@ -109,14 +114,14 @@
109114
.nav > li > a.btn:hover{
110115
background-color: transparent;
111116
}
112-
117+
113118
> .dropdown > a .caret,
114119
> .dropdown > a:hover .caret,
115120
> .dropdown > a:focus .caret{
116121
border-bottom-color: $white-color;
117122
border-top-color: $white-color;
118-
}
119-
123+
}
124+
120125
> .open > a,
121126
> .open > a:hover,
122127
> .open > a:focus {
@@ -125,7 +130,7 @@
125130
@include opacity(1);
126131
}
127132
}
128-
133+
129134
.btn-default{
130135
color: $white-color;
131136
border-color: $white-color;
@@ -135,15 +140,15 @@
135140
background-color: $white-color;
136141
@include opacity(.9);
137142
}
138-
.btn-default.btn-fill:hover,
139-
.btn-default.btn-fill:focus,
143+
.btn-default.btn-fill:hover,
144+
.btn-default.btn-fill:focus,
140145
.btn-default.btn-fill:active,
141-
.btn-default.btn-fill.active,
146+
.btn-default.btn-fill.active,
142147
.open .dropdown-toggle.btn-fill.btn-default{
143148
border-color: $white-color;
144149
@include opacity(1);
145150
}
146-
151+
147152
}
148153
.navbar-transparent{
149154
.dropdown-menu .divider{
@@ -159,32 +164,32 @@
159164
.navbar-default {
160165
background-color: $white-navbar;
161166
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
162-
167+
163168
.navbar-nav{
164169
> li > a:not(.btn){
165170
color: $dark-gray;
166171
}
167-
168-
> .active > a,
169-
> .active > a:not(.btn):hover,
170-
> .active > a:not(.btn):focus,
171-
> li > a:not(.btn):hover,
172+
173+
> .active > a,
174+
> .active > a:not(.btn):hover,
175+
> .active > a:not(.btn):focus,
176+
> li > a:not(.btn):hover,
172177
> li > a:not(.btn):focus {
173178
background-color: transparent;
174179
border-radius: 3px;
175180
color: $info-color;
176181
@include opacity(1);
177182
}
178-
179-
> .dropdown > a:hover .caret,
183+
184+
> .dropdown > a:hover .caret,
180185
> .dropdown > a:focus .caret {
181186
border-bottom-color: $info-color;
182187
border-top-color: $info-color;
183-
188+
184189
}
185-
186-
> .open > a,
187-
> .open > a:hover,
190+
191+
> .open > a,
192+
> .open > a:hover,
188193
> .open > a:focus{
189194
background-color: transparent;
190195
color: $info-color;
@@ -193,9 +198,9 @@
193198
.navbar-toggle:hover,.navbar-toggle:focus {
194199
background-color: transparent;
195200
}
196-
197-
}
198-
201+
202+
}
203+
199204
&:not(.navbar-transparent) .btn-default:hover{
200205
color: $info-color;
201206
border-color: $info-color;
@@ -204,7 +209,7 @@
204209
&:not(.navbar-transparent) .btn-neutral:hover,
205210
&:not(.navbar-transparent) .btn-neutral:active{
206211
color: $dark-gray;
207-
}
212+
}
208213
}
209214

210215
/* Navbar with icons */
@@ -220,27 +225,27 @@
220225
padding: $navbar-padding-a-icons;
221226
margin: $navbar-margin-a-icons;
222227
}
223-
228+
224229
[class^="pe"] {
225230
font-size: 30px;
226231
position: relative;
227232
}
228233
p {
229234
margin: 3px 0 0;
230-
}
231-
}
235+
}
236+
}
232237
}
233238

234239
.navbar-form{
235240
@include box-shadow(none);
236241
.form-control{
237-
@include light-form();
242+
@include light-form();
238243
height: 22px;
239244
font-size: $font-size-navbar;
240245
line-height: $line-height-general;
241246
color: $light-gray;
242247
}
243-
.navbar-transparent & .form-control,
248+
.navbar-transparent & .form-control,
244249
[class*="navbar-ct"] & .form-control{
245250
color: $white-color;
246251
border: $none;
@@ -275,19 +280,17 @@
275280
margin-top: 19px;
276281
margin-bottom: 19px;
277282
border: $none;
278-
283+
279284
.icon-bar {
280285
background-color: $white-color;
281286
}
282-
.navbar-collapse,
287+
.navbar-collapse,
283288
.navbar-form {
284289
border-color: transparent;
285290
}
286-
291+
287292
&.navbar-default .navbar-toggle:hover,
288293
&.navbar-default .navbar-toggle:focus {
289294
background-color: transparent;
290295
}
291296
}
292-
293-

‎src/assets/sass/light-bootstrap-dashboard.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
22
33
=========================================================
4-
* Light Bootstrap Dashboard Angular - v1.6.0
4+
* Light Bootstrap Dashboard Angular - v1.7.0
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/light-bootstrap-dashboard-angular2
8-
* Copyright 2016 Creative Tim (http://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
99
* Licensed under MIT
1010
1111
=========================================================

0 commit comments

Comments
 (0)