Skip to content

Commit 7ef10e3

Browse files
silviowolfnuke-ellingtonjul-lam
authored
fix(echart): align echarts colors to themes (#1604)
Co-authored-by: Lukas Maurer <[email protected]> Co-authored-by: Julian Lamplmair <[email protected]>
1 parent e6bbb44 commit 7ef10e3

20 files changed

+540
-292
lines changed

.changeset/weak-singers-cover.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@siemens/ix-echarts": patch
3+
---
4+
5+
Update **ECharts** theme chart colors.

packages/angular-test-app/src/preview-examples/echarts.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { EChartsOption } from 'echarts';
1616
@Component({
1717
selector: 'app-example',
1818
templateUrl: './echarts.html',
19-
styleUrls: ["./echarts.css"],
19+
styleUrls: ['./echarts.css'],
2020
})
2121
export default class Echarts implements OnInit {
2222
theme = convertThemeName(themeSwitcher.getCurrentTheme());

packages/echarts/src/themes/brand-dark.ts

+22-24
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,30 @@
77
* LICENSE file in the root directory of this source tree.
88
*/
99

10+
const colors = [
11+
'#00C1B6' /* theme-chart-3 */,
12+
'#85E9D2' /* theme-chart-2 */,
13+
'#3664C6' /* theme-chart-8 */,
14+
'#00FFB9' /* theme-chart-1 */,
15+
'#6895F6' /* theme-chart-6 */,
16+
'#CCF5F5' /* theme-chart-4 */,
17+
'#805CFF' /* theme-chart-10 */,
18+
'#BFB0F3' /* theme-chart-9 */,
19+
'#B95CC9' /* theme-chart-11 */,
20+
'#BE5925' /* theme-chart-14 */,
21+
'#FF98C4' /* theme-chart-13 */,
22+
'#E5659B' /* theme-chart-12 */,
23+
'#97C7FF' /* theme-chart-7 */,
24+
'#FFBC66' /* theme-chart-15 */,
25+
'#FFF7D6' /* theme-chart-16 */,
26+
'#AAAA96' /* theme-chart-17 */,
27+
'#FFBC66' /* theme-chart-5 */,
28+
];
29+
1030
export default {
1131
themeName: 'brand-dark',
1232
theme: {
13-
color: [
14-
'#00ffb9',
15-
'#41b7e6',
16-
'#cd31e7',
17-
'#b3b3be',
18-
'#0087be',
19-
'#86a0f6',
20-
'#baba9d',
21-
'#009e78',
22-
'#ffb180',
23-
'#b5bd00',
24-
],
33+
color: colors,
2534
backgroundColor: 'rgba(0,0,0,0)',
2635
textStyle: {},
2736
title: {
@@ -123,18 +132,7 @@ export default {
123132
symbolSize: 4,
124133
symbol: 'emptyCircle',
125134
smooth: false,
126-
color: [
127-
'#00ffb9',
128-
'#41b7e6',
129-
'#cd31e7',
130-
'#b3b3be',
131-
'#0087be',
132-
'#86a0f6',
133-
'#baba9d',
134-
'#009e78',
135-
'#ffb180',
136-
'#b5bd00',
137-
],
135+
color: colors,
138136
label: {
139137
color: '#000000',
140138
},

packages/echarts/src/themes/brand-light.ts

+22-24
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,30 @@
77
* LICENSE file in the root directory of this source tree.
88
*/
99

10+
const colors = [
11+
'#009999' /* theme-chart-3 */,
12+
'#005159' /* theme-chart-2 */,
13+
'#00004A' /* theme-chart-8 */,
14+
'#1A747D' /* theme-chart-1 */,
15+
'#3664C6' /* theme-chart-6 */,
16+
'#002949' /* theme-chart-4 */,
17+
'#7353E5' /* theme-chart-10 */,
18+
'#553BA3' /* theme-chart-9 */,
19+
'#740089' /* theme-chart-11 */,
20+
'#BE5925' /* theme-chart-14 */,
21+
'#4F153D' /* theme-chart-13 */,
22+
'#C04774' /* theme-chart-12 */,
23+
'#00237A' /* theme-chart-7 */,
24+
'#801100' /* theme-chart-15 */,
25+
'#805800' /* theme-chart-16 */,
26+
'#5E5E4A' /* theme-chart-17 */,
27+
'#801100' /* theme-chart-5 */,
28+
];
29+
1030
export default {
1131
themeName: 'brand-light',
1232
theme: {
13-
color: [
14-
'#00af8e',
15-
'#0087be',
16-
'#aa32be',
17-
'#71758f',
18-
'#00557c',
19-
'#4660b4',
20-
'#94947b',
21-
'#007362',
22-
'#dd886a',
23-
'#909700',
24-
],
33+
color: colors,
2534
backgroundColor: 'rgba(0,0,0,0)',
2635
textStyle: {},
2736
title: {
@@ -123,18 +132,7 @@ export default {
123132
symbolSize: 4,
124133
symbol: 'circle',
125134
smooth: false,
126-
color: [
127-
'#00af8e',
128-
'#0087be',
129-
'#aa32be',
130-
'#71758f',
131-
'#00557c',
132-
'#4660b4',
133-
'#94947b',
134-
'#007362',
135-
'#dd886a',
136-
'#909700',
137-
],
135+
color: colors,
138136
label: {
139137
color: '#ffffff',
140138
},

packages/echarts/src/themes/builder/brand-dark-tb.json

+17-10
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,23 @@
1010
"textColor": "#ffffff",
1111
"markTextColor": "#000000",
1212
"color": [
13-
"#00ffb9",
14-
"#41b7e6",
15-
"#cd31e7",
16-
"#b3b3be",
17-
"#0087be",
18-
"#86a0f6",
19-
"#baba9d",
20-
"#009e78",
21-
"#ffb180",
22-
"#b5bd00"
13+
"#00C1B6",
14+
"#85E9D2",
15+
"#3664C6",
16+
"#00FFB9",
17+
"#6895F6",
18+
"#CCF5F5",
19+
"#805CFF",
20+
"#BFB0F3",
21+
"#B95CC9",
22+
"#BE5925",
23+
"#FF98C4",
24+
"#E5659B",
25+
"#97C7FF",
26+
"#FFBC66",
27+
"#FFF7D6",
28+
"#AAAA96",
29+
"#FFBC66"
2330
],
2431
"borderColor": "#ffffff",
2532
"borderWidth": 0,

packages/echarts/src/themes/builder/brand-light-tb.json

+17-10
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,23 @@
1010
"textColor": "#000028",
1111
"markTextColor": "#ffffff",
1212
"color": [
13-
"#00af8e",
14-
"#0087be",
15-
"#aa32be",
16-
"#71758f",
17-
"#00557c",
18-
"#4660b4",
19-
"#94947b",
20-
"#007362",
21-
"#dd886a",
22-
"#909700"
13+
"#009999",
14+
"#005159",
15+
"#00004A",
16+
"#1A747D",
17+
"#3664C6",
18+
"#002949",
19+
"#7353E5",
20+
"#553BA3",
21+
"#740089",
22+
"#BE5925",
23+
"#4F153D",
24+
"#C04774",
25+
"#00237A",
26+
"#801100",
27+
"#805800",
28+
"#5E5E4A",
29+
"#801100"
2330
],
2431
"borderColor": "#000028",
2532
"borderWidth": 0,

0 commit comments

Comments
 (0)