Skip to content

Refactor : 뱃지 반응형 수정 #53

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
llmojoll merged 3 commits into from
Jul 25, 2025
Merged

Refactor : 뱃지 반응형 수정 #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4e7d05
Refactor : 뱃지 반응형 수정
llmojoll Jul 24, 2025
8904b2f
Merge branch 'dev' into refactor/badge
llmojoll Jul 25, 2025
9145591
Merge branch 'dev' into refactor/badge
llmojoll Jul 25, 2025
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: 2 additions & 2 deletions src/components/ui/badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ const badgeVariants = cva(
variant: {
//모달에서 테블릿,데탑 h-46 px-2.5 py-4.5 별로 조금씩다름 나중에 조정필요
chooseFlavor:
'bg-white text-black custom-text-md-medium md:custom-text-lg-medium border border-gray-300 hover:bg-primary hover:text-white hover:border-primary h-[36px] rounded-full px-2.5 py-1.5',
'bg-white text-black custom-text-md-medium md:custom-text-lg-medium border border-gray-300 hover:bg-primary-100 hover:text-white hover:border-primary h-[36px] rounded-full px-2.5 py-1.5 md:px-[18px] md:py-2.5',
chooseWineType:
'bg-white text-black custom-text-md-medium md:custom-text-lg-medium border border-gray-300 hover:bg-primary hover:text-white hover:border-primary h-[36px] md:h-[42px] rounded-full px-2.5 py-1.5',
'bg-white text-black custom-text-md-medium md:custom-text-lg-medium border border-gray-300 hover:bg-primary hover:text-white hover:border-primary h-[36px] md:h-[42px] rounded-full px-2.5 py-1.5 md:px-[18px] md:py-2.5',
Copy link
Collaborator

@Luganic Luganic Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

뱃지 스타일 수정 확인했습니다. 승인 하겠습니다!

Copy link
Collaborator

@summerDev96 summerDev96 Jul 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

빠른 수정사항 반영 감사합니다! 확인했습니다

priceBadge:
'bg-primary-100 text-primary custom-text-md-bold md:custom-text-2lg-bold h-[29px] md:h-[42px] px-2.5 py-[2.5px] md:px-2.5 md:py-1.5 rounded-[10px] md:rounded-[12px]',
flavor:
Expand Down