-
Notifications
You must be signed in to change notification settings - Fork 0
[INIT] 디자인 시스템 토큰 및 스토리 세팅 #44
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
b4f903a
chore(config): Tailwind 토큰 파일 구조 분리 (#41)
yumin-kim2 f0456a5
chore(config): 디자인 시스템 색상 토큰 추가 (#41)
yumin-kim2 49a4c55
chore(config): 디자인 시스템 타이포그래피 토큰 추가 (#41)
yumin-kim2 9934de0
chore(config): 디자인 시스템 radius 토큰 추가 (#41)
yumin-kim2 eb24f46
chore(web): rem 기준 전역 폰트 크기 설정 (#41)
yumin-kim2 d7cf0c0
fix(ui): Storybook 빌드 산출물 lint 제외 (#41)
yumin-kim2 1cc5238
fix(config): Pretendard 폰트 fallback 추가 (#41)
yumin-kim2 18afab4
Merge remote-tracking branch 'origin/develop' into init/ui/41-design-…
yumin-kim2 dba0ef4
chore(ui): 색상 토큰 Storybook 스토리 추가 (#41)
yumin-kim2 04e55e3
chore(ui): 타이포그래피 토큰 Storybook 스토리 추가 (#41)
yumin-kim2 af9db14
fix(config): 디자인 시스템 리뷰 반영 (#41)
yumin-kim2 2eecf01
chore(web): Pretendard 로컬 폰트 적용 (#41)
yumin-kim2 3fa2318
chore(ui): Storybook Tailwind 및 Pretendard 설정 (#41)
yumin-kim2 2a37467
chore(ui): 토큰 스토리 폰트 적용 및 컴포넌트 export (#41)
yumin-kim2 8c4d713
chore(config): 타이포그래피 토큰 px 기준으로 수정 (#41)
yumin-kim2 70bea01
chore(ui): 토큰 스토리 안내 문구 제거 (#41)
yumin-kim2 77ae944
chore(web): 루트 레이아웃에서 Pretendard 폰트 설정 (#41)
yumin-kim2 4d39ecd
fix(ui): 디자인 시스템 패키지에 Pretendard 적용 (#41)
yumin-kim2 eaca266
Apply suggestion from @kimminna
yumin-kim2 b8f542a
fix(ui): Storybook 전역 폰트 적용 중복 수정 (#41)
yumin-kim2 e7bb1df
fix(ui): Storybook 타이포그래피 토큰 적용 수정 (#41)
yumin-kim2 c359a41
feat(ui): 디자인 시스템 컴포넌트 Tailwind 스타일 적용 (#41)
kimminna File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| @import "tailwindcss"; | ||
| @import "@repo/tailwind-config/theme.css"; | ||
| @import "@repo/timo-design-system/styles"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| @theme { | ||
| --color-primary: #111111; | ||
| --color-background: #ffffff; | ||
| --color-foreground: #171717; | ||
| } | ||
| @import "./tokens/colors.css"; | ||
|
yumin-kim2 marked this conversation as resolved.
|
||
| @import "./tokens/typography.css"; | ||
| @import "./tokens/radius.css"; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| @theme { | ||
| --color-timo-blue-50: #F1F6FE; | ||
| --color-timo-blue-75: #C6D8FC; | ||
| --color-timo-blue-100: #AEC8FB; | ||
| --color-timo-blue-200: #8CB0F9; | ||
| --color-timo-blue-300: #74A0F8; | ||
|
|
||
| --color-timo-gray-300: #F5F5F5; | ||
| --color-timo-gray-500: #E6E8E8; | ||
| --color-timo-gray-600: #D8D8D8; | ||
| --color-timo-gray-700: #9F9F9F; | ||
| --color-timo-gray-800: #757575; | ||
| --color-timo-gray-900: #3F3F3F; | ||
|
|
||
| --color-timo-yellow-300: #F2FC9F; | ||
|
yumin-kim2 marked this conversation as resolved.
|
||
|
|
||
| --color-timo-black: #121212; | ||
| --color-timo-red: #FF6650; | ||
| --color-timo-orange: #FFB157; | ||
| --color-timo-green: #9FDDA9; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| @theme { | ||
| --radius-4: 4px; | ||
| --radius-8: 8px; | ||
| --radius-12: 12px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| @theme { | ||
| --font-pretendard: var(--font-family-pretendard), sans-serif; | ||
|
|
||
| /* Headline */ | ||
| --typo-size-headline-b-30: 30px; | ||
| --typo-line-height-headline-b-30: 1.5; | ||
| --typo-letter-spacing-headline-b-30: -0.03em; | ||
| --typo-font-weight-headline-b-30: 700; | ||
|
|
||
| --typo-size-headline-b-24: 24px; | ||
| --typo-line-height-headline-b-24: 1.5; | ||
| --typo-letter-spacing-headline-b-24: -0.03em; | ||
| --typo-font-weight-headline-b-24: 700; | ||
|
|
||
| --typo-size-headline-b-22: 22px; | ||
| --typo-line-height-headline-b-22: 1.5; | ||
| --typo-letter-spacing-headline-b-22: -0.03em; | ||
| --typo-font-weight-headline-b-22: 700; | ||
|
|
||
| --typo-size-headline-b-20: 20px; | ||
| --typo-line-height-headline-b-20: 1.5; | ||
| --typo-letter-spacing-headline-b-20: -0.03em; | ||
| --typo-font-weight-headline-b-20: 700; | ||
|
|
||
| --typo-size-headline-b-18: 18px; | ||
| --typo-line-height-headline-b-18: 1.5; | ||
| --typo-letter-spacing-headline-b-18: -0.03em; | ||
| --typo-font-weight-headline-b-18: 700; | ||
|
|
||
| --typo-size-headline-b-16: 16px; | ||
| --typo-line-height-headline-b-16: 1.5; | ||
| --typo-letter-spacing-headline-b-16: -0.03em; | ||
| --typo-font-weight-headline-b-16: 700; | ||
|
|
||
| --typo-size-headline-m-16: 16px; | ||
| --typo-line-height-headline-m-16: 1.5; | ||
| --typo-letter-spacing-headline-m-16: -0.03em; | ||
| --typo-font-weight-headline-m-16: 500; | ||
|
|
||
| --typo-size-headline-b-14: 14px; | ||
| --typo-line-height-headline-b-14: 1.5; | ||
| --typo-letter-spacing-headline-b-14: -0.03em; | ||
| --typo-font-weight-headline-b-14: 700; | ||
|
|
||
| --typo-size-headline-m-14: 14px; | ||
| --typo-line-height-headline-m-14: 1.5; | ||
| --typo-letter-spacing-headline-m-14: -0.03em; | ||
| --typo-font-weight-headline-m-14: 500; | ||
|
|
||
| --typo-size-headline-r-14: 14px; | ||
| --typo-line-height-headline-r-14: 1.5; | ||
| --typo-letter-spacing-headline-r-14: -0.03em; | ||
| --typo-font-weight-headline-r-14: 400; | ||
|
|
||
| /* Body */ | ||
| --typo-size-body-b-12: 12px; | ||
| --typo-line-height-body-b-12: 1.5; | ||
| --typo-letter-spacing-body-b-12: -0.03em; | ||
| --typo-font-weight-body-b-12: 700; | ||
|
|
||
| --typo-size-body-sb-12: 12px; | ||
| --typo-line-height-body-sb-12: 1.5; | ||
| --typo-letter-spacing-body-sb-12: -0.03em; | ||
| --typo-font-weight-body-sb-12: 600; | ||
|
|
||
| --typo-size-body-m-12: 12px; | ||
| --typo-line-height-body-m-12: 1.5; | ||
| --typo-letter-spacing-body-m-12: -0.03em; | ||
| --typo-font-weight-body-m-12: 500; | ||
|
|
||
| --typo-size-body-r-12: 12px; | ||
| --typo-line-height-body-r-12: 1.5; | ||
| --typo-letter-spacing-body-r-12: -0.03em; | ||
| --typo-font-weight-body-r-12: 400; | ||
|
|
||
| --typo-size-body-sb-11: 11px; | ||
| --typo-line-height-body-sb-11: 1.5; | ||
| --typo-letter-spacing-body-sb-11: -0.03em; | ||
| --typo-font-weight-body-sb-11: 600; | ||
|
|
||
| /* Caption */ | ||
| --typo-size-caption-r-10: 10px; | ||
| --typo-line-height-caption-r-10: 1.5; | ||
| --typo-letter-spacing-caption-r-10: -0.03em; | ||
| --typo-font-weight-caption-r-10: 400; | ||
| } | ||
|
|
||
| @utility typo-* { | ||
| font-size: --value(--typo-size-*); | ||
| line-height: --value(--typo-line-height-*); | ||
| letter-spacing: --value(--typo-letter-spacing-*); | ||
| font-weight: --value(--typo-font-weight-*); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| import { config } from "@repo/eslint-config/react-internal"; | ||
|
|
||
| /** @type {import("eslint").Linter.Config} */ | ||
| export default config; | ||
| export default [ | ||
| { | ||
| ignores: ["storybook-static/**"], | ||
| }, | ||
| ...config, | ||
| ]; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| const config = { | ||
| plugins: { | ||
| "@tailwindcss/postcss": {}, | ||
| }, | ||
| }; | ||
|
|
||
| export default config; |
Binary file added
BIN
+1.96 MB
packages/timo-design-system/src/assets/fonts/PretendardVariable.woff2
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| export {}; | ||
| export { Color } from "./color/Color"; | ||
| export { Typography } from "./typography/Typography"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @source "../components"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| @import "tailwindcss"; | ||
| @import "@repo/tailwind-config/theme.css"; | ||
|
|
||
| @font-face { | ||
| font-family: "Pretendard"; | ||
| src: url("../assets/fonts/PretendardVariable.woff2") format("woff2"); | ||
| font-weight: 45 920; | ||
| font-style: normal; | ||
| font-display: swap; | ||
| } | ||
| @layer base { | ||
| * { | ||
| font-family: var(--font-family-pretendard), sans-serif; | ||
| } | ||
| } | ||
|
|
||
|
yumin-kim2 marked this conversation as resolved.
|
||
| :root { | ||
| --font-family-pretendard: "Pretendard"; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| export interface ColorToken { | ||
| name: string; | ||
| cssVar: string; | ||
| value: string; | ||
| } | ||
|
|
||
| export const COLOR_TOKENS: ColorToken[] = [ | ||
| { name: "timo-blue-50", cssVar: "--color-timo-blue-50", value: "#F1F6FE" }, | ||
| { name: "timo-blue-75", cssVar: "--color-timo-blue-75", value: "#C6D8FC" }, | ||
| { name: "timo-blue-100", cssVar: "--color-timo-blue-100", value: "#AEC8FB" }, | ||
| { name: "timo-blue-200", cssVar: "--color-timo-blue-200", value: "#8CB0F9" }, | ||
| { name: "timo-blue-300", cssVar: "--color-timo-blue-300", value: "#74A0F8" }, | ||
|
|
||
| { name: "timo-gray-300", cssVar: "--color-timo-gray-300", value: "#F5F5F5" }, | ||
| { name: "timo-gray-500", cssVar: "--color-timo-gray-500", value: "#E6E8E8" }, | ||
| { name: "timo-gray-600", cssVar: "--color-timo-gray-600", value: "#D8D8D8" }, | ||
| { name: "timo-gray-700", cssVar: "--color-timo-gray-700", value: "#9F9F9F" }, | ||
| { name: "timo-gray-800", cssVar: "--color-timo-gray-800", value: "#757575" }, | ||
| { name: "timo-gray-900", cssVar: "--color-timo-gray-900", value: "#3F3F3F" }, | ||
|
|
||
| { | ||
| name: "timo-yellow-300", | ||
| cssVar: "--color-timo-yellow-300", | ||
| value: "#F2FC9F", | ||
| }, | ||
| { name: "timo-black", cssVar: "--color-timo-black", value: "#121212" }, | ||
| { name: "timo-red", cssVar: "--color-timo-red", value: "#FF6650" }, | ||
| { name: "timo-orange", cssVar: "--color-timo-orange", value: "#FFB157" }, | ||
| { name: "timo-green", cssVar: "--color-timo-green", value: "#9FDDA9" }, | ||
| ]; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.