Skip to content

๐Ÿš€ Deploy : dev -> main ๋ณ‘ํ•ฉ #59

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
sori4606 merged 2 commits into from
Oct 2, 2025
Merged

๐Ÿš€ Deploy : dev -> main ๋ณ‘ํ•ฉ #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7365eb4
:art: design(activities): ํ…์ŠคํŠธ ๋ฐ˜์‘ํ˜• ์ œ๊ฑฐ
MINJI121 Oct 2, 2025
5ebac46
:art: design(activities): ํ…์ŠคํŠธ ๊ฐœ๋ณ„ ๋ฐ˜์‘ํ˜• ๋””์ž์ธ ์ œ๊ฑฐ
sori4606 Oct 2, 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/features/activities/components/ActivitiesTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ export default function ActivitiesTabs() {
aria-current={isActive ? "page" : undefined}
className={[
"inline-flex justify-center w-full rounded-lg py-3 transition",
"md:text-16-m text-14-m",
"text-16-m",
isActive
? "bg-white text-black md:text-16-sb text-14-sb"
? "bg-white text-black text-16-sb"
: "text-gray-500 hover:bg-gray-200",
].join(" ")}
>
Expand Down
4 changes: 2 additions & 2 deletions src/features/user/components/ProfileCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ export default function ProfileCard() {
return (
<div className="flex flex-col w-[260px] h-[100px] bg-white rounded-2xl border border-gray-200 p-6">
<div className="flex w-full gap-1.5">
<p className="text-black sm:text-18-sb text-14-sb">{userName}</p>
<p className="text-black text-18-sb">{userName}</p>
<EditProfileButton />
</div>
<span className="text-[#9EA5B0] sm:text-16-r text-12-r">{userEmail}</span>
<span className="text-[#9EA5B0] text-16-r">{userEmail}</span>
</div>
);
}