Skip to content

Commit b80f581

Browse files
authored
Merge pull request #363 from DaleStudy/360-color-token-update
Color 토큰 변경사항 업데이트
2 parents 84cdc6f + a6fab05 commit b80f581

File tree

5 files changed

+44
-20
lines changed

5 files changed

+44
-20
lines changed

src/components/Link/Link.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ export const Tones: StoryObj<typeof Link> = {
3838
<Link {...args} tone="danger">
3939
위험 링크
4040
</Link>
41-
<Link {...args} tone="warning">
41+
{/* <Link {...args} tone="warning">
4242
경고 링크
43-
</Link>
43+
</Link> */}
4444
<Link {...args} tone="success">
4545
성공 링크
4646
</Link>

src/components/Link/Link.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe("스타일 테스트", () => {
3030
["중립 링크", "c_fg.neutral"],
3131
["브랜드 링크", "c_fg.brand"],
3232
["위험 링크", "c_fg.danger"],
33-
["경고 링크", "c_fg.warning"],
33+
// ["경고 링크", "c_fg.warning"],
3434
["성공 링크", "c_fg.success"],
3535
["정보 링크", "c_fg.info"],
3636
] as const)("%s에 올바른 톤 클래스를 적용한다", (linkName, className) => {

src/components/Text/Text.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export const Tones: StoryObj<typeof Text> = {
2727
<Text {...args} tone="danger">
2828
위험 색조
2929
</Text>
30-
<Text {...args} tone="warning">
30+
{/* <Text {...args} tone="warning">
3131
경고 색조
32-
</Text>
32+
</Text> */}
3333
<Text {...args} tone="success">
3434
성공 색조
3535
</Text>

src/components/Text/Text.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test.each([
3737
["중립 색조", "c_fg.neutral"],
3838
["브랜드 색조", "c_fg.brand"],
3939
["위험 색조", "c_fg.danger"],
40-
["경고 색조", "c_fg.warning"],
40+
// ["경고 색조", "c_fg.warning"],
4141
["성공 색조", "c_fg.success"],
4242
["정보 색조", "c_fg.info"],
4343
] as const)("%s에 올바른 톤 클래스를 적용한다", (textName, className) => {

src/tokens/colors.ts

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ export const semanticColors: SemanticTokens["colors"] = {
1313
value: { base: "{colors.white}", _dark: "{colors.black}" },
1414
},
1515
fgSolid: {
16-
brand: {
17-
value: { base: "{colors.violet.1}", _dark: "{colors.darkTeal.1}" },
18-
},
1916
neutral: {
2017
value: { base: "{colors.slate.1}", _dark: "{colors.darkSage.1}" },
2118
},
19+
brand: {
20+
value: { base: "{colors.violet.1}", _dark: "{colors.darkTeal.1}" },
21+
},
2222
success: {
2323
value: { base: "{colors.green.1}", _dark: "{colors.darkGreen.1}" },
2424
},
@@ -42,7 +42,7 @@ export const semanticColors: SemanticTokens["colors"] = {
4242
},
4343
neutral: {
4444
DEFAULT: {
45-
value: { base: "{colors.slate.1}", _dark: "{colors.darkSage.1}" },
45+
value: { base: "{colors.white}", _dark: "{colors.darkSage.1}" },
4646
},
4747
hover: {
4848
value: { base: "{colors.slate.2}", _dark: "{colors.darkSage.2}" },
@@ -51,7 +51,7 @@ export const semanticColors: SemanticTokens["colors"] = {
5151
value: { base: "{colors.slate.3}", _dark: "{colors.darkSage.3}" },
5252
},
5353
disabled: {
54-
value: { base: "{colors.slate.5}", _dark: "{colors.darkSage.6}" },
54+
value: { base: "{colors.slate.5}", _dark: "{colors.darkSage.5}" },
5555
},
5656
},
5757
danger: {
@@ -144,13 +144,37 @@ export const semanticColors: SemanticTokens["colors"] = {
144144
},
145145
},
146146
success: {
147-
value: { base: "{colors.green.11}", _dark: "{colors.darkGreen.11}" },
147+
DEFAULT: {
148+
value: { base: "{colors.green.10}", _dark: "{colors.darkGreen.10}" },
149+
},
150+
hover: {
151+
value: { base: "{colors.green.11}", _dark: "{colors.darkGreen.11}" },
152+
},
153+
active: {
154+
value: { base: "{colors.green.12}", _dark: "{colors.darkGreen.12}" },
155+
},
148156
},
149157
warning: {
150-
value: { base: "{colors.amber.9}", _dark: "{colors.darkAmber.9}" },
158+
DEFAULT: {
159+
value: { base: "{colors.amber.9}", _dark: "{colors.darkAmber.10}" },
160+
},
161+
hover: {
162+
value: { base: "{colors.amber.10}", _dark: "{colors.darkAmber.11}" },
163+
},
164+
active: {
165+
value: { base: "{colors.amber.11}", _dark: "{colors.darkAmber.12}" },
166+
},
151167
},
152168
info: {
153-
value: { base: "{colors.blue.11}", _dark: "{colors.darkBlue.11}" },
169+
DEFAULT: {
170+
value: { base: "{colors.blue.10}", _dark: "{colors.darkBlue.10}" },
171+
},
172+
hover: {
173+
value: { base: "{colors.blue.11}", _dark: "{colors.darkBlue.11}" },
174+
},
175+
active: {
176+
value: { base: "{colors.blue.12}", _dark: "{colors.darkBlue.12}" },
177+
},
154178
},
155179
},
156180
fg: {
@@ -180,7 +204,7 @@ export const semanticColors: SemanticTokens["colors"] = {
180204
value: { base: "{colors.slate.7}", _dark: "{colors.darkSage.9}" },
181205
},
182206
disabled: {
183-
value: { base: "{colors.slate.8}", _dark: "{colors.darkSage.7}" },
207+
value: { base: "{colors.slate.10}", _dark: "{colors.darkSage.9}" },
184208
},
185209
},
186210
success: {
@@ -354,7 +378,7 @@ export const colors: Tokens["colors"] = {
354378
8: { value: "#E2A336" },
355379
9: { value: "#FFC53D" },
356380
10: { value: "#FFBA18" },
357-
11: { value: "#AB6400" },
381+
11: { value: "#DD9E08" },
358382
12: { value: "#4F3422" },
359383
},
360384
darkAmber: {
@@ -381,8 +405,8 @@ export const colors: Tokens["colors"] = {
381405
7: { value: "#8EC8F6" },
382406
8: { value: "#5EB1EF" },
383407
9: { value: "#0090FF" },
384-
10: { value: "#0588F0" },
385-
11: { value: "#0D74CE" },
408+
10: { value: "#0463AF" },
409+
11: { value: "#095190" },
386410
12: { value: "#113264" },
387411
},
388412
darkBlue: {
@@ -409,8 +433,8 @@ export const colors: Tokens["colors"] = {
409433
7: { value: "#8ECEAA" },
410434
8: { value: "#5BB98B" },
411435
9: { value: "#30A46C" },
412-
10: { value: "#2B9A66" },
413-
11: { value: "#218358" },
436+
10: { value: "#21784F" },
437+
11: { value: "#1A6644" },
414438
12: { value: "#193B2D" },
415439
},
416440
darkGreen: {

0 commit comments

Comments
 (0)