Skip to content

Commit 1953bb8

Browse files
authored
design: 디자인 시스템 색상 변경 (#138)
* design: primary <-> secondary 색상명 변경 * design: primary-900 색상 변경
1 parent 1d10524 commit 1953bb8

22 files changed

Lines changed: 61 additions & 60 deletions

src/app/Home.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const Home = ({ newsList }: HomeProps) => {
6969
<div className="flex gap-[7px]">
7070
<Link className="flex h-[102px] flex-1 flex-col gap-2 rounded-lg bg-[#F0F5FF] p-2.5" href="/university">
7171
<div className="flex flex-col">
72-
<span className="text-sm font-bold text-primary-900">학교 검색하기</span>
72+
<span className="text-sm font-bold text-secondary-900">학교 검색하기</span>
7373
<span className="text-[11px] font-medium leading-[14px] text-k-700">모든 학교 목록을 확인해보세요</span>
7474
</div>
7575
<div className="flex justify-end">
@@ -78,7 +78,7 @@ const Home = ({ newsList }: HomeProps) => {
7878
</Link>
7979
<Link className="flex h-[102px] flex-1 flex-col gap-2 rounded-lg bg-[#E5F9FF] p-2.5" href="/score">
8080
<div className="flex flex-col">
81-
<span className="text-sm font-bold text-primary-900">성적 입력하기</span>
81+
<span className="text-sm font-bold text-secondary-900">성적 입력하기</span>
8282
<span className="text-[11px] font-medium leading-[14px] text-k-700">성적을 입력해보세요</span>
8383
</div>
8484
<div className="flex justify-end">
@@ -92,7 +92,7 @@ const Home = ({ newsList }: HomeProps) => {
9292
href="/application/apply"
9393
>
9494
<div className="flex flex-col">
95-
<span className="text-sm font-bold text-primary-900">학교 지원하기</span>
95+
<span className="text-sm font-bold text-secondary-900">학교 지원하기</span>
9696
<span className="text-[11px] font-medium leading-[14px] text-k-700">학교를 지원해주세요</span>
9797
</div>
9898
<div className="flex justify-end">
@@ -101,7 +101,7 @@ const Home = ({ newsList }: HomeProps) => {
101101
</Link>
102102
<Link className="flex h-[102px] flex-1 flex-col gap-2 rounded-lg bg-[#E9F7EC] p-2.5" href="/application">
103103
<div className="flex flex-col">
104-
<span className="text-sm font-bold text-primary-900">지원자 현황 확인</span>
104+
<span className="text-sm font-bold text-secondary-900">지원자 현황 확인</span>
105105
<span className="text-[11px] font-medium leading-[14px] text-k-700">경쟁률을 바로 분석해드려요</span>
106106
</div>
107107
<div className="flex justify-end">

src/app/UniversityList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ const UniversityList = () => {
4646
choice={region}
4747
setChoice={setRegion}
4848
color={{
49-
activeBtn: "bg-primary-100",
49+
activeBtn: "bg-secondary-100",
5050
deactiveBtn: "bg-k-50",
51-
activeBtnFont: "text-primary",
51+
activeBtnFont: "text-secondary",
5252
deactiveBtnFont: "text-k-300",
5353
background: "white",
5454
}}
@@ -104,7 +104,7 @@ const UniversityCard = ({ university }: UniversityCardProps) => {
104104
{convertedKoreanName}
105105
</span>
106106
<div className="flex shrink-0 gap-2.5">
107-
<span className="text-sm font-semibold leading-normal text-primary">
107+
<span className="text-sm font-semibold leading-normal text-secondary">
108108
{university.country} | {university.region}
109109
</span>
110110
<svg xmlns="http://www.w3.org/2000/svg" width="21" height="20" viewBox="0 0 21 20" fill="none">

src/app/application/apply/ConfirmStep.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const ConfirmStep = ({ languageTestScore, gpaScore, universityList, onNext }: Co
2828
{languageTestScore?.languageTest.languageTestType}
2929
</div>
3030
<div className="text-right">
31-
<div className="font-serif text-[15px] font-semibold leading-normal text-primary">
31+
<div className="font-serif text-[15px] font-semibold leading-normal text-secondary">
3232
{languageTestScore?.languageTest.languageTestScore}
3333
</div>
3434
<div className="font-serif text-[10px] font-normal leading-normal text-k-300">
@@ -43,7 +43,7 @@ const ConfirmStep = ({ languageTestScore, gpaScore, universityList, onNext }: Co
4343
<div className="flex flex-1 justify-between rounded-lg bg-k-50 px-5 py-3">
4444
<div className="font-serif text-[11px] font-semibold leading-normal text-k-700">인하대학교</div>
4545
<div className="text-right">
46-
<div className="font-serif text-[15px] font-semibold leading-normal text-primary">
46+
<div className="font-serif text-[15px] font-semibold leading-normal text-secondary">
4747
{gpaScore?.gpa.gpa.toFixed(2)}/{gpaScore?.gpa.gpaCriteria}
4848
</div>
4949
{/* <div className="font-serif text-[10px] font-normal leading-normal text-k-300">~4학년 1학기</div> */}
@@ -59,7 +59,7 @@ const ConfirmStep = ({ languageTestScore, gpaScore, universityList, onNext }: Co
5959
<div className="font-serif text-xs font-semibold leading-normal text-k-700">
6060
{universityList.indexOf(university) + 1}지망
6161
</div>
62-
<div className="text-right font-serif text-[11px] font-semibold leading-normal text-primary">
62+
<div className="text-right font-serif text-[11px] font-semibold leading-normal text-secondary">
6363
[{university.region} - {university.country}]<br />
6464
{university.koreanName}
6565
</div>

src/app/application/apply/UniversityStep.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const UniversityStep = ({ universityList, curUniversityList, setCurUniversityLis
3939
<div className="flex flex-col gap-1">
4040
<label className="block font-serif text-sm font-semibold leading-normal text-k-900">1지망</label>
4141
<select
42-
className="flex h-10 items-center rounded-lg bg-k-50 px-5 py-2.5 font-serif text-sm font-semibold leading-normal text-primary"
42+
className="flex h-10 items-center rounded-lg bg-k-50 px-5 py-2.5 font-serif text-sm font-semibold leading-normal text-secondary"
4343
value={curUniversityList[0] ?? null}
4444
onChange={(e) => handleSelect(0, Number(e.target.value))}
4545
>
@@ -54,7 +54,7 @@ const UniversityStep = ({ universityList, curUniversityList, setCurUniversityLis
5454
<div className="flex flex-col gap-1">
5555
<label className="block font-serif text-sm font-semibold leading-normal text-k-900">2지망</label>
5656
<select
57-
className="flex h-10 items-center rounded-lg bg-k-50 px-5 py-2.5 font-serif text-sm font-semibold leading-normal text-primary"
57+
className="flex h-10 items-center rounded-lg bg-k-50 px-5 py-2.5 font-serif text-sm font-semibold leading-normal text-secondary"
5858
value={curUniversityList[1] ?? null}
5959
onChange={(e) => handleSelect(1, Number(e.target.value))}
6060
>
@@ -69,7 +69,7 @@ const UniversityStep = ({ universityList, curUniversityList, setCurUniversityLis
6969
<div className="flex flex-col gap-1">
7070
<label className="block font-serif text-sm font-semibold leading-normal text-k-900">3지망</label>
7171
<select
72-
className="flex h-10 items-center rounded-lg bg-k-50 px-5 py-2.5 font-serif text-sm font-semibold leading-normal text-primary"
72+
className="flex h-10 items-center rounded-lg bg-k-50 px-5 py-2.5 font-serif text-sm font-semibold leading-normal text-secondary"
7373
value={curUniversityList[2] ?? null}
7474
onChange={(e) => handleSelect(2, Number(e.target.value))}
7575
>

src/app/community/[boardCode]/[postId]/Post.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const Post = ({ post, boardCode, postId }: PostProps) => {
6969
return (
7070
<>
7171
<div className="pb-3 pl-5 pt-6">
72-
<div className="inline-flex rounded-full bg-secondary px-3 py-[5px] font-serif text-sm font-medium leading-[160%] text-white">
72+
<div className="inline-flex rounded-full bg-primary px-3 py-[5px] font-serif text-sm font-medium leading-[160%] text-white">
7373
{post.postCategory || "카테고리"}
7474
</div>
7575
<div className="mt-4 font-serif text-xl font-semibold leading-6 text-black">{post.title || ""}</div>

src/app/community/[boardCode]/[postId]/modify/PostModifyForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const CustomTopDetailNavigation = ({ routeBack, submitPost }: CustomTopDetailNav
163163
<div className="font-serif text-base font-semibold leading-[160%] text-[rgba(0,0,0,0.87)]">글 수정</div>
164164
<div className="min-w-6 cursor-pointer">
165165
<button
166-
className="h-8 cursor-pointer rounded-full border-0 bg-secondary px-3 py-[5px] font-serif text-sm font-medium leading-[160%] text-white"
166+
className="h-8 cursor-pointer rounded-full border-0 bg-primary px-3 py-[5px] font-serif text-sm font-medium leading-[160%] text-white"
167167
onClick={submitPost}
168168
type="button"
169169
>

src/app/community/[boardCode]/create/PostForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ const CustomTopDetailNavigation = ({ routeBack, submitPost }: CustomTopDetailNav
153153
<div className="font-serif text-base font-semibold leading-[160%] text-[rgba(0,0,0,0.87)]">글쓰기</div>
154154
<div className="min-w-6 cursor-pointer">
155155
<button
156-
className="h-8 cursor-pointer rounded-full border-0 bg-secondary px-3 py-[5px] font-serif text-sm font-medium leading-[160%] text-white"
156+
className="h-8 cursor-pointer rounded-full border-0 bg-primary px-3 py-[5px] font-serif text-sm font-medium leading-[160%] text-white"
157157
onClick={submitPost}
158158
type="button"
159159
>

src/app/mento/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ export default MentorPage;
99
const MentorComingSoon = () => (
1010
<div className="box-border flex min-h-[80vh] flex-col items-center justify-center p-4">
1111
<div className="w-[90%] max-w-[400px] rounded-lg bg-white p-8 text-center shadow-md md:max-w-[450px] md:p-12">
12-
<IconClock className="text-secondary mx-auto mb-6 h-[25vw] max-h-[6rem] w-[25vw] max-w-[6rem] md:mb-8 md:h-[8rem] md:w-[8rem]" />
13-
<h2 className="text-primary mb-4 text-[1.25rem] font-bold md:mb-6 md:text-[1.75rem]">멘토 기능 준비 중</h2>
12+
<IconClock className="mx-auto mb-6 h-[25vw] max-h-[6rem] w-[25vw] max-w-[6rem] text-primary md:mb-8 md:h-[8rem] md:w-[8rem]" />
13+
<h2 className="mb-4 text-[1.25rem] font-bold text-secondary md:mb-6 md:text-[1.75rem]">멘토 기능 준비 중</h2>
1414
<p className="mb-6 text-sm leading-[1.5] text-[#4a5568] md:mb-10 md:text-base">
1515
여러분을 위한 멘토링 서비스를 준비하고 있습니다.
1616
<br />
1717
조금만 기다려 주세요!
1818
</p>
19-
<div className="bg-secondary mx-auto h-[2px] w-12 md:w-16" />
19+
<div className="mx-auto h-[2px] w-12 bg-primary md:w-16" />
2020
</div>
2121
</div>
2222
);

src/app/my/MyInfoCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type MyInfoCardProps = {
99
};
1010

1111
const MyInfoCard = ({ scarpCount, interestMentoCount, wishUniversityCount }: MyInfoCardProps) => (
12-
<div className="flex h-[58px] items-center justify-center gap-5 rounded-lg bg-primary py-4">
12+
<div className="flex h-[58px] items-center justify-center gap-5 rounded-lg bg-secondary py-4">
1313
<MyInfoCardItem title="스크랩" count={`${scarpCount}개`} link="" />
1414
<MyInfoCardItem title="관심 멘토" count={`${interestMentoCount}명`} link="" />
1515
<MyInfoCardItem title="위시학교" count={`${wishUniversityCount}개`} link="/my/favorite/" />

src/app/my/MyMenuGroup.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ type MyMenuGroupItemProps = {
66

77
const MyMenuGroup = ({ children, icon, subject }: MyMenuGroupItemProps) => (
88
<div>
9-
<div className="flex h-[27px] items-center gap-1.5 bg-primary-100 py-1 pl-5">
10-
{icon} <span className="text-base font-semibold text-primary">{subject}</span>
9+
<div className="flex h-[27px] items-center gap-1.5 bg-secondary-100 py-1 pl-5">
10+
{icon} <span className="text-base font-semibold text-secondary">{subject}</span>
1111
</div>
1212
<div className="flex flex-col gap-0.5 pb-4 pt-1">{children}</div>
1313
</div>

0 commit comments

Comments
 (0)