Merge remote-tracking branch 'origin/jaeyeon2' into jiweon827

client/src/components/Profile/Info.js

@@ -4,14 +4,14 @@ const Info = () => {
   return (
     <div className="container" style={{ background: "#FCF4FF" }}>
       <div
-        className="row justify-content-center  mx-1"
+        className="row justify-content-center  my-4"
         style={{ fontSize: "25px", fontWeight: "bold" }}
       >
         CHERRY #0805
       </div>
       <div className="row">
         <div className="col-3"></div>
-        <div className="col-6 my-5">
+        <div className="col-6 my-2">
           <h2 className="mb-3" style={{ fontSize: "13px", fontWeight: "bold" }}>
             이름
           </h2>

client/src/components/Profile/InfoUpdate.js

@@ -22,7 +22,7 @@ const InfoUpdate = () => {
                 fontWeight: "bold",
               }}
             >
-              확인
+             돌아가기
             </button>
           </Link>
         </div>
@@ -34,30 +34,45 @@ const InfoUpdate = () => {
             <div className="d-flex justify-content-center">
               <img
                 src="/cherry.jpg"
-                className="rounded-circle"
+                className="rounded-circle mt-2"
                 style={{ height: "320px", width: "320px" }}
               />
             </div>
             <div
-              className="row justify-content-center my-3 mx-1"
+              className="row justify-content-center  my-4 ms-1"
               style={{ fontSize: "25px", fontWeight: "bold" }}
             >
               CHERRY #0805
             </div>
-            <div className="col-6">
-              <div className="input-group mx-2 my-3">
-                <div>
-                  <label
-                    className="form-label "
-                    style={{ fontSize: "13px", fontWeight: "bold" }}
-                  >
-                    현재 비밀번호
-                  </label>
-                  <input type="text" className="form-control" />
-                </div>
+            <div className="d-flex justify-content-center">
+              <label
+                class="form-label me-3"
+                style={{ fontSize: "13px", fontWeight: "bold" }}
+              >
+                현재 비밀번호
+              </label>
+              <input
+                type="text"
+                class="form-control"
+                style={{ height: "38px", width: "200px" }}
+              />
+              <button
+              type="button"
+              className="btn btn-outline-white ms-2"
+              style={{
+                background: "#E8B7FF",
+                fontSize: "13px",
+                fontWeight: "bold",
+              }}
+            >
+            수정하기
+            </button>
+            </div>
+            <div class="col-6">
+              <div class="input-group mx-2 my-3">
                 <div>
                   <label
-                    className="form-label"
+                    class="form-label"
                     style={{ fontSize: "13px", fontWeight: "bold" }}
                   >
                     새 비밀번호
@@ -77,15 +92,6 @@ const InfoUpdate = () => {
             </div>
             <div className="col-6">
               <div className="input-group my-3 ">
-                <div>
-                  <label
-                    className="form-label"
-                    style={{ fontSize: "13px", fontWeight: "bold" }}
-                  >
-                    현재 전화번호
-                  </label>
-                  <input type="text" className="form-control" />
-                </div>
                 <div>
                   <label
                     className="form-label"

client/src/components/Profile/Profile.js

@@ -32,7 +32,7 @@ const Profile = () => {
             <div className="d-flex justify-content-center">
               <img
                 src="/cherry.jpg"
-                className="rounded-circle"
+                className="rounded-circle mt-2"
                 style={{ height: "320px", width: "320px" }}
               />
             </div>