Skip to content

chore: 메인 브랜치 최신화 #140

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
seunghui-park merged 5 commits into from
Sep 9, 2025
Merged

chore: 메인 브랜치 최신화 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50f04b9
chore: 패딩 조정
dbstj0403 Sep 9, 2025
5a86ebb
Merge branch 'dev' of github.com:HANA-IEUM/Client into dev
dbstj0403 Sep 9, 2025
3eb353c
fix: update group name display and category label to "가족"
daehyun03 Sep 9, 2025
3d48427
Merge remote-tracking branch 'origin/dev' into dev
daehyun03 Sep 9, 2025
c03a2a2
style: padding top 수정
seunghui-park Sep 9, 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
2 changes: 1 addition & 1 deletion src/features/bucket-create/components/SelectCategory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const SelectCategory = ({
{ id: 'TRIP', label: '여행', color: 'pink' },
{ id: 'HOBBY', label: '취미', color: 'blue' },
{ id: 'HEALTH', label: '건강', color: 'yellow' },
{ id: 'FAMILY', label: '가족지원', color: 'green' },
{ id: 'FAMILY', label: '가족', color: 'green' },
];
const handleSelectCategory = (str: BucketCategoryType) => {
setCategory(str);
Expand Down
2 changes: 1 addition & 1 deletion src/features/family/components/FamilyHome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const FamilyHome = () => {
<div className="h-full w-full pt-12">
<div className="px-6">
<h1 className="font-hana-bold text-text-primary !mb-8 text-4xl">
가족
{groupInfo.groupName}
</h1>
</div>

Expand Down
6 changes: 3 additions & 3 deletions src/features/group-join/components/FamilyGroupEmptyStateCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const FamilyGroupEmptyStateCard = ({
const { user } = useAuth();

return (
<div className="relative flex h-full w-full flex-col items-center px-6 pt-28">
<div className="relative flex h-full w-full flex-col items-center px-6 pt-20">
<div className="font-hana-regular text-text-primary flex w-full flex-col text-3xl">
<p>
<span className="font-hana-bold">{user?.name || '고객'}</span>님은
Expand All @@ -31,7 +31,7 @@ const FamilyGroupEmptyStateCard = ({

<div
onClick={onInviteClick}
className="bg-btn-default-bg mt-20 flex h-[110px] w-full cursor-pointer gap-3 rounded-lg pt-6 pr-9 pb-5 pl-5"
className="bg-btn-default-bg mt-20 flex h-[110px] w-full cursor-pointer gap-3 rounded-lg pt-6 pb-5 pl-8"
>
<img src={inviteSvg} />
<div className="flex flex-col gap-1">
Expand All @@ -46,7 +46,7 @@ const FamilyGroupEmptyStateCard = ({

<div
onClick={onCreateClick}
className="bg-btn-default-bg mt-9 flex h-[110px] w-full cursor-pointer gap-3 rounded-lg border-2 border-dashed border-[var(--color-line)] pt-5 pr-12 pb-6 pl-8"
className="bg-btn-default-bg mt-9 flex h-[110px] w-full cursor-pointer gap-3 rounded-lg border-2 border-dashed border-[var(--color-line)] pt-5 pb-6 pl-8"
>
<img src={plusSvg} />
<div className="flex flex-col gap-1">
Expand Down
2 changes: 1 addition & 1 deletion src/features/link-account/components/AccountConnect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const AccountConnect = ({
};

return (
<div className="relative flex h-full w-full flex-col items-center px-6 pt-28">
<div className="relative flex h-full w-full flex-col items-center px-6 pt-20">
<div className="font-hana-regular flex w-full flex-col text-3xl">
<p>
서비스를 사용하기 위해
Expand Down
2 changes: 1 addition & 1 deletion src/features/link-account/components/AccountSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const AccountSelect = ({
};

return (
<div className="relative flex h-full w-full flex-col items-center px-6 pt-28">
<div className="relative flex h-full w-full flex-col items-center px-6 pt-20">
<div className="font-hana-regular flex w-full flex-col text-3xl">
<p className="!mb-0">
서비스에서 사용할
Expand Down
2 changes: 1 addition & 1 deletion src/features/link-account/components/TermOfUse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const TermOfUse = ({ onNext }: TermOfUseProps) => {
};

return (
<div className="grid h-full min-h-0 w-full grid-rows-[auto,auto,1fr,auto] px-6 pt-28">
<div className="grid h-full min-h-0 w-full grid-rows-[auto,auto,1fr,auto] px-6 pt-20">
<div className="font-hana-regular mb-7 text-3xl">
<span>
하나이음
Expand Down
Loading