Skip to content

Commit

Permalink
Merge pull request #96 from gjrefa9139/Basic-조규진-sprint3
Browse files Browse the repository at this point in the history 
[조규진] Sprint3
  • Loading branch information
@arthurkimdev
arthurkimdev authored Jun 9, 2024
2 parents acdf8f4 + 4881d31 commit d210bc0
Show file tree
Hide file tree
Showing 8 changed files with 239 additions and 57 deletions.
Binary file modified images/panda/panda_logo.png
View file
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/panda/pandamarket.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 5 additions & 8 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
as="style"
crossorigin
href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.min.css"
>
>
<link rel="stylesheet" href="styles/global.css">
<link rel="stylesheet" href="styles/home.css">
<link rel="icon" href="images/panda/panda.png">
Expand All @@ -22,7 +22,7 @@
src="images/panda/panda_logo.png"
alt="판다마켓 홈"
width="153"
>
>
</a>
<a href="login.html" class="button login">로그인</a>
</header>
Expand All @@ -43,8 +43,7 @@ <h1>
<img
src="images/home/feature1_hot_item.png"
alt="인기 상품"
width="50%"
>
>
<div class="feature-content">
<h2 class="feature-tag">Hot item</h2>
<h1>
Expand Down Expand Up @@ -72,15 +71,13 @@ <h1>
<img
src="images/home/feature2_search.png"
alt="검색 기능"
width="50%"
>
>
</div>
<div class="feature">
<img
src="images/home/feature3_register.png"
alt="판매 상품 등록"
width="50%"
>
>
<div class="feature-content">
<h2 class="feature-tag">Register</h2>
<h1>
Expand Down
30 changes: 16 additions & 14 deletions login.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@
as="style"
crossorigin
href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.min.css"
>
>
<link rel="stylesheet" href="styles/global.css">
<link rel="stylesheet" href="styles/auth.css">
<link rel="icon" href="images/panda/panda.png">
<title>판다마켓 - 로그인</title>
</head>

<body>
<div class="auth-container">
<div class="home-logo">
<a href="/">
<img src="images/panda/panda_logo.png" alt="판다마켓 홈" width="396">
</a>
</div>
<main class="auth-container">
<a
href="/"
class="home-logo"
aria-label="홈으로 이동"
>
<img src="images/panda/panda_logo.png" alt="판다마켓 홈">
</a>

<form method="post">
<div class="input-info">
Expand All @@ -31,7 +33,7 @@
name="email"
type="email"
placeholder="이메일을 입력해 주세요"
>
>
</div>
<div class="input-info">
<label for="password">비밀번호</label>
Expand All @@ -41,13 +43,13 @@
name="password"
type="password"
placeholder="비밀번호를 입력해 주세요"
>
>
<img
src="images/icon/invisible.png"
alt="비밀번호 숨김"
class="toggle-password"
width="24"
>
>
</div>
</div>

Expand All @@ -64,14 +66,14 @@ <h3>간편 로그인하기</h3>
src="images/social/ic_google.png"
alt="구글 로그인"
width="42"
>
>
</a>
<a href="https://www.kakaocorp.com/page/" target="_blank" rel="noopener noreferrer">
<img
src="images/social/ic_kakaotalk.png"
alt="카카오톡 로그인"
width="42"
>
>
</a>
</div>
</div>
Expand All @@ -80,6 +82,6 @@ <h3>간편 로그인하기</h3>
판다마켓이 처음이신가요?
<a href="singin.html">회원가입</a>
</div>
</div>
</mian>
</body>
</html>
</html>
30 changes: 14 additions & 16 deletions singin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@
as="style"
crossorigin
href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.min.css"
>
>
<link rel="stylesheet" href="styles/global.css">
<link rel="stylesheet" href="styles/auth.css">
<link rel="icon" href="images/panda/panda.png">
<title>판다마켓 - 회원가입</title>
</head>

<body>
<div class="auth-container">
<div class="home-logo">
<a href="/">
<img src="images/panda/panda_logo.png" alt="판다마켓 홈" width="396">
</a>
</div>
<main class="auth-container">
<a href="/" class="home-logo">
<img src="images/panda/panda_logo.png" alt="판다마켓 홈">
</a>

<form method="post">
<div class="input-info">
Expand All @@ -31,7 +29,7 @@
name="email"
type="email"
placeholder="이메일을 입력해 주세요"
>
>
</div>
<div class="input-info">
<label for="nickname">닉네임</label>
Expand All @@ -40,7 +38,7 @@
name="nickname"
type="text"
placeholder="닉네임을 입력해 주세요"
>
>
</div>
<div class="input-info">
<label for="password">비밀번호</label>
Expand All @@ -50,13 +48,13 @@
name="password"
type="password"
placeholder="비밀번호를 입력해 주세요"
>
>
<img
src="images/icon/invisible.png"
alt="비밀번호 숨김"
class="toggle-password"
width="24"
>
>
</div>
</div>
<div class="input-info">
Expand All @@ -67,13 +65,13 @@
name="check-PW"
type="password"
placeholder="비밀번호를 다시 한 번 입력해 주세요"
>
>
<img
src="images/icon/invisible.png"
alt="비밀번호 숨김"
class="toggle-password"
width="24"
>
>
</div>
</div>

Expand All @@ -90,21 +88,21 @@ <h3>간편 로그인하기</h3>
src="images/social/ic_google.png"
alt="구글 로그인"
width="42"
>
>
</a>
<a href="https://www.kakaocorp.com/page/" target="_blank" rel="noopener noreferrer">
<img
src="images/social/ic_kakaotalk.png"
alt="카카오톡 로그인"
width="42"
>
>
</a>
</div>
</div>

<div class="auth-switch">
이미 회원이신가요? <a href="login.html">로그인</a>
</div>
</div>
</main>
</body>
</html>
44 changes: 33 additions & 11 deletions styles/auth.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,33 @@
}

.auth-container {
max-width: 640px;
padding: 24px 16px;
max-width: 432px;
margin: 0 auto;
}

.home-logo {
display: block;
margin-bottom: 24px;
text-align: center;
margin-top: 60px;
margin-bottom: 40px;
}

.home-logo img {
width: 198px;
}

.input-info {
margin-bottom: 24px;
display: flex;
flex-direction: column;
}

label {
.input-info label {
display: block;
margin-bottom: 16px;
font-size: 18px;
font-weight: 700;
font-size: 14px;
margin-bottom: 8px;
}

input {
.input-info input {
padding: 16px 24px;
background-color: #f3f4f6;
border: none;
Expand All @@ -37,7 +39,7 @@ input {
width: 100%;
}

input::placeholder {
.input-info input::placeholder {
color: #9ca3af;
font-size: 16px;
line-height: 24px;
Expand All @@ -52,7 +54,6 @@ input::placeholder {
.toggle-password {
position: absolute;
right: 24px;
cursor: pointer;
}

.social-login {
Expand Down Expand Up @@ -87,3 +88,24 @@ input::placeholder {
text-decoration: underline;
text-underline-offset: 2px;
}


@media (min-width: 768px) {
.auth-container {
max-width: 640px;
padding: 48px 0;
}

.home-logo {
margin-bottom: 40px;
}

.home-logo img {
width: 396px;
}

.input-info label {
font-size: 18px;
margin-bottom: 16px;
}
}
Loading

0 comments on commit d210bc0

Please sign in to comment.