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.

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

[Merge] epic/FE-26브랜치 최신화 #8

Merged
merged 5 commits into from
Jul 10, 2024
Merged

Conversation

jisurk
Copy link
Contributor

@jisurk jisurk commented Jul 10, 2024

🔖 Issue Ticket

✍️ Description

main브랜치 변경점(공용 컬러, shadcn/ui) epic/FE-26브랜치에 병합 목적

✅ Checklist

PR

  • Branch Convention 확인

epic/ 에픽, feat/ 피쳐, fix/ 버그 수정, refactor/ 개선

  • Base Branch 확인
  • 적절한 Label 지정
  • Assignee 및 Reviewer 지정

Test

  • 로컬 작동 확인

Additional Notes

  • (없음)

전유민 and others added 5 commits July 8, 2024 10:50
* font-family 추가

* tailwind common color 추가

* color 명 변경

* lang 수정

---------

Co-authored-by: 전유민 <[email protected]>
* 💄 Feat: shadcn-ui init

* 💄 Feat: add toast ui

* Feat: add textarea ui

* Feat: add switch ui

* Feat: add radio-group ui

* Feat: add label ui

* Feat: add input ui

* Feat: add form ui

* Feat: add button ui

* Feat: add dropdown-menu ui

* Feat: add card ui

* Feat: add badge ui

* Feat: add avatar ui

* Feat: add alert dialog ui

* Chore: add eslint rules

* Chore: add shadcn ui
@jisurk jisurk merged commit 42cc95e into epic/FE-26 Jul 10, 2024
1 check passed
@jisurk jisurk deleted the merge/FE-26-to-main branch July 10, 2024 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants