gnims-project#78 이메일 인증 기능,CSS완성 2

Author: Ju

src/components/login/InputEmail.jsx

@@ -157,7 +157,7 @@ const InputEmail = () => {
               />
               <div
                 onClick={onSendEmail}
-                className="bg-[#FFFFFF] border-solid border-2 text-[16px] font-[600] border-[#002C51] p-[10px] rounded-[4px] leading-[28px] cursor-pointer"
+                className=" bg-[#FFFFFF] flex items-center h-[50px] p-[5px] border-solid border-2 text-[16px] font-[600] border-[#002C51] rounded-[4px] leading-[28px] cursor-pointer"
               >
                 인증 요청
               </div>

src/shared/Router.jsx

@@ -33,12 +33,7 @@ const Router = () => {
           {/* 메인과 디테일 페이지 */}
           {/* <Route path="/main" element={<MainPage />} /> */}
           <Route path="/main" element={<MainPage />} />
-<<<<<<< HEAD
-          {/* <Route path="/main" element={<InfiniteScroll />} /> */}
-          {sessionStorage.getItem("nickname") ? (
-=======
           {sessionStorage.getItem("userId") ? (
->>>>>>> dev/passwordChange
             <Route path="/" element={<MainPage />} />
           ) : (
             <Route path="/" element={<LoginPage />} />
@@ -63,12 +58,8 @@ const Router = () => {
           <Route path="/kakaoLogin" element={<KakaoLogin />} />
           <Route path="auth/kakao/callback" element={<KakaoLoginLoding />} />
           <Route path="/naver/login" element={<NaverLoginPage />} />
-<<<<<<< HEAD
-          <Route path="/social/naver-login" element={<NaverLoginLoding />} />
-=======
           <Route path="/auth/naver/callback" element={<NaverLoginLoding />} />
           <Route path="/login/auth/InputEmail" element={<InputEmailPage />} />
->>>>>>> dev/passwordChange
 
           {/* 마이페이지 */}
           <Route path="/profile" element={<Profile />} />