Skip to content

Commit 220d78b

Browse files
committed
Merge branch 'develop' of https://github.com/mika-el/angular-admin-lte into develop
2 parents 51897e2 + bf7573b commit 220d78b

File tree

5 files changed

+24
-4
lines changed

5 files changed

+24
-4
lines changed

LICENSE

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2014-2017 Abdullah Almsaeed
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
this software and associated documentation files (the "Software"), to deal in
7+
the Software without restriction, including without limitation the rights to
8+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9+
the Software, and to permit persons to whom the Software is furnished to do so,
10+
subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-admin-lte",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"keywords": [
55
"angular",
66
"angular 4",

src/color/color.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class ColorService {
4141
this.renderer2.setStyle(this.elementRef.nativeElement, property, colors[color]);
4242
} else {
4343
this.renderer2.removeClass(this.elementRef.nativeElement, 'bg-color');
44-
if(color.startsWith('#') || color.startsWith('rgb')) {
44+
if(color.indexOf('#') === 0 || color.indexOf('rgb') === 0) {
4545
this.currentBackgroundStyle = {property: property, color: color};
4646
this.renderer2.setStyle(this.elementRef.nativeElement, property, color);
4747
} else if(colorsAliases.indexOf(color) !== -1) {

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-admin-lte",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/mika-el/angular-admin-lte"

0 commit comments

Comments
 (0)