Skip to content

[박준현] sprint2 #150

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: Basic-박준현
Choose a base branch
from
Open

[박준현] sprint2 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions css/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
a ,a > button {
cursor: pointer;
}
/* aa */
108 changes: 108 additions & 0 deletions css/login-signup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
.login-container,
.signup-container {
width: 640px;
margin: 230px auto;
display: flex;
justify-items: center;
align-items: center;
flex-direction: column;
gap: 30px;
}

/* 로그인이미지 */
.login-img-box,
.signup-img-box {
width: 400px;
height: 130px;
}
.login-img,
.signup-img {
width: 100%;
}

/* 이메일,비번 signup 닉네임 비밀번호 확인 */
.login-email-box,
.login-password-box,
.signup-email-box,
.signup-password-box,
.signup-nickname-box,
.signup-ckpassword-box {
width: 100%;
justify-content: start;
}

.login-email-box h4,
.login-password-box h4,
.signup-email-box h4,
.signup-password-box h4,
.signup-nickname-box h4,
.signup-ckpassword-box h4 {
font-size: 18px;
margin-bottom: 10px;
font-weight: 500;
}

.login-email-input,
.login-password-input,
.signup-email-input,
.signup-password-input,
.signup-ckpassword-input,
.signup-nickname-input {
background-color: #F3F4F6;
border: none;
height: 55px;
width: 100%;
padding-left: 30px;
}

/* 비밀번호 눈알 */

/* 로그인버튼 */
.login-button-box,
.signup-button-box {
width: 100%;
}

.login-button,
.signup-button {
width: 100%;
height: 55px;
background-color: #3692FF;
border-radius: 40px;
color: white;
border: none;
}

/* 간편로그인 */
.login-ezlogin-box,
.signup-ezlogin-box {
display: flex;
flex-direction: row;
width: 100%;
background-color: #E6F2FF;
height: 74px;
align-items: center;
justify-content: space-between;
padding: 30px;
}
.login-ezlogin-box h4,
.signup-ezlogin-box h4 {
font-weight: 400;
}
.logo {
width: 42px;
margin: 10px;
}
/* 판다마켓이 처음이신가요 */
.login-footer,
.signup-footer {
margin-top: 20px;
}
.login-footer h5,
.signup-footer h5 {
font-weight: 500;
}
.login-footer a,
.signup-footer a {
color: #3692FF;
}
11 changes: 3 additions & 8 deletions panda.css → css/panda.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
a ,a > button {
cursor: pointer;
}
/* header */
.header_top_container {
height: 70px;
display: flex;
justify-content: center;
position: fixed;
background-color: white;
width: 100%;
}
.header_top_box {
width: 55%;
Expand Down
10 changes: 10 additions & 0 deletions images/main-page/eye-invisible.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions images/main-page/eye-visible.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/main-page/google-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/main-page/kakao-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<head>
<title>판다마켓</title>
<meta charset="UTF-8">
<link href="panda.css" rel="stylesheet" type="text/css" />
<link href="./css/panda.css" rel="stylesheet" type="text/css" />
<link href="./css/common.css" rel="stylesheet" type="text/css" />
</head>

<body>
Expand Down
55 changes: 54 additions & 1 deletion login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,54 @@
loginn
<!DOCTYPE html>
<head>
<title>로그인페이지</title>
<meta charset="UTF-8">
<link href="./css/common.css" rel="stylesheet" type="text/css" />
<link href="./css/login-signup.css" rel="stylesheet" type="text/css" />
</head>
<body>
<article>
<section>
<div class="login-container">
<div class="login-img-box">
<a href="/" aria-label="홈으로 이동">
<img class="login-img" src="./images/main-page/logo.png" alt="logo">
</a>
</div>
<div class="login-email-box">
<h4>이메일</h4>
<input type="email" placeholder="[email protected]" class="login-email-input" required>
</div>
<div class="login-password-box">
<h4>비밀번호</h4>
<input type="password" class="login-password-input" required>
</div>
<div class="login-button-box">
<button class="login-button">
로그인
</button>
</div>
<div class="login-ezlogin-box">
<div class="login-ezlogin">
<h4>간편 로그인하기</h4>
</div>
<div class="login-ezlogin-logos">
<a href="https://www.google.com" aria-label="구글로 이동" rel="noopener">
<img class="logo" src="./images/main-page/google-logo.png" alt="">
</a>
<a href="https://www.kakaorp.com/page/" aria-label="카카오로 이동" rel="noopener">
<img class="logo" src="./images/main-page/kakao-logo.png" alt="">
</a>
</div>
</div>
<div class="login-footer">
<h5>
판다마켓이 처음이신가요?
<a href="signup.html">회원가입</a>
</h5>
</div>
</div>
</section>
</article>
</body>

</html>
62 changes: 62 additions & 0 deletions signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!DOCTYPE html>
<head>
<title>회원가입페이지</title>
<meta charset="UTF-8">
<link href="./css/common.css" rel="stylesheet" type="text/css" />
<link href="./css/login-signup.css" rel="stylesheet" type="text/css" />
</head>
<body>
<article>
<section>
<div class="signup-container">
<div class="signup-img-box">
<a href="/" aria-label="홈으로 이동">
<img class="signup-img" src="./images/main-page/logo.png" alt="logo">
</a>
</div>
<div class="signup-email-box">
<h4>이메일</h4>
<input type="email" placeholder="[email protected]" class="signup-email-input" required>
</div>
<div class="signup-nickname-box">
<h4>닉네임</h4>
<input type="name" placeholder="판다" class="signup-nickname-input" required>
</div>
<div class="signup-password-box">
<h4>비밀번호</h4>
<input type="password" class="signup-password-input" required>
</div>
<div class="signup-ckpassword-box">
<h4>비밀번호 확인</h4>
<input type="password" class="signup-ckpassword-input" required>
</div>
<div class="signup-button-box">
<button class="signup-button">
로그인
</button>
</div>
<div class="signup-ezlogin-box">
<div class="signup-ezlogin">
<h4>간편 로그인하기</h4>
</div>
<div class="signup-ezlogin-logos">
<a href="https://www.google.com" aria-label="구글로 이동" rel="noopener">
<img class="logo" src="./images/main-page/google-logo.png" alt="">
</a>
<a href="https://www.kakaorp.com/page/" aria-label="카카오로 이동" rel="noopener">
<img class="logo" src="./images/main-page/kakao-logo.png" alt="">
</a>
</div>
</div>
<div class="signup-footer">
<h5>
판다마켓이 처음이신가요?
<a href="login.html">로그인</a>
</h5>
</div>
</div>
</section>
</article>
</body>

</html>