Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feature/#13-title #17

Merged
merged 13 commits into from
Jan 11, 2023
Merged

feature/#13-title #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c2b15e8
#7 :lipstick: 버튼 컴포넌트 작성
seambark Dec 24, 2022
0d946e9
#7 :lipstick: 버튼 컴포넌트 수정
seambark Dec 26, 2022
6d8e769
#3 :lipstick: Input, Textarea, Toast
BonhaengLee Dec 30, 2022
85d2e4e
Merge branch 'feature/#7-button' of personal-github.com:imgonnado/sai…
BonhaengLee Dec 30, 2022
fef4685
#6 :lipstick: popup
BonhaengLee Dec 30, 2022
5275c23
#6 :lipstick: toast
BonhaengLee Dec 31, 2022
143b107
#13 :lipstick: title(Heading, Text)
BonhaengLee Jan 2, 2023
c792fd3
#13 :lipstick: Heading, Text 컴포넌트 스타일 추가
BonhaengLee Jan 7, 2023
02cb72d
Merge branch 'main' of personal-github.com:imgonnado/sait-web into fe…
BonhaengLee Jan 7, 2023
c31968c
#13 :wrench: Text 컴포넌트 오타
BonhaengLee Jan 7, 2023
fe1ef67
#13 :wrench: global 변수 오타
BonhaengLee Jan 7, 2023
fd9eaef
#13 :wrench: className props 추가
BonhaengLee Jan 8, 2023
66114f3
Merge branch 'main' of personal-github.com:imgonnado/sait-web into fe…
BonhaengLee Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#13 🔧 className props 추가
  • Loading branch information
@BonhaengLee
BonhaengLee committed Jan 8, 2023
commit fd9eaefeef8136bbc6f00781bd37547e15c82de3
5 changes: 4 additions & 1 deletion src/components/Typography/Heading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ type HeadingProps<C extends ElementType> = {
size?: "3xl" | "2xl" | "xl" | "lg" | "md" | "sm";
fw?: "demiLight" | "regular" | "medium" | "bold";
color?: "default" | "darkgray" | "gray" | "lightgray" | "light";
className?: string;
children: ReactNode;
} & ComponentPropsWithoutRef<C>;

Expand All @@ -16,6 +17,7 @@ function Heading<C extends ElementType = "h1">({
size = "lg",
fw = "regular",
color = "default",
className,
children,
...restProps
}: HeadingProps<C>) {
Expand All @@ -27,7 +29,8 @@ function Heading<C extends ElementType = "h1">({
styles.text,
styles[`${size}`],
styles[`${fw}`],
styles[`${color}`]
styles[`${color}`],
className
)}
{...restProps}
>
Expand Down
5 changes: 4 additions & 1 deletion src/components/Typography/Text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ type TextProps<C extends ElementType> = {
size?: "lg" | "md" | "sm" | "xs";
fw?: "demiLight" | "regular" | "medium" | "bold";
color?: "default" | "darkgray" | "gray" | "lightgray" | "light";
className?: string;
children: ReactNode;
} & ComponentPropsWithoutRef<C>;

Expand All @@ -16,6 +17,7 @@ function Text<C extends ElementType = "p">({
size = "lg",
fw = "regular",
color = "default",
className,
children,
...restProps
}: TextProps<C>) {
Expand All @@ -27,7 +29,8 @@ function Text<C extends ElementType = "p">({
styles.text,
styles[`${size}`],
styles[`${fw}`],
styles[`${color}`]
styles[`${color}`],
className
)}
{...restProps}
>
Expand Down