Merge branch 'develop' into feat/#127-checkbox-component

yourssu · Jul 19, 2024 · bf3f598 · bf3f598
2 parents 5e88092 + 4a35d16
commit bf3f598
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/style/foundation/typo/Typo.stories.tsx b/src/style/foundation/typo/Typo.stories.tsx
@@ -6,7 +6,7 @@ import { styled } from 'styled-components';
 
 import TypoDocs from './TypoDocs.md?raw';
 
-import { typos, TypoType } from '.';
+import { typo, TypoType } from '.';
 
 const meta: Meta = {
   title: 'Foundation/Typos',
@@ -124,7 +124,7 @@ const TypoStory = () => {
       </TypoHeader>
       <TypoGrid>
         <TypoGridHead />
-        {Object.entries(typos).map(([typo, typoStyles]) => (
+        {Object.entries(typo).map(([typo, typoStyles]) => (
           <React.Fragment key={typo}>
             <TypoName>{typo}</TypoName>
             <TypoExample $typo={typo as TypoType}>{preview}</TypoExample>

diff --git a/src/style/foundation/typo/index.ts b/src/style/foundation/typo/index.ts
@@ -1,3 +1,3 @@
 export type { FontWeight, TypoType } from './typo.type';
 export type { Typos } from './typo';
-export { typos, fontWeights } from './typo';
+export { typo, fontWeights } from './typo';
diff --git a/src/style/foundation/typo/typo.ts b/src/style/foundation/typo/typo.ts
@@ -8,7 +8,7 @@ export const fontWeights: Record<FontWeight, number> = {
   SemiBold: 600,
 };
 
-export const typos: Typos = {
+export const typo: Typos = {
   D1_Lt_96: `
         font-size: 96px;
         font-weight: ${fontWeights.Light};

diff --git a/src/style/theme/YDSThemeProvider.tsx b/src/style/theme/YDSThemeProvider.tsx
@@ -4,7 +4,7 @@ import { ThemeProvider } from 'styled-components';
 
 import { useColorTheme } from '@/hooks';
 
-import { baseColorPalettes, semanticColorPalettes, typos } from '../foundation';
+import { baseColorPalettes, semanticColorPalettes, typo } from '../foundation';
 
 import { YDSTheme } from './theme.type';
 
@@ -18,7 +18,7 @@ export const YDSThemeProvider = ({ children }: YDSThemeProviderProps) => {
     const _theme: YDSTheme = {
       color: semanticColorPalettes.light,
       baseColor: baseColorPalettes.light,
-      typo: typos,
+      typo,
     };
 
     if (currentColorTheme === 'light') {

diff --git a/src/style/theme/theme.type.ts b/src/style/theme/theme.type.ts
@@ -1,7 +1,7 @@
-import { BaseColorPalette, SemanticColorPalette, KRENTypos } from '../foundation';
+import { BaseColorPalette, SemanticColorPalette, Typos } from '../foundation';
 
 export type YDSTheme = {
   color: SemanticColorPalette;
   baseColor: BaseColorPalette;
-  typo: KRENTypos;
+  typo: Typos;
 };