Skip to content

Commit 4036cbc

Browse files
committed
Merge branch 'release/3.0.1'
2 parents 8c8acbc + 967194a commit 4036cbc

35 files changed

+2319
-312
lines changed

dist/package.json

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

package-dist.json

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

package-lock.json

Lines changed: 151 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-fusioncharts",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",
@@ -80,7 +80,7 @@
8080
"@types/node": "~6.0.60",
8181
"codelyzer": "~3.0.1",
8282
"codemirror": "^5.39.2",
83-
"fusioncharts": "^3.13.2-sr.1",
83+
"fusioncharts": "^3.13.3-sr.1",
8484
"jasmine-core": "~2.6.2",
8585
"jasmine-spec-reporter": "~4.1.0",
8686
"karma": "^3.0.0",

src/app/app.component.css

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.codepreview pre {
2-
height: 592px;
2+
height: 592px;
33
}
44

55
/* From the passportjs.org website */
@@ -15,7 +15,7 @@
1515
}
1616

1717
.masthead h3 a {
18-
color: #333333;;
18+
color: #333333;
1919
text-decoration: none;
2020
}
2121

@@ -33,35 +33,35 @@
3333
}
3434

3535
.jumbotron p {
36-
margin-left: 133px;
36+
margin-left: 133px;
3737
}
3838

3939
.jumbotron p {
40-
margin-left: 133px;
40+
margin-left: 133px;
4141
}
4242

4343
tabset {
44-
display: none;
44+
display: none;
4545
}
4646

4747
.tabset {
48-
display: none;
48+
display: none;
4949
}
5050
.tabset .nav-tabs {
51-
overflow: hidden;
52-
list-style: none;
53-
margin: 0;
54-
padding: 0;
55-
border-bottom: 1px solid #ccc;
51+
overflow: hidden;
52+
list-style: none;
53+
margin: 0;
54+
padding: 0;
55+
border-bottom: 1px solid #ccc;
5656
}
5757

5858
.tabset .nav-tabs li {
59-
float: left;
59+
float: left;
6060
}
6161

6262
.tabset .nav-tabs li.active {
63-
border: 1px solid #ccc;
64-
border-bottom-color: #fff;
63+
border: 1px solid #ccc;
64+
border-bottom-color: #fff;
6565
}
6666

6767
.ng2-tabs {
@@ -93,3 +93,22 @@ tabset {
9393
background-color: #f1f1f1;
9494
}
9595

96+
.nav-group {
97+
display: flex;
98+
justify-content: space-between;
99+
}
100+
101+
.badge {
102+
font-size: 12px !important;
103+
border-radius: 5px;
104+
align-self: center;
105+
}
106+
107+
.badge-selected {
108+
background-color: white;
109+
}
110+
111+
.badge-normal {
112+
background-color: rgb(75, 63, 160);
113+
color: white;
114+
}

0 commit comments

Comments
 (0)