Merge branch 'main' of github.com:pixiv/charcoal into toshusai/update…

…-textfield-structure
pixiv · Nov 13, 2023 · d181427 · d181427
2 parents 9e2be10 + 9154b54
commit d181427
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/packages/react/src/components/TextArea/__snapshots__/TextArea.story.storyshot b/packages/react/src/components/TextArea/__snapshots__/TextArea.story.storyshot
@@ -1183,7 +1183,7 @@ exports[`Storyshots TextArea Has Label 1`] = `
   display: flow-root;
   margin-top: 8px;
   margin-bottom: 0px;
-  color: var(--charcoal-text1);
+  color: var(--charcoal-text2);
 }
 
 .c13::before {

diff --git a/packages/react/src/components/TextArea/index.tsx b/packages/react/src/components/TextArea/index.tsx
@@ -242,6 +242,6 @@ const AssistiveText = styled.p<{ invalid: boolean }>`
       o.typography(14),
       o.margin.top(8),
       o.margin.bottom(0),
-      o.font[p.invalid ? 'assertive' : 'text1'],
+      o.font[p.invalid ? 'assertive' : 'text2'],
     ])}
 `
diff --git a/packages/react/src/components/TextField/__snapshots__/TextField.story.storyshot b/packages/react/src/components/TextField/__snapshots__/TextField.story.storyshot
@@ -1146,7 +1146,7 @@ exports[`Storyshots TextField Has Label 1`] = `
   line-height: 22px;
   margin-top: 4px;
   margin-bottom: -4px;
-  color: var(--charcoal-text1);
+  color: var(--charcoal-text2);
 }
 
 .c0 {

diff --git a/packages/react/src/components/TextField/index.tsx b/packages/react/src/components/TextField/index.tsx
@@ -246,5 +246,5 @@ const AssistiveText = styled.p<{ invalid: boolean }>`
   line-height: 22px;
   margin-top: 4px;
   margin-bottom: -4px;
-  color: ${(p) => `var(--charcoal-${p.invalid ? `assertive` : `text1`})`};
+  color: ${(p) => `var(--charcoal-${p.invalid ? `assertive` : `text2`})`};
 `