@gitlab/ui 64.16.0 → 64.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/dist/components/charts/discrete_scatter/discrete_scatter.js +2 -3
- package/dist/components/charts/heatmap/heatmap.js +4 -6
- package/dist/components/charts/legend/legend.js +2 -3
- package/dist/components/charts/line/line.js +2 -3
- package/dist/tokens/css/tokens.css +142 -0
- package/dist/tokens/css/tokens.dark.css +76 -0
- package/dist/tokens/js/tokens.dark.js +74 -0
- package/dist/tokens/js/tokens.js +140 -0
- package/dist/tokens/json/tokens.dark.grouped.json +139 -0
- package/dist/tokens/json/tokens.dark.json +2527 -0
- package/dist/tokens/json/tokens.grouped.json +139 -0
- package/dist/tokens/json/tokens.json +2527 -0
- package/dist/tokens/scss/_tokens.dark.scss +73 -0
- package/dist/tokens/scss/_tokens.scss +139 -0
- package/dist/utility_classes.css +1 -1
- package/dist/utility_classes.css.map +1 -1
- package/dist/utils/charts/config.js +3 -4
- package/dist/utils/charts/mock_data.js +3 -4
- package/dist/utils/charts/theme.js +25 -89
- package/package.json +8 -6
- package/src/components/charts/area/area.stories.js +3 -3
- package/src/components/charts/discrete_scatter/discrete_scatter.vue +2 -2
- package/src/components/charts/heatmap/heatmap.vue +4 -4
- package/src/components/charts/legend/legend.stories.js +2 -2
- package/src/components/charts/legend/legend.vue +2 -2
- package/src/components/charts/line/line.vue +2 -2
- package/src/scss/utilities.scss +8 -0
- package/src/scss/utility-mixins/border.scss +4 -0
- package/src/tokens/color.dark.tokens.json +359 -0
- package/src/tokens/color.tokens.json +709 -0
- package/src/utils/charts/config.js +3 -3
- package/src/utils/charts/mock_data.js +3 -3
- package/src/utils/charts/theme.js +152 -153
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import castArray from 'lodash/castArray';
|
|
2
2
|
import merge from 'lodash/merge';
|
|
3
|
+
import { BLUE_500 } from '../../../dist/tokens/js/tokens';
|
|
3
4
|
import { GlBreakpointInstance } from '../breakpoints';
|
|
4
5
|
import { columnOptions } from '../constants';
|
|
5
6
|
import { areDatesEqual } from '../datetime_utility';
|
|
@@ -7,8 +8,6 @@ import { engineeringNotation } from '../number_utils';
|
|
|
7
8
|
import { hexToRgba } from '../utils';
|
|
8
9
|
import { arrowSymbol, ANNOTATIONS_SERIES_NAME, CHART_TYPE_BAR, CHART_TYPE_LINE } from './constants';
|
|
9
10
|
|
|
10
|
-
const blue500 = '#1f75cb';
|
|
11
|
-
|
|
12
11
|
const defaultAreaOpacity = 0.2;
|
|
13
12
|
const defaultFontSize = 12;
|
|
14
13
|
const defaultHeight = 400;
|
|
@@ -353,14 +352,14 @@ const getAnnotationsConfig = annotations => {
|
|
|
353
352
|
return {
|
|
354
353
|
markLine: {
|
|
355
354
|
lineStyle: {
|
|
356
|
-
color:
|
|
355
|
+
color: BLUE_500
|
|
357
356
|
},
|
|
358
357
|
silent: true,
|
|
359
358
|
data: lines
|
|
360
359
|
},
|
|
361
360
|
markPoint: {
|
|
362
361
|
itemStyle: {
|
|
363
|
-
color:
|
|
362
|
+
color: BLUE_500
|
|
364
363
|
},
|
|
365
364
|
symbol: arrowSymbol,
|
|
366
365
|
symbolSize: '8',
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
+
import { BLUE_500 } from '../../../dist/tokens/js/tokens';
|
|
1
2
|
import { hexToRgba } from '../utils';
|
|
2
3
|
import { colorFromDefaultPalette } from './theme';
|
|
3
4
|
|
|
4
|
-
const blue500 = '#1f75cb';
|
|
5
|
-
|
|
6
5
|
const mockDefaultDataZoomConfig = {
|
|
7
6
|
dataZoom: [{
|
|
8
7
|
bottom: 22,
|
|
@@ -70,7 +69,7 @@ const mockAnnotationsSeries = {
|
|
|
70
69
|
data: [],
|
|
71
70
|
markLine: {
|
|
72
71
|
lineStyle: {
|
|
73
|
-
color:
|
|
72
|
+
color: BLUE_500
|
|
74
73
|
},
|
|
75
74
|
data: [{
|
|
76
75
|
xAxis: '2018-01-25T01:00:00.000Z'
|
|
@@ -85,7 +84,7 @@ const mockAnnotationsSeries = {
|
|
|
85
84
|
symbolSize: '8',
|
|
86
85
|
symbolOffset: [0, ' 60%'],
|
|
87
86
|
itemStyle: {
|
|
88
|
-
color:
|
|
87
|
+
color: BLUE_500
|
|
89
88
|
},
|
|
90
89
|
data: [{
|
|
91
90
|
name: 'annotations',
|
|
@@ -1,78 +1,14 @@
|
|
|
1
|
+
import { GRAY_600, GRAY_200, GRAY_50, GRAY_300, GRAY_100, DATA_VIZ_BLUE_200, DATA_VIZ_BLUE_400, DATA_VIZ_BLUE_600, DATA_VIZ_BLUE_800, GRAY_900, GRAY_500, DATA_VIZ_BLUE_500, DATA_VIZ_BLUE_900, DATA_VIZ_ORANGE_500, DATA_VIZ_ORANGE_600, DATA_VIZ_AQUA_500, DATA_VIZ_GREEN_600, DATA_VIZ_MAGENTA_500, DATA_VIZ_BLUE_700, DATA_VIZ_ORANGE_800, DATA_VIZ_AQUA_700, DATA_VIZ_GREEN_800, DATA_VIZ_MAGENTA_700, DATA_VIZ_ORANGE_950, DATA_VIZ_AQUA_900, DATA_VIZ_GREEN_950, DATA_VIZ_MAGENTA_900, DATA_VIZ_ORANGE_700, DATA_VIZ_AQUA_600, DATA_VIZ_GREEN_700, DATA_VIZ_MAGENTA_600, DATA_VIZ_ORANGE_900, DATA_VIZ_AQUA_800, DATA_VIZ_GREEN_900, DATA_VIZ_MAGENTA_800, DATA_VIZ_BLUE_950, DATA_VIZ_AQUA_950, DATA_VIZ_GREEN_500, DATA_VIZ_MAGENTA_950, DATA_VIZ_ORANGE_400, DATA_VIZ_GREEN_400, DATA_VIZ_BLUE_300, DATA_VIZ_ORANGE_200, DATA_VIZ_AQUA_300, DATA_VIZ_GREEN_200, DATA_VIZ_MAGENTA_300, DATA_VIZ_BLUE_100, DATA_VIZ_ORANGE_50, DATA_VIZ_AQUA_100, DATA_VIZ_GREEN_50, DATA_VIZ_MAGENTA_100, DATA_VIZ_ORANGE_300, DATA_VIZ_AQUA_400, DATA_VIZ_GREEN_300, DATA_VIZ_MAGENTA_400, DATA_VIZ_ORANGE_100, DATA_VIZ_AQUA_200, DATA_VIZ_GREEN_100, DATA_VIZ_MAGENTA_200, DATA_VIZ_BLUE_50, DATA_VIZ_AQUA_50, DATA_VIZ_MAGENTA_50, RED_500, WHITE } from '../../../dist/tokens/js/tokens';
|
|
1
2
|
import { scrollHandleSvgPath } from '../svgs/svg_paths';
|
|
2
3
|
import { hexToRgba } from '../utils';
|
|
3
4
|
|
|
4
|
-
const white = '#fff';
|
|
5
|
-
const whiteNormal = '#f0f0f0';
|
|
6
|
-
const red500 = '#dd2b0e';
|
|
7
|
-
const gray50 = '#ececef';
|
|
8
|
-
const gray100 = '#dcdcde';
|
|
9
|
-
const gray200 = '#bfbfc3';
|
|
10
|
-
const gray300 = '#a4a3a8';
|
|
11
|
-
const gray500 = '#737278';
|
|
12
|
-
const gray600 = '#626168';
|
|
13
|
-
const gray900 = '#333238';
|
|
14
|
-
const dataVizGreen50 = '#ddfab7';
|
|
15
|
-
const dataVizGreen100 = '#c6ed94';
|
|
16
|
-
const dataVizGreen200 = '#b0d97b';
|
|
17
|
-
const dataVizGreen300 = '#94c25e';
|
|
18
|
-
const dataVizGreen400 = '#81ac41';
|
|
19
|
-
const dataVizGreen500 = '#619025';
|
|
20
|
-
const dataVizGreen600 = '#4e7f0e';
|
|
21
|
-
const dataVizGreen700 = '#366800';
|
|
22
|
-
const dataVizGreen800 = '#275600';
|
|
23
|
-
const dataVizGreen900 = '#1a4500';
|
|
24
|
-
const dataVizGreen950 = '#133a03';
|
|
25
|
-
const dataVizAqua50 = '#b5fefd';
|
|
26
|
-
const dataVizAqua100 = '#93f2ef';
|
|
27
|
-
const dataVizAqua200 = '#5edee3';
|
|
28
|
-
const dataVizAqua300 = '#32c5d2';
|
|
29
|
-
const dataVizAqua400 = '#00acc4';
|
|
30
|
-
const dataVizAqua500 = '#0090b1';
|
|
31
|
-
const dataVizAqua600 = '#007b9b';
|
|
32
|
-
const dataVizAqua700 = '#006381';
|
|
33
|
-
const dataVizAqua800 = '#00516c';
|
|
34
|
-
const dataVizAqua900 = '#004059';
|
|
35
|
-
const dataVizAqua950 = '#00344b';
|
|
36
|
-
const dataVizBlue50 = '#e9ebff';
|
|
37
|
-
const dataVizBlue100 = '#d2dcff';
|
|
38
|
-
const dataVizBlue200 = '#b7c6ff';
|
|
39
|
-
const dataVizBlue300 = '#97acff';
|
|
40
|
-
const dataVizBlue400 = '#7992f5';
|
|
41
|
-
const dataVizBlue500 = '#617ae2';
|
|
42
|
-
const dataVizBlue600 = '#4e65cd';
|
|
43
|
-
const dataVizBlue700 = '#3f51ae';
|
|
44
|
-
const dataVizBlue800 = '#374291';
|
|
45
|
-
const dataVizBlue900 = '#303470';
|
|
46
|
-
const dataVizBlue950 = '#2a2b59';
|
|
47
|
-
const dataVizMagenta50 = '#ffe3eb';
|
|
48
|
-
const dataVizMagenta100 = '#ffccdb';
|
|
49
|
-
const dataVizMagenta200 = '#fcacc5';
|
|
50
|
-
const dataVizMagenta300 = '#f88aaf';
|
|
51
|
-
const dataVizMagenta400 = '#e86e9a';
|
|
52
|
-
const dataVizMagenta500 = '#cf4d81';
|
|
53
|
-
const dataVizMagenta600 = '#b93d71';
|
|
54
|
-
const dataVizMagenta700 = '#9a2e5d';
|
|
55
|
-
const dataVizMagenta800 = '#7c214f';
|
|
56
|
-
const dataVizMagenta900 = '#661e3a';
|
|
57
|
-
const dataVizMagenta950 = '#541d31';
|
|
58
|
-
const dataVizOrange50 = '#fae8d1';
|
|
59
|
-
const dataVizOrange100 = '#f5d6b3';
|
|
60
|
-
const dataVizOrange200 = '#eebd8c';
|
|
61
|
-
const dataVizOrange300 = '#e99b60';
|
|
62
|
-
const dataVizOrange400 = '#e07e41';
|
|
63
|
-
const dataVizOrange500 = '#c95d2e';
|
|
64
|
-
const dataVizOrange600 = '#b14f18';
|
|
65
|
-
const dataVizOrange700 = '#92430a';
|
|
66
|
-
const dataVizOrange800 = '#6f3500';
|
|
67
|
-
const dataVizOrange900 = '#5e2f05';
|
|
68
|
-
const dataVizOrange950 = '#4b2707';
|
|
69
5
|
const glBorderRadiusBase = '0.25rem';
|
|
70
6
|
|
|
71
7
|
const themeName = 'gitlab';
|
|
72
|
-
const heatmapHues = [
|
|
73
|
-
const gaugeNeutralHues = [
|
|
74
|
-
const gaugeSafeHues = [
|
|
75
|
-
const gaugeWarningHue =
|
|
8
|
+
const heatmapHues = [GRAY_100, DATA_VIZ_BLUE_200, DATA_VIZ_BLUE_400, DATA_VIZ_BLUE_600, DATA_VIZ_BLUE_800];
|
|
9
|
+
const gaugeNeutralHues = [GRAY_900, GRAY_500];
|
|
10
|
+
const gaugeSafeHues = [DATA_VIZ_BLUE_500, DATA_VIZ_BLUE_900];
|
|
11
|
+
const gaugeWarningHue = DATA_VIZ_ORANGE_500;
|
|
76
12
|
|
|
77
13
|
/**
|
|
78
14
|
* The default palette is based on the Categorical data palette
|
|
@@ -80,15 +16,15 @@ const gaugeWarningHue = dataVizOrange500;
|
|
|
80
16
|
* differentiate qualitative data, and lightness to differentiate quantitive data.
|
|
81
17
|
* More info: https://design.gitlab.com/data-visualization/color#categorical-data
|
|
82
18
|
*/
|
|
83
|
-
const colorPaletteDefault = [
|
|
19
|
+
const colorPaletteDefault = [DATA_VIZ_BLUE_500, DATA_VIZ_ORANGE_600, DATA_VIZ_AQUA_500, DATA_VIZ_GREEN_600, DATA_VIZ_MAGENTA_500, DATA_VIZ_BLUE_700, DATA_VIZ_ORANGE_800, DATA_VIZ_AQUA_700, DATA_VIZ_GREEN_800, DATA_VIZ_MAGENTA_700, DATA_VIZ_BLUE_900, DATA_VIZ_ORANGE_950, DATA_VIZ_AQUA_900, DATA_VIZ_GREEN_950, DATA_VIZ_MAGENTA_900, DATA_VIZ_BLUE_600, DATA_VIZ_ORANGE_700, DATA_VIZ_AQUA_600, DATA_VIZ_GREEN_700, DATA_VIZ_MAGENTA_600, DATA_VIZ_BLUE_800, DATA_VIZ_ORANGE_900, DATA_VIZ_AQUA_800, DATA_VIZ_GREEN_900, DATA_VIZ_MAGENTA_800, DATA_VIZ_BLUE_950, DATA_VIZ_ORANGE_500, DATA_VIZ_AQUA_950, DATA_VIZ_GREEN_500, DATA_VIZ_MAGENTA_950];
|
|
84
20
|
const colorFromDefaultPalette = index => colorPaletteDefault[index % colorPaletteDefault.length];
|
|
85
|
-
const colorPaletteDark = [
|
|
21
|
+
const colorPaletteDark = [DATA_VIZ_BLUE_500, DATA_VIZ_ORANGE_400, DATA_VIZ_AQUA_500, DATA_VIZ_GREEN_400, DATA_VIZ_MAGENTA_500, DATA_VIZ_BLUE_300, DATA_VIZ_ORANGE_200, DATA_VIZ_AQUA_300, DATA_VIZ_GREEN_200, DATA_VIZ_MAGENTA_300, DATA_VIZ_BLUE_100, DATA_VIZ_ORANGE_50, DATA_VIZ_AQUA_100, DATA_VIZ_GREEN_50, DATA_VIZ_MAGENTA_100, DATA_VIZ_BLUE_400, DATA_VIZ_ORANGE_300, DATA_VIZ_AQUA_400, DATA_VIZ_GREEN_300, DATA_VIZ_MAGENTA_400, DATA_VIZ_BLUE_200, DATA_VIZ_ORANGE_100, DATA_VIZ_AQUA_200, DATA_VIZ_GREEN_100, DATA_VIZ_MAGENTA_200, DATA_VIZ_BLUE_50, DATA_VIZ_ORANGE_500, DATA_VIZ_AQUA_50, DATA_VIZ_GREEN_500, DATA_VIZ_MAGENTA_50];
|
|
86
22
|
const colorFromDarkPalette = index => colorPaletteDark[index % colorPaletteDark.length];
|
|
87
23
|
const axes = {
|
|
88
24
|
axisLabel: {
|
|
89
25
|
margin: 8,
|
|
90
26
|
show: true,
|
|
91
|
-
color:
|
|
27
|
+
color: GRAY_600,
|
|
92
28
|
hideOverlap: true
|
|
93
29
|
},
|
|
94
30
|
axisLine: {
|
|
@@ -97,7 +33,7 @@ const axes = {
|
|
|
97
33
|
axisPointer: {
|
|
98
34
|
lineStyle: {
|
|
99
35
|
type: 'solid',
|
|
100
|
-
color:
|
|
36
|
+
color: GRAY_600
|
|
101
37
|
},
|
|
102
38
|
label: {
|
|
103
39
|
show: false
|
|
@@ -107,7 +43,7 @@ const axes = {
|
|
|
107
43
|
show: true,
|
|
108
44
|
alignWithLabel: true,
|
|
109
45
|
lineStyle: {
|
|
110
|
-
color:
|
|
46
|
+
color: GRAY_200
|
|
111
47
|
}
|
|
112
48
|
},
|
|
113
49
|
nameGap: 30,
|
|
@@ -116,13 +52,13 @@ const axes = {
|
|
|
116
52
|
},
|
|
117
53
|
splitLine: {
|
|
118
54
|
lineStyle: {
|
|
119
|
-
color: [
|
|
55
|
+
color: [GRAY_200]
|
|
120
56
|
}
|
|
121
57
|
},
|
|
122
58
|
splitArea: {
|
|
123
59
|
show: false,
|
|
124
60
|
areaStyle: {
|
|
125
|
-
color: [hexToRgba(
|
|
61
|
+
color: [hexToRgba(GRAY_50, 0.3), hexToRgba(GRAY_300, 0.3)]
|
|
126
62
|
}
|
|
127
63
|
}
|
|
128
64
|
};
|
|
@@ -133,7 +69,7 @@ const createTheme = function () {
|
|
|
133
69
|
color: colorPaletteDefault,
|
|
134
70
|
backgroundColor: 'transparent',
|
|
135
71
|
textStyle: {
|
|
136
|
-
color:
|
|
72
|
+
color: GRAY_900
|
|
137
73
|
},
|
|
138
74
|
markLine: {
|
|
139
75
|
silent: true,
|
|
@@ -142,7 +78,7 @@ const createTheme = function () {
|
|
|
142
78
|
show: false
|
|
143
79
|
},
|
|
144
80
|
lineStyle: {
|
|
145
|
-
color:
|
|
81
|
+
color: RED_500,
|
|
146
82
|
width: 1,
|
|
147
83
|
type: 'dashed'
|
|
148
84
|
}
|
|
@@ -150,7 +86,7 @@ const createTheme = function () {
|
|
|
150
86
|
markArea: {
|
|
151
87
|
silent: true,
|
|
152
88
|
itemStyle: {
|
|
153
|
-
color: hexToRgba(
|
|
89
|
+
color: hexToRgba(RED_500, 0.1)
|
|
154
90
|
}
|
|
155
91
|
},
|
|
156
92
|
dataZoom: {
|
|
@@ -160,27 +96,27 @@ const createTheme = function () {
|
|
|
160
96
|
dataBackground: {
|
|
161
97
|
lineStyle: {
|
|
162
98
|
width: 2,
|
|
163
|
-
color:
|
|
99
|
+
color: GRAY_200,
|
|
164
100
|
opacity: 1
|
|
165
101
|
},
|
|
166
102
|
// render unfilled zoom-graph if the series is a line chart without area styles
|
|
167
103
|
// more details: https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2364#note_666637306
|
|
168
104
|
areaStyle: isLineChartWithoutArea(options) ? {} // Use empty object instead of null, see https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2185#note_707711029 for more context
|
|
169
105
|
: {
|
|
170
|
-
color:
|
|
106
|
+
color: GRAY_50,
|
|
171
107
|
opacity: 1
|
|
172
108
|
}
|
|
173
109
|
},
|
|
174
|
-
fillerColor: hexToRgba(
|
|
110
|
+
fillerColor: hexToRgba(GRAY_200, 0.23),
|
|
175
111
|
handleIcon: scrollHandleSvgPath,
|
|
176
112
|
handleStyle: {
|
|
177
113
|
borderColor: 'transparent',
|
|
178
|
-
color:
|
|
114
|
+
color: GRAY_500
|
|
179
115
|
},
|
|
180
116
|
handleSize: '50%',
|
|
181
117
|
labelFormatter: () => null,
|
|
182
118
|
textStyle: {
|
|
183
|
-
color:
|
|
119
|
+
color: GRAY_600
|
|
184
120
|
}
|
|
185
121
|
},
|
|
186
122
|
toolbox: {
|
|
@@ -190,14 +126,14 @@ const createTheme = function () {
|
|
|
190
126
|
emphasis: {
|
|
191
127
|
iconStyle: {
|
|
192
128
|
borderWidth: 0,
|
|
193
|
-
color:
|
|
194
|
-
textBackgroundColor:
|
|
129
|
+
color: GRAY_900,
|
|
130
|
+
textBackgroundColor: WHITE,
|
|
195
131
|
textBorderRadius: glBorderRadiusBase,
|
|
196
132
|
textPadding: [8, 12]
|
|
197
133
|
}
|
|
198
134
|
},
|
|
199
135
|
iconStyle: {
|
|
200
|
-
color:
|
|
136
|
+
color: GRAY_500,
|
|
201
137
|
borderWidth: 0
|
|
202
138
|
},
|
|
203
139
|
itemGap: 8,
|
|
@@ -221,12 +157,12 @@ const createTheme = function () {
|
|
|
221
157
|
label: {
|
|
222
158
|
normal: {
|
|
223
159
|
textStyle: {
|
|
224
|
-
color:
|
|
160
|
+
color: GRAY_50
|
|
225
161
|
}
|
|
226
162
|
},
|
|
227
163
|
emphasis: {
|
|
228
164
|
textStyle: {
|
|
229
|
-
color:
|
|
165
|
+
color: GRAY_50
|
|
230
166
|
}
|
|
231
167
|
}
|
|
232
168
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gitlab/ui",
|
|
3
|
-
"version": "64.
|
|
3
|
+
"version": "64.18.0",
|
|
4
4
|
"description": "GitLab UI Components",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -21,20 +21,21 @@
|
|
|
21
21
|
],
|
|
22
22
|
"scripts": {
|
|
23
23
|
"build": "NODE_ENV=production rollup -c",
|
|
24
|
-
"prebuild": "run-s build-scss-variables generate-utilities",
|
|
25
|
-
"prepare": "run-s build-scss-variables generate-utilities",
|
|
24
|
+
"prebuild": "run-s build-tokens build-scss-variables generate-utilities",
|
|
25
|
+
"prepare": "run-s build-tokens build-scss-variables generate-utilities",
|
|
26
26
|
"generate-utilities": "make src/scss/utilities.scss",
|
|
27
27
|
"copy-fonts": "make copy-fonts",
|
|
28
28
|
"build-scss-variables": "make scss_to_js/scss_variables.js",
|
|
29
|
+
"build-tokens": "node ./bin/build_tokens.js",
|
|
29
30
|
"clean": "rm -r dist storybook scss_to_js/scss_variables.* src/scss/utilities.scss",
|
|
30
31
|
"cy:edge": "cypress run --browser edge",
|
|
31
32
|
"cy:run": "cypress run --browser firefox",
|
|
32
33
|
"start": "yarn storybook",
|
|
33
34
|
"storybook": "yarn storybook-prep && storybook dev --ci --host ${STORYBOOK_HOST:-localhost} --port 9001 -c .storybook",
|
|
34
35
|
"storybook-vue3": "yarn storybook-prep && VUE_VERSION=3 storybook dev --ci --host ${STORYBOOK_HOST:-localhost} --port 9001 -c .storybook",
|
|
35
|
-
"storybook-prep": "run-s generate-utilities build-scss-variables
|
|
36
|
+
"storybook-prep": "run-s copy-fonts build-tokens generate-utilities build-scss-variables",
|
|
36
37
|
"storybook-static": "yarn storybook-prep && storybook build -c .storybook -o storybook",
|
|
37
|
-
"pretest:unit": "yarn build-scss-variables",
|
|
38
|
+
"pretest:unit": "yarn build-tokens build-scss-variables",
|
|
38
39
|
"test": "run-s test:unit test:visual",
|
|
39
40
|
"test:integration": "NODE_ENV=test start-server-and-test start http://${STORYBOOK_HOST:-localhost}:9001/iframe.html cy:run",
|
|
40
41
|
"test:unit": "NODE_ENV=test jest --testPathIgnorePatterns storyshots.spec.js",
|
|
@@ -117,7 +118,7 @@
|
|
|
117
118
|
"babel-loader": "^8.0.5",
|
|
118
119
|
"babel-plugin-require-context-hook": "^1.0.0",
|
|
119
120
|
"bootstrap": "4.6.2",
|
|
120
|
-
"cypress": "12.
|
|
121
|
+
"cypress": "12.16.0",
|
|
121
122
|
"emoji-regex": "^10.0.0",
|
|
122
123
|
"eslint": "8.42.0",
|
|
123
124
|
"eslint-import-resolver-jest": "3.0.2",
|
|
@@ -155,6 +156,7 @@
|
|
|
155
156
|
"start-server-and-test": "^1.10.6",
|
|
156
157
|
"storybook": "7.0.23",
|
|
157
158
|
"storybook-dark-mode": "3.0.0",
|
|
159
|
+
"style-dictionary": "^3.8.0",
|
|
158
160
|
"stylelint": "14.9.1",
|
|
159
161
|
"stylelint-config-prettier": "^9.0.5",
|
|
160
162
|
"stylelint-prettier": "3.0.0",
|
|
@@ -2,7 +2,7 @@ import times from 'lodash/times';
|
|
|
2
2
|
import { GlAreaChart } from '../../../charts';
|
|
3
3
|
import { mockAnnotationsSeries, mockAnnotationsConfigs } from '../../../utils/charts/mock_data';
|
|
4
4
|
import { toolbox } from '../../../utils/charts/story_config';
|
|
5
|
-
import {
|
|
5
|
+
import { DATA_VIZ_AQUA_500, DATA_VIZ_ORANGE_600 } from '../../../../dist/tokens/js/tokens';
|
|
6
6
|
import { timeSeriesDateFormatter } from '../../../utils/charts/utils';
|
|
7
7
|
import { generateTimeSeries } from '../../../utils/data_utils';
|
|
8
8
|
import { disableControls } from '../../../utils/stories_utils';
|
|
@@ -163,13 +163,13 @@ WithCustomLegendItems.args = generateProps({
|
|
|
163
163
|
{
|
|
164
164
|
name: 'Custom Legend Item 1',
|
|
165
165
|
type: 'solid',
|
|
166
|
-
color:
|
|
166
|
+
color: DATA_VIZ_ORANGE_600,
|
|
167
167
|
data: [10, 20],
|
|
168
168
|
},
|
|
169
169
|
{
|
|
170
170
|
name: 'Custom Legend Item 2',
|
|
171
171
|
type: 'solid',
|
|
172
|
-
color:
|
|
172
|
+
color: DATA_VIZ_AQUA_500,
|
|
173
173
|
data: [30, 50],
|
|
174
174
|
},
|
|
175
175
|
],
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<script>
|
|
2
2
|
import merge from 'lodash/merge';
|
|
3
|
-
import {
|
|
3
|
+
import { GRAY_200 } from '../../../../dist/tokens/js/tokens';
|
|
4
4
|
import {
|
|
5
5
|
defaultChartOptions,
|
|
6
6
|
dataZoomAdjustments,
|
|
@@ -108,7 +108,7 @@ export default {
|
|
|
108
108
|
alignWithLabel: true,
|
|
109
109
|
show: true,
|
|
110
110
|
lineStyle: {
|
|
111
|
-
color:
|
|
111
|
+
color: GRAY_200,
|
|
112
112
|
},
|
|
113
113
|
},
|
|
114
114
|
axisLabel: {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<!-- eslint-disable vue/multi-word-component-names -->
|
|
2
2
|
<script>
|
|
3
3
|
import merge from 'lodash/merge';
|
|
4
|
-
import {
|
|
4
|
+
import { WHITE, GRAY_100 } from '../../../../dist/tokens/js/tokens';
|
|
5
5
|
import { getDefaultTooltipContent } from '../../../utils/charts/config';
|
|
6
6
|
import { TOOLTIP_LEFT_OFFSET, HEIGHT_AUTO_CLASSES } from '../../../utils/charts/constants';
|
|
7
7
|
import { heatmapHues } from '../../../utils/charts/theme';
|
|
@@ -138,7 +138,7 @@ export default {
|
|
|
138
138
|
right: '32px',
|
|
139
139
|
show: true,
|
|
140
140
|
borderWidth: 0,
|
|
141
|
-
backgroundColor:
|
|
141
|
+
backgroundColor: GRAY_100,
|
|
142
142
|
},
|
|
143
143
|
visualMap: {
|
|
144
144
|
min,
|
|
@@ -162,7 +162,7 @@ export default {
|
|
|
162
162
|
show: true,
|
|
163
163
|
interval: 0,
|
|
164
164
|
lineStyle: {
|
|
165
|
-
color:
|
|
165
|
+
color: WHITE,
|
|
166
166
|
width: 2,
|
|
167
167
|
},
|
|
168
168
|
},
|
|
@@ -189,7 +189,7 @@ export default {
|
|
|
189
189
|
show: true,
|
|
190
190
|
interval: 0,
|
|
191
191
|
lineStyle: {
|
|
192
|
-
color:
|
|
192
|
+
color: WHITE,
|
|
193
193
|
width: 2,
|
|
194
194
|
},
|
|
195
195
|
},
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
SERIES_NAME_LONG,
|
|
7
7
|
SERIES_NAME_LONG_WITHOUT_SPACES,
|
|
8
8
|
} from '../../../utils/stories_constants';
|
|
9
|
-
import {
|
|
9
|
+
import { GRAY_200 } from '../../../../dist/tokens/js/tokens';
|
|
10
10
|
import readme from './legend.md';
|
|
11
11
|
|
|
12
12
|
const generateOptions = (seriesLength, seriesNameType) => {
|
|
@@ -84,7 +84,7 @@ const baseStoryOptions = {
|
|
|
84
84
|
const disabledLegendItem = {
|
|
85
85
|
type: 'solid',
|
|
86
86
|
name: 'Disabled Item',
|
|
87
|
-
color:
|
|
87
|
+
color: GRAY_200,
|
|
88
88
|
disabled: true,
|
|
89
89
|
};
|
|
90
90
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<!-- eslint-disable vue/multi-word-component-names -->
|
|
2
2
|
<script>
|
|
3
3
|
import * as echarts from 'echarts';
|
|
4
|
-
import {
|
|
4
|
+
import { GRAY_200 } from '../../../../dist/tokens/js/tokens';
|
|
5
5
|
import { defaultFontSize } from '../../../utils/charts/config';
|
|
6
6
|
import {
|
|
7
7
|
LEGEND_LAYOUT_INLINE,
|
|
@@ -138,7 +138,7 @@ export default {
|
|
|
138
138
|
this.chart.dispatchAction({ type: 'downplay', seriesName: name });
|
|
139
139
|
},
|
|
140
140
|
getColor(color, key) {
|
|
141
|
-
return this.disabledSeries[key] ?
|
|
141
|
+
return this.disabledSeries[key] ? GRAY_200 : color;
|
|
142
142
|
},
|
|
143
143
|
suppressLastActiveSeriesLabelToggle({ selected }) {
|
|
144
144
|
const selectedSeriesLabels = Object.entries(selected).filter(([, isSelected]) =>
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
*/
|
|
20
20
|
|
|
21
21
|
import merge from 'lodash/merge';
|
|
22
|
-
import {
|
|
22
|
+
import { GRAY_200 } from '../../../../dist/tokens/js/tokens';
|
|
23
23
|
import {
|
|
24
24
|
defaultChartOptions,
|
|
25
25
|
grid,
|
|
@@ -202,7 +202,7 @@ export default {
|
|
|
202
202
|
alignWithLabel: true,
|
|
203
203
|
show: true,
|
|
204
204
|
lineStyle: {
|
|
205
|
-
color:
|
|
205
|
+
color: GRAY_200,
|
|
206
206
|
},
|
|
207
207
|
},
|
|
208
208
|
},
|
package/src/scss/utilities.scss
CHANGED
|
@@ -1149,6 +1149,14 @@
|
|
|
1149
1149
|
border-left-color: transparent !important;
|
|
1150
1150
|
}
|
|
1151
1151
|
|
|
1152
|
+
.gl-border-gray-10 {
|
|
1153
|
+
border-color: $gray-10;
|
|
1154
|
+
}
|
|
1155
|
+
|
|
1156
|
+
.gl-border-gray-10\! {
|
|
1157
|
+
border-color: $gray-10 !important;
|
|
1158
|
+
}
|
|
1159
|
+
|
|
1152
1160
|
.gl-border-gray-50 {
|
|
1153
1161
|
border-color: $gray-50;
|
|
1154
1162
|
}
|