-
Notifications
You must be signed in to change notification settings - Fork 39
[유동환] sprint2 #95
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
The head ref may contain hidden characters: "Basic-\uC720\uB3D9\uD658-sprint2"
[유동환] sprint2 #95
Changes from all commits
2b06be9
8ad7bac
a046714
f19db2e
21a843f
920b47d
b0ce400
72558e6
f6b5010
03e56ea
4d16fc3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| .DS_Store | ||
| ._.DS_Store | ||
| **/.DS_Store | ||
| **/._.DS_Store |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,31 @@ | ||
|
|
||
| <!DOCTYPE html> | ||
| <html lang = "en"> | ||
| <html lang = "ko"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <link rel="stylesheet" as="style" crossorigin href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable.min.css" /> | ||
| <link rel="stylesheet" href="style.css"> | ||
| <!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/reset.min.css"/> --> | ||
|
|
||
|
|
||
| <title>판다마켓</title> | ||
| </head> | ||
| <body> | ||
| <div class="conatiner"> | ||
| <div class="container"> | ||
| <div class="header-wrapper"> | ||
| <header> | ||
| <a class="logo" href="index.html"> | ||
| <div class="logo-image"> | ||
| <img src="image/판다 얼굴.png"> | ||
| <img src="image/판다얼굴.png"> | ||
| </div> | ||
| <div class="logo-text"> | ||
| <img src="image/판다마켓.png"> | ||
| </div> | ||
| </a> | ||
| <div class="login"> | ||
| <a class="login-button" href="login.html"> | ||
| <button class="login-button"> | ||
| 로그인 | ||
| </button> | ||
| <a class="login-button button" href="login.html"> | ||
| 로그인 | ||
| </a> | ||
| </div> | ||
| </header> | ||
| </div> | ||
|
|
||
|
|
@@ -41,10 +38,8 @@ | |
| 일상의 모든 물건을<br> | ||
| 거래해 보세요 | ||
| </p> | ||
| <a class="find-items-button" href="items.html"> | ||
| <button class="find-items-button"> | ||
| <a class="find-items-button button" href="items.html"> | ||
| 구경하러 가기 | ||
| </button> | ||
| </a> | ||
| </div> | ||
|
|
||
|
|
@@ -60,9 +55,9 @@ | |
| <img src="image/Img_home_01.png"> | ||
| </div> | ||
| <div class="hot-item-text"> | ||
| <h1> | ||
| <p> | ||
| Hot item | ||
| </h1> | ||
| </p> | ||
| <h2> | ||
| 인기 상품을<br> | ||
| 확인해 보세요 | ||
|
|
@@ -78,9 +73,9 @@ <h3> | |
| <section class="Search"> | ||
| <div class="Search"> | ||
| <div class="search-text"> | ||
| <h1> | ||
| <p> | ||
| Search | ||
| </h1> | ||
| </p> | ||
| <h2> | ||
| 구매를 원하는<br> | ||
| 상품을 검색하세요 | ||
|
|
@@ -103,9 +98,9 @@ <h3> | |
| <img src="image/Img_home_03.png"> | ||
| </div> | ||
| <div class="register-text"> | ||
| <h1> | ||
| <p> | ||
| Register | ||
| </h1> | ||
| </p> | ||
| <h2> | ||
| 판매를 원하는<br> | ||
| 상품을 등록하세요 | ||
|
|
@@ -153,20 +148,28 @@ <h3> | |
| </a> | ||
| </div> | ||
|
|
||
| <div class="footer-right-sns"> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_facebook.png" alt="페이스북"> | ||
| </a> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_twitter.png" alt="트위터"> | ||
| </a> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_youtube.png" alt="유튜브"> | ||
| </a> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_instagram.png" alt="인스타"> | ||
| </a> | ||
| </div> | ||
| <ul class="footer-right-sns"> | ||
| <li> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_facebook.png" alt="페이스북"> | ||
| </a> | ||
| </li> | ||
| <li> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_twitter.png" alt="트위터"> | ||
| </a> | ||
| </li> | ||
| <li> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_youtube.png" alt="유튜브"> | ||
| </a> | ||
| </li> | ||
| <li> | ||
| <a href="/faq.html"> | ||
| <img src="/image/ic_instagram.png" alt="인스타"> | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </footer> | ||
| </div> | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💊 제안 만약 login.css, signup.css 파일에서 작성되는 css가 너무 적다면, 즉 분리할 필요를 못 느끼신다면 |
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -0,0 +1,122 @@ | ||||
| * { | ||||
| box-sizing: border-box; | ||||
| } | ||||
|
|
||||
| /* 버튼 관련 */ | ||||
| .login-button { | ||||
| width: 100%; | ||||
| height: 56px; | ||||
| border-radius: 40px; | ||||
| background-color: #3692FF; | ||||
| display: flex; | ||||
| flex-direction: row; | ||||
| justify-content: center; | ||||
| align-items: center; | ||||
| color: #F3F4F6; | ||||
| margin-bottom: 24px; | ||||
| font-size: 20px; | ||||
| font-weight: 600; | ||||
| } | ||||
|
|
||||
| /* 전체적인 틀 */ | ||||
| body { | ||||
| font-family: "Pretendard Variable", Pretendard, sans-serif; | ||||
|
|
||||
| display: flex; | ||||
| flex-direction: column; | ||||
| align-items: center; | ||||
| } | ||||
|
|
||||
| container { | ||||
| margin-top: 231px; | ||||
| width: 640px; | ||||
| height: auto; | ||||
| } | ||||
|
|
||||
| /* 로고관련 */ | ||||
| #logo > a { | ||||
| display: flex; | ||||
| flex-direction: row; | ||||
| justify-content: center; | ||||
| align-items: center; | ||||
| gap: 22px; | ||||
| margin-bottom: 40px; | ||||
| } | ||||
|
|
||||
| /* 폼테그 관련 */ | ||||
| form { | ||||
| display: flex; | ||||
| flex-direction: column; | ||||
| color: #1F2937; | ||||
| font-size: 18px; | ||||
| font-weight: 700; | ||||
| } | ||||
|
|
||||
| form > lable { | ||||
| margin-bottom: 16px; | ||||
| } | ||||
|
|
||||
| form > input { | ||||
| width: 100%; | ||||
| height: 56px; | ||||
| border: 0; | ||||
| background-color: #F3F4F6; | ||||
| border-radius: 12px; | ||||
| margin-bottom: 24px; | ||||
| } | ||||
|
|
||||
| input::placeholder { | ||||
| font-size: 16px; | ||||
| padding: 24px; | ||||
| } | ||||
|
|
||||
| /* sns 로그인 관련 */ | ||||
| .sns-login { | ||||
| display: flex; | ||||
| flex-direction: row; | ||||
| align-items: center; | ||||
| justify-content: space-between; | ||||
| background-color: #E6F2FF; | ||||
| padding: 16px 23px; | ||||
| border-radius: 8px; | ||||
| margin-bottom: 24px; | ||||
| font-size: 16px; | ||||
| font-weight: 500; | ||||
| } | ||||
|
|
||||
| .sns-login-image { | ||||
| display: flex; | ||||
| flex-direction: row; | ||||
| gap: 16px; | ||||
| } | ||||
|
|
||||
| .sns-login-image img { | ||||
| width: 42px; | ||||
| height: 42px; | ||||
| } | ||||
|
|
||||
| /* footer 관련 */ | ||||
| .footer { | ||||
| display: flex; | ||||
| flex-direction: row; | ||||
| align-items: center; | ||||
| justify-content: center; | ||||
| gap: 4px; | ||||
| } | ||||
|
|
||||
| .footer a { | ||||
| color: #3692FF; | ||||
| } | ||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
Comment on lines
+110
to
+122
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ❗️ 수정요청
Suggested change
|
||||
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,11 +1,44 @@ | ||||||||||||||
| <!DOCTYPE html> | ||||||||||||||
| <html lang="en"> | ||||||||||||||
| <html lang="ko"> | ||||||||||||||
| <head> | ||||||||||||||
| <meta charset="UTF-8"> | ||||||||||||||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||||||||||||||
| <link rel="stylesheet" as="style" crossorigin href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable.min.css" /> | ||||||||||||||
| <link rel="stylesheet" href="login.css"> | ||||||||||||||
| <title>Document</title> | ||||||||||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💊 제안 |
||||||||||||||
| </head> | ||||||||||||||
| <body> | ||||||||||||||
| 로그인 페이지 | ||||||||||||||
| <container> | ||||||||||||||
| <div id="logo"> | ||||||||||||||
| <a href="index.html"> | ||||||||||||||
| <img src="./image/판다얼굴.png"> | ||||||||||||||
| <img src="./image/판다마켓.png"> | ||||||||||||||
| </a> | ||||||||||||||
| </div> | ||||||||||||||
| <form> | ||||||||||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 칭찬 |
||||||||||||||
| <lable>이메일</lable> | ||||||||||||||
| <input type="email" name="user-email" placeholder="이메일을 입력해주세요"> | ||||||||||||||
|
Comment on lines
+19
to
+20
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ❗️ 수정요청 또한 label인데 lable로 오타가 난 것 같으니 수정해주세요~
Suggested change
|
||||||||||||||
| <lable>비밀번호</lable> | ||||||||||||||
| <input type="password" name="user-password" placeholder="비밀번호를 입력해주세요"> | ||||||||||||||
| <div class="login-button"> | ||||||||||||||
| 로그인 | ||||||||||||||
| </div> | ||||||||||||||
|
Comment on lines
+23
to
+25
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ❗️ 수정요청
Suggested change
button 태그에서 type 속성은 해당 태그의 동작과 연관이 되어 있어 가능하면 늘 기입하시는 것이 좋습니다. |
||||||||||||||
| </form> | ||||||||||||||
| <div class="sns-login"> | ||||||||||||||
| <p>간편 로그인하기</p> | ||||||||||||||
| <div class="sns-login-image"> | ||||||||||||||
| <a href="https://www.google.com/"> | ||||||||||||||
| <img src="./image/google_logo.png" alt="구글로그인"> | ||||||||||||||
| </a> | ||||||||||||||
| <a href="https://www.kakaocorp.com/page/"> | ||||||||||||||
| <img src="./image/kakao_logo.png" alt="카카오톡 로그인"> | ||||||||||||||
| </a> | ||||||||||||||
| </div> | ||||||||||||||
| </div> | ||||||||||||||
| <div class="footer"> | ||||||||||||||
| <p>판다마켓이 처음인가요?</p> | ||||||||||||||
| <a href="./signup.html">회원가입</a> | ||||||||||||||
| </div> | ||||||||||||||
| </container> | ||||||||||||||
| </body> | ||||||||||||||
| </html> | ||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* http://meyerweb.com/eric/tools/css/reset/ | ||
| v2.0 | 20110126 | ||
| License: none (public domain) | ||
| */ | ||
|
|
||
| html, body, div, span, applet, object, iframe, | ||
| h1, h2, h3, h4, h5, h6, p, blockquote, pre, | ||
| a, abbr, acronym, address, big, cite, code, | ||
| del, dfn, em, img, ins, kbd, q, s, samp, | ||
| small, strike, strong, sub, sup, tt, var, | ||
| b, u, i, center, | ||
| dl, dt, dd, ol, ul, li, | ||
| fieldset, form, label, legend, | ||
| table, caption, tbody, tfoot, thead, tr, th, td, | ||
| article, aside, canvas, details, embed, | ||
| figure, figcaption, footer, header, hgroup, | ||
| menu, nav, output, ruby, section, summary, | ||
| time, mark, audio, video { | ||
| margin: 0; | ||
| padding: 0; | ||
| border: 0; | ||
| font-size: 100%; | ||
| font: inherit; | ||
| vertical-align: baseline; | ||
| } | ||
| /* HTML5 display-role reset for older browsers */ | ||
| article, aside, details, figcaption, figure, | ||
| footer, header, hgroup, menu, nav, section { | ||
| display: block; | ||
| } | ||
| body { | ||
| line-height: 1; | ||
| } | ||
| ol, ul { | ||
| list-style: none; | ||
| } | ||
| blockquote, q { | ||
| quotes: none; | ||
| } | ||
| blockquote:before, blockquote:after, | ||
| q:before, q:after { | ||
| content: ''; | ||
| content: none; | ||
| } | ||
| table { | ||
| border-collapse: collapse; | ||
| border-spacing: 0; | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 칭찬
깃에 올라가지 않을 파일을 관리해주시는 것 좋습니다~