diff --git a/src/components/common/ToggleSwitch.tsx b/src/components/common/ToggleSwitch.tsx index 3d4a8ac0..75c54783 100644 --- a/src/components/common/ToggleSwitch.tsx +++ b/src/components/common/ToggleSwitch.tsx @@ -36,7 +36,7 @@ function ToggleSwitch({ )} diff --git a/src/components/layout/Header/components/InfoHeader.tsx b/src/components/layout/Header/components/InfoHeader.tsx index 138f3279..f67579b4 100644 --- a/src/components/layout/Header/components/InfoHeader.tsx +++ b/src/components/layout/Header/components/InfoHeader.tsx @@ -7,8 +7,8 @@ function InfoHeader() { return (
-
{myInfo.universityName}
-
+
{myInfo.universityName}
+
{myInfo.name} {myInfo.studentNumber}
diff --git a/src/index.css b/src/index.css index 520fa9c6..b23555f2 100644 --- a/src/index.css +++ b/src/index.css @@ -1,6 +1,8 @@ @import 'tailwindcss'; @import './styles/font.css'; +@import './styles/colors.css'; +@import './styles/typography.css'; @import './styles/theme.css'; :root { diff --git a/src/pages/Auth/SignUp/ConfirmStep.tsx b/src/pages/Auth/SignUp/ConfirmStep.tsx index 61d0580f..a9653821 100644 --- a/src/pages/Auth/SignUp/ConfirmStep.tsx +++ b/src/pages/Auth/SignUp/ConfirmStep.tsx @@ -70,31 +70,26 @@ function ConfirmStep() { color="text-red-500" >
- +
- +
- - + +
{error && (
@@ -107,7 +102,7 @@ function ConfirmStep() { )}
-
+
이미 등록된 학번입니다{'\n'} 문의를 통해 문제를 해결해주세요
@@ -115,12 +110,12 @@ function ConfirmStep() { value={inquiryContent} onChange={(e) => setInquiryContent(e.target.value)} placeholder="문의 내용을 입력해주세요" - className="text-sub2 min-h-32 w-full resize-none rounded-lg border-2 border-indigo-200 p-4 placeholder:text-indigo-300" + className="Sub2 min-h-32 w-full resize-none rounded-lg border-2 border-indigo-200 p-4 placeholder:text-indigo-300" /> diff --git a/src/pages/Auth/SignUp/FinishStep.tsx b/src/pages/Auth/SignUp/FinishStep.tsx index 67954b32..a1bdb94e 100644 --- a/src/pages/Auth/SignUp/FinishStep.tsx +++ b/src/pages/Auth/SignUp/FinishStep.tsx @@ -22,11 +22,11 @@ function FinishStep() {
-
환영합니다!
+
환영합니다!
-
{myInfo.name}님
-
+
{myInfo.name}님
+
KONECT 가입이 완료되었습니다.
동아리 활동을 시작해보세요!
diff --git a/src/pages/Auth/SignUp/NameStep.tsx b/src/pages/Auth/SignUp/NameStep.tsx index 4ba05c41..7b7edd0c 100644 --- a/src/pages/Auth/SignUp/NameStep.tsx +++ b/src/pages/Auth/SignUp/NameStep.tsx @@ -29,7 +29,7 @@ function NameStep() { setName(value); }} placeholder="ex) 홍길동" - className="text-h3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300" + className="H3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300" /> ); diff --git a/src/pages/Auth/SignUp/StudentIdStep.tsx b/src/pages/Auth/SignUp/StudentIdStep.tsx index b91a7f8e..c0655d8c 100644 --- a/src/pages/Auth/SignUp/StudentIdStep.tsx +++ b/src/pages/Auth/SignUp/StudentIdStep.tsx @@ -37,7 +37,7 @@ function StudentIdStep() { setStudentId(value); }} placeholder="ex) 2022136039" - className="text-h3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300" + className="H3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300" /> ); diff --git a/src/pages/Auth/SignUp/TermStep.tsx b/src/pages/Auth/SignUp/TermStep.tsx index edddc736..c23ee218 100644 --- a/src/pages/Auth/SignUp/TermStep.tsx +++ b/src/pages/Auth/SignUp/TermStep.tsx @@ -35,7 +35,7 @@ function TermStep() { return (
-
서비스 이용 동의
+
서비스 이용 동의
원활한 서비스 이용을 위해 동의해주세요
diff --git a/src/pages/Auth/SignUp/UniversityStep.tsx b/src/pages/Auth/SignUp/UniversityStep.tsx index e046e848..a47c5903 100644 --- a/src/pages/Auth/SignUp/UniversityStep.tsx +++ b/src/pages/Auth/SignUp/UniversityStep.tsx @@ -13,7 +13,7 @@ import { useGetUniversityList } from './hooks/useUniversity'; function UniversityCard({ label, onClick }: { label: string; onClick: () => void }) { return ( -
{label}
+
{label}
); @@ -65,7 +65,7 @@ function UniversityStep() { value={universityName} placeholder="학교를 입력해주세요.." onChange={(e) => setUniversityName(e.target.value)} - className="text-h3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300 placeholder:text-indigo-300" + className="H3 mt-5 w-full border-b-2 border-indigo-400 py-4 text-indigo-300 placeholder:text-indigo-300" />
{filteredUniversities.map((university) => ( @@ -76,14 +76,12 @@ function UniversityStep() { /> ))} - {hasNoSearchResult && ( -
{`'${trimmed}' 검색 결과가 없어요`}
- )} + {hasNoSearchResult &&
{`'${trimmed}' 검색 결과가 없어요`}
} @@ -91,17 +89,17 @@ function UniversityStep() {
-
학교 문의
+
학교 문의