Skip to content

GitLab

Commit 566d7109 authored by 우지원's avatar 우지원
Browse files

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

parents 7a037d06 b2235a91
Hide whitespace changes
Inline Side-by-side
client/src/components/Profile/Info.js
View file @ 566d7109
...@@ -4,14 +4,14 @@ const Info = () => { ...@@ -4,14 +4,14 @@ const Info = () => {
return ( return (
<div className="container" style={{ background: "#FCF4FF" }}> <div className="container" style={{ background: "#FCF4FF" }}>
<div <div
className="row justify-content-center mx-1" className="row justify-content-center my-4"
style={{ fontSize: "25px", fontWeight: "bold" }} style={{ fontSize: "25px", fontWeight: "bold" }}
> >
CHERRY #0805 CHERRY #0805
</div> </div>
<div className="row"> <div className="row">
<div className="col-3"></div> <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 className="mb-3" style={{ fontSize: "13px", fontWeight: "bold" }}>
이름 이름
</h2> </h2>
......
client/src/components/Profile/InfoUpdate.js
View file @ 566d7109
...@@ -22,7 +22,7 @@ const InfoUpdate = () => { ...@@ -22,7 +22,7 @@ const InfoUpdate = () => {
fontWeight: "bold", fontWeight: "bold",
}} }}
> >
확인 돌아가기
</button> </button>
</Link> </Link>
</div> </div>
...@@ -34,30 +34,45 @@ const InfoUpdate = () => { ...@@ -34,30 +34,45 @@ const InfoUpdate = () => {
<div className="d-flex justify-content-center"> <div className="d-flex justify-content-center">
<img <img
src="/cherry.jpg" src="/cherry.jpg"
className="rounded-circle" className="rounded-circle mt-2"
style={{ height: "320px", width: "320px" }} style={{ height: "320px", width: "320px" }}
/> />
</div> </div>
<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" }} style={{ fontSize: "25px", fontWeight: "bold" }}
> >
CHERRY #0805 CHERRY #0805
</div> </div>
<div className="col-6"> <div className="d-flex justify-content-center">
<div className="input-group mx-2 my-3"> <label
<div> class="form-label me-3"
<label style={{ fontSize: "13px", fontWeight: "bold" }}
className="form-label " >
style={{ fontSize: "13px", fontWeight: "bold" }} 현재 비밀번호
> </label>
현재 비밀번호 <input
</label> type="text"
<input type="text" className="form-control" /> class="form-control"
</div> 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> <div>
<label <label
className="form-label" class="form-label"
style={{ fontSize: "13px", fontWeight: "bold" }} style={{ fontSize: "13px", fontWeight: "bold" }}
> >
새 비밀번호 새 비밀번호
...@@ -77,15 +92,6 @@ const InfoUpdate = () => { ...@@ -77,15 +92,6 @@ const InfoUpdate = () => {
</div> </div>
<div className="col-6"> <div className="col-6">
<div className="input-group my-3 "> <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> <div>
<label <label
className="form-label" className="form-label"
......
client/src/components/Profile/Profile.js
View file @ 566d7109
...@@ -32,7 +32,7 @@ const Profile = () => { ...@@ -32,7 +32,7 @@ const Profile = () => {
<div className="d-flex justify-content-center"> <div className="d-flex justify-content-center">
<img <img
src="/cherry.jpg" src="/cherry.jpg"
className="rounded-circle" className="rounded-circle mt-2"
style={{ height: "320px", width: "320px" }} style={{ height: "320px", width: "320px" }}
/> />
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment