Skip to content

Commit 15df5a7

Browse files
matmkianmatmkian
authored
Merge pull request #760 from lumapps/chore/fix-design-token-config
chore(style-dictionary): fix hard coded path
2 parents 40c7f2e + c3e343b commit 15df5a7

File tree

5 files changed

+46
-4
lines changed

5 files changed

+46
-4
lines changed

‎packages/lumx-core/src/css/design-tokens.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Do not edit directly
3-
* Generated on Fri, 07 Jan 2022 12:33:59 GMT
3+
* Generated on Wed, 12 Jan 2022 07:13:33 GMT
44
*/
55

66
:root {
@@ -327,10 +327,12 @@
327327
--lumx-text-field-state-hover-input-border-right-width: 1px;
328328
--lumx-text-field-state-hover-input-border-bottom-width: 1px;
329329
--lumx-text-field-state-hover-input-border-left-width: 1px;
330+
--lumx-text-field-state-hover-theme-light-header-label-color: var(--lumx-color-dark-N);
330331
--lumx-text-field-state-hover-theme-light-input-background-color: var(--lumx-color-dark-L5);
331332
--lumx-text-field-state-hover-theme-light-input-border-color: var(--lumx-color-dark-L4);
332333
--lumx-text-field-state-hover-theme-light-input-content-color: var(--lumx-color-dark-N);
333334
--lumx-text-field-state-hover-theme-light-input-placeholder-color: var(--lumx-color-dark-L2);
335+
--lumx-text-field-state-hover-theme-dark-header-label-color: var(--lumx-color-light-N);
334336
--lumx-text-field-state-hover-theme-dark-input-background-color: var(--lumx-color-light-L5);
335337
--lumx-text-field-state-hover-theme-dark-input-border-color: var(--lumx-color-light-L4);
336338
--lumx-text-field-state-hover-theme-dark-input-content-color: var(--lumx-color-light-N);

‎packages/lumx-core/src/js/constants/design-tokens.ts

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Do not edit directly
3-
* Generated on Fri, 07 Jan 2022 12:33:59 GMT
3+
* Generated on Wed, 12 Jan 2022 07:13:33 GMT
44
*/
55

66
export const DESIGN_TOKENS = {
@@ -1188,6 +1188,15 @@ export const DESIGN_TOKENS = {
11881188
},
11891189
},
11901190
'theme-light': {
1191+
header: {
1192+
label: {
1193+
color: {
1194+
value: 'var(--lumx-color-dark-N)',
1195+
attributes: { hex: '000000', rgb: { r: 0, g: 0, b: 0, a: 0.87 } },
1196+
$aliasedFrom: 'color.dark.N',
1197+
},
1198+
},
1199+
},
11911200
input: {
11921201
'background-color': {
11931202
value: 'var(--lumx-color-dark-L5)',
@@ -1216,6 +1225,15 @@ export const DESIGN_TOKENS = {
12161225
},
12171226
},
12181227
'theme-dark': {
1228+
header: {
1229+
label: {
1230+
color: {
1231+
value: 'var(--lumx-color-light-N)',
1232+
attributes: { hex: 'ffffff', rgb: { r: 255, g: 255, b: 255, a: 1 } },
1233+
$aliasedFrom: 'color.light.N',
1234+
},
1235+
},
1236+
},
12191237
input: {
12201238
'background-color': {
12211239
value: 'var(--lumx-color-light-L5)',

‎packages/lumx-core/src/scss/_design-tokens.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Do not edit directly
3-
* Generated on Fri, 07 Jan 2022 12:33:59 GMT
3+
* Generated on Wed, 12 Jan 2022 07:13:33 GMT
44
*/
55

66
$lumx-button-height: 36px !default;
@@ -334,10 +334,12 @@ $lumx-text-field-state-hover-input-border-top-width: 1px !default;
334334
$lumx-text-field-state-hover-input-border-right-width: 1px !default;
335335
$lumx-text-field-state-hover-input-border-bottom-width: 1px !default;
336336
$lumx-text-field-state-hover-input-border-left-width: 1px !default;
337+
$lumx-text-field-state-hover-theme-light-header-label-color: var(--lumx-color-dark-N) !default;
337338
$lumx-text-field-state-hover-theme-light-input-background-color: var(--lumx-color-dark-L5) !default;
338339
$lumx-text-field-state-hover-theme-light-input-border-color: var(--lumx-color-dark-L4) !default;
339340
$lumx-text-field-state-hover-theme-light-input-content-color: var(--lumx-color-dark-N) !default;
340341
$lumx-text-field-state-hover-theme-light-input-placeholder-color: var(--lumx-color-dark-L2) !default;
342+
$lumx-text-field-state-hover-theme-dark-header-label-color: var(--lumx-color-light-N) !default;
341343
$lumx-text-field-state-hover-theme-dark-input-background-color: var(--lumx-color-light-L5) !default;
342344
$lumx-text-field-state-hover-theme-dark-input-border-color: var(--lumx-color-light-L4) !default;
343345
$lumx-text-field-state-hover-theme-dark-input-content-color: var(--lumx-color-light-N) !default;
@@ -1298,6 +1300,11 @@ $lumx-design-tokens: (
12981300
),
12991301
),
13001302
'theme-light': (
1303+
'header': (
1304+
'label': (
1305+
'color': $lumx-text-field-state-hover-theme-light-header-label-color,
1306+
),
1307+
),
13011308
'input': (
13021309
'background-color': $lumx-text-field-state-hover-theme-light-input-background-color,
13031310
'border-color': $lumx-text-field-state-hover-theme-light-input-border-color,
@@ -1310,6 +1317,11 @@ $lumx-design-tokens: (
13101317
),
13111318
),
13121319
'theme-dark': (
1320+
'header': (
1321+
'label': (
1322+
'color': $lumx-text-field-state-hover-theme-dark-header-label-color,
1323+
),
1324+
),
13131325
'input': (
13141326
'background-color': $lumx-text-field-state-hover-theme-dark-input-background-color,
13151327
'border-color': $lumx-text-field-state-hover-theme-dark-input-border-color,

‎packages/lumx-core/style-dictionary/config/utils/_prettier-ts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = function ({ buildPath }) {
77
const name = 'prettier/ts';
88
StyleDictionary.registerAction({
99
name,
10-
do: () => execSync(`${bin}/eslint --fix '${path.resolve('/home/gcornut/git/design-system/packages/lumx-core/src/js/constants/design-tokens.ts')}'`),
10+
do: () => execSync(`${bin}/eslint --fix '${path.resolve(buildPath)}'`),
1111
});
1212
return name;
1313
};

‎packages/lumx-core/style-dictionary/properties/components/text-field.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@
7777
}
7878
},
7979
"theme-light": {
80+
"header": {
81+
"label": {
82+
"color": "{color.dark.N}"
83+
}
84+
},
8085
"input": {
8186
"background-color": "{color.dark.L5}",
8287
"border-color": "{color.dark.L4}",
@@ -89,6 +94,11 @@
8994
}
9095
},
9196
"theme-dark": {
97+
"header": {
98+
"label": {
99+
"color": "{color.light.N}"
100+
}
101+
},
92102
"input": {
93103
"background-color": "{color.light.L5}",
94104
"border-color": "{color.light.L4}",

0 commit comments

Comments
 (0)