-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from seungwonHong/Basic-홍승원-sprint2
[홍승원] Sprint2
- Loading branch information
Showing
12 changed files
with
471 additions
and
16 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
@import url('https://cdn.jsdelivr.net/npm/pretendard/dist/web/static/pretendard.css'); | ||
|
||
* { | ||
font-family: 'Pretendard', sans-serif; | ||
} | ||
|
||
main { | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
height: 100vh; | ||
margin: 0; | ||
padding: 0; | ||
overflow: hidden; | ||
} | ||
|
||
.wrap { | ||
width: 640px; | ||
height: 618px; | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
justify-content: center; | ||
} | ||
|
||
.login-logo { | ||
margin-bottom: 10px; | ||
} | ||
|
||
form p { | ||
font-size: 18px; | ||
font-weight: 700; | ||
color: rgba(31, 41, 55, 1); | ||
} | ||
|
||
form input { | ||
box-sizing: border-box; | ||
background-color: rgba(243, 244, 246, 1); | ||
border: 2px solid transparent; | ||
border-radius: 12px; | ||
width: 640px; | ||
height: 56px; | ||
padding-left: 24px; | ||
padding-right: 24px; | ||
font-size: 16px; | ||
} | ||
|
||
form input:focus { | ||
border-color: #3692FF; | ||
outline: none; | ||
} | ||
|
||
form #submit { | ||
border-radius: 40px; | ||
background-color: rgba(156, 163, 175, 1); | ||
color: rgba(243, 244, 246, 1); | ||
margin-top: 24px; | ||
margin-bottom: 24px; | ||
cursor: pointer; | ||
} | ||
|
||
.simple-login { | ||
box-sizing: border-box; | ||
width: 640px; | ||
height: 74px; | ||
display: flex; | ||
justify-content: space-between; | ||
align-items: center; | ||
padding-left: 23px; | ||
padding-right: 23px; | ||
padding-top: 24px; | ||
padding-bottom: 24px; | ||
background-color: rgba(230, 242, 255, 1); | ||
border-radius: 8px; | ||
margin-bottom: 24px; | ||
} | ||
|
||
.simple-login p { | ||
font-size: 16px; | ||
font-weight: 500; | ||
} | ||
|
||
.logos { | ||
box-sizing: border-box; | ||
display: flex; | ||
width: 100px; | ||
height: 42px; | ||
justify-content: space-between; | ||
} | ||
|
||
.logos img { | ||
height: 42px; | ||
width: 42px; | ||
} | ||
|
||
.move-to-signup { | ||
font-size: 14px; | ||
font-weight: 500; | ||
} | ||
|
||
.move-to-signup a { | ||
color: rgba(54, 146, 255, 1); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,50 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<html lang="ko"> | ||
|
||
<head> | ||
<link rel="stylesheet" href="login-styles.css"> | ||
<meta charset="UTF-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
<title>Document</title> | ||
<title>Login</title> | ||
</head> | ||
|
||
<body> | ||
<main> | ||
<div class="wrap"> | ||
<div class="login-logo"> | ||
<a href="index.html"> | ||
<img src="images/logo.png" alt="login-logo"> | ||
</a> | ||
</div> | ||
|
||
|
||
<form action="#"> | ||
<p>이메일</p> | ||
<input type="email" name="email" id="email" placeholder="이메일을 입력해주세요"> | ||
|
||
<p>비밀번호</p> | ||
<input type="password" name="password" id="password" placeholder="비밀번호를 입력해주세요"> | ||
|
||
<input type="submit" id="submit" value="로그인"> | ||
</form> | ||
|
||
<div class="simple-login"> | ||
<p>간편 로그인하기</p> | ||
<div class="logos"> | ||
<a href="https://www.google.com/"> | ||
<img src="images/google-icon.png" alt="google-icon"> | ||
</a> | ||
<a href="https://www.kakaocorp.com/page/"> | ||
<img src="images/kakao-icon.png" alt="google-icon"> | ||
</a> | ||
</div> | ||
</div> | ||
|
||
<div class="move-to-signup"> | ||
<p>판다마켓이 처음이신가요? <a href="signup.html">회원가입</a></p> | ||
</div> | ||
</div> | ||
</main> | ||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
@import url('https://cdn.jsdelivr.net/npm/pretendard/dist/web/static/pretendard.css'); | ||
|
||
* { | ||
font-family: 'Pretendard', sans-serif; | ||
} | ||
|
||
main { | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
height: 100vh; | ||
margin: 0; | ||
padding: 0; | ||
} | ||
|
||
.wrap { | ||
width: 640px; | ||
height: 618px; | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
justify-content: center; | ||
} | ||
|
||
.signup-logo { | ||
margin-bottom: 10px; | ||
} | ||
|
||
form p { | ||
font-size: 18px; | ||
font-weight: 700; | ||
color: rgba(31, 41, 55, 1); | ||
} | ||
|
||
form input { | ||
box-sizing: border-box; | ||
background-color: rgba(243, 244, 246, 1); | ||
border: 2px solid transparent; | ||
border-radius: 12px; | ||
width: 640px; | ||
height: 56px; | ||
padding-left: 24px; | ||
padding-right: 24px; | ||
font-size: 16px; | ||
} | ||
|
||
form input:focus { | ||
border-color: #3692FF; | ||
outline: none; | ||
} | ||
|
||
form #submit { | ||
border-radius: 40px; | ||
background-color: rgba(156, 163, 175, 1); | ||
color: rgba(243, 244, 246, 1); | ||
margin-top: 24px; | ||
margin-bottom: 24px; | ||
cursor: pointer; | ||
} | ||
|
||
.simple-login { | ||
box-sizing: border-box; | ||
width: 640px; | ||
height: 74px; | ||
display: flex; | ||
justify-content: space-between; | ||
align-items: center; | ||
padding-left: 23px; | ||
padding-right: 23px; | ||
padding-top: 24px; | ||
padding-bottom: 24px; | ||
background-color: rgba(230, 242, 255, 1); | ||
border-radius: 8px; | ||
margin-bottom: 24px; | ||
} | ||
|
||
.simple-login p { | ||
font-size: 16px; | ||
font-weight: 500; | ||
} | ||
|
||
.logos { | ||
box-sizing: border-box; | ||
display: flex; | ||
width: 100px; | ||
height: 42px; | ||
justify-content: space-between; | ||
} | ||
|
||
.logos img { | ||
height: 42px; | ||
width: 42px; | ||
} | ||
|
||
.move-to-login { | ||
font-size: 14px; | ||
font-weight: 500; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
<!DOCTYPE html> | ||
<html lang="ko"> | ||
|
||
<head> | ||
<link rel="stylesheet" href="login-styles.css"> | ||
<meta charset="UTF-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
<title>Signup</title> | ||
</head> | ||
|
||
<body> | ||
<main> | ||
<div class="wrap"> | ||
<div class="signup-logo"> | ||
<a href="index.html"> | ||
<img src="images/logo.png" alt="signup-logo"> | ||
</a> | ||
</div> | ||
|
||
|
||
<form action="#"> | ||
<p>이메일</p> | ||
<input type="email" name="email" id="email" placeholder="이메일을 입력해주세요"> | ||
|
||
<p>닉네임</p> | ||
<input type="text" name="nickname" id="nickname" placeholder="닉네임을 입력해주세요"> | ||
|
||
<p>비밀번호</p> | ||
<input type="password" name="password" id="password" placeholder="비밀번호를 입력해주세요"> | ||
|
||
<p>비밀번호 확인</p> | ||
<input type="password" name="password-confirm" id="password-confirm" placeholder="비밀번호를 다시 한 번 입력해주세요"> | ||
|
||
<input type="submit" id="submit" value="로그인"> | ||
</form> | ||
|
||
<div class="simple-login"> | ||
<p>간편 로그인하기</p> | ||
<div class="logos"> | ||
<a href="https://www.google.com/"> | ||
<img src="images/google-icon.png" alt="google-icon"> | ||
</a> | ||
<a href="https://www.kakaocorp.com/page/"> | ||
<img src="images/kakao-icon.png" alt="google-icon"> | ||
</a> | ||
</div> | ||
</div> | ||
|
||
<div class="move-to-login"> | ||
<p>이미 회원이신가요? <a href="login.html" style="color: rgba(54, 146, 255, 1);">로그인</a></p> | ||
</div> | ||
</div> | ||
</main> | ||
</body> | ||
|
||
</html> |
Oops, something went wrong.