Skip to content

[Refactor/#55] Button tertiary varient 추가 #56

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

Merged
jjjsun merged 2 commits into from
Feb 25, 2026
Merged

[Refactor/#55] Button tertiary varient 추가 #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8112e4
refactor: 텍스트 스타일 수정 및 Button tertiary varient 추가
jjjsun Feb 24, 2026
5b8d6b6
fix: 기존의 index.css로 원복. (추후에 폰트수정예정)
jjjsun Feb 24, 2026
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
4 changes: 4 additions & 0 deletions src/components/common/button/Button.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ export const Gradient: TButtonStory = {
args: { variant: "gradient" },
};

export const Tertiary: TButtonStory = {
args: { variant: "tertiary" },
};

export const Disabled: TButtonStory = {
args: { disabled: true },
};
Expand Down
5 changes: 4 additions & 1 deletion src/components/common/button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ interface IButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
| "danger"
| "dangerSoft"
| "gradient"
| "tertiary"
| "custom";
isLoading?: boolean;
leftIcon?: ReactNode;
Expand Down Expand Up @@ -46,6 +47,8 @@ export default function Button({
"bg-status-red/10 text-status-red border border-status-red hover:bg-status-red/20 disabled:bg-bg-disabled disabled:text-text-disabled disabled:border-gray-300 disabled:hover:bg-bg-disabled",
gradient:
"bg-linear-to-r from-logo-1 to-logo-2 text-white hover:opacity-90 shadow-brand-500/30 disabled:bg-bg-disabled disabled:text-text-disabled disabled:shadow-none disabled:hover:opacity-50",
tertiary:
"!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-component-lg bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out",
custom: "",
};

Expand All @@ -70,7 +73,7 @@ export default function Button({
{leftIcon}
</span>
)}
<span>{children}</span>
{children}
</button>
);
}
14 changes: 10 additions & 4 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ button {
}

.font-heading1 {
font-size: 30px;
font-size: 38px;
font-weight: 600;
line-height: 130%;
}
Expand All @@ -188,14 +188,20 @@ button {
}

.font-heading3 {
font-size: 18px;
font-weight: 400;
font-size: 25px;
font-weight: 500;
line-height: 130%;
}

.font-heading4 {
font-size: 22px;
font-weight: 600;
line-height: 130%;
}

.font-body1 {
font-size: 16px;
font-weight: 500;
font-weight: 600;
line-height: 140%;
}

Expand Down