Skip to content

[금정훈]Sprint2 #76

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

Merged
baeggmin merged 1 commit into from
Jun 18, 2025
Merged

[금정훈]Sprint2 #76

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
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
0 css/common.css → css/common/common.css
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion css/login/login.css → css/common/form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../common.css';
@import '../common/common.css';

.container {
width: 100%;
Expand Down Expand Up @@ -62,7 +62,9 @@ input {
padding: 12px;
text-align: center;
text-decoration: none;
border-width: 0px;
border-radius: 40px;
cursor: pointer;
}

.social-login {
Expand Down
0 css/reset.css → css/common/reset.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion css/home/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../common.css';
@import '../common/common.css';

body {
margin: 72.5px 0 0;
Expand Down
0 images/login/btn_visibility_off_24px.png → images/common/btn_visibility_off_24px.png
View file
Open in desktop
File renamed without changes
0 images/login/btn_visibility_on_24px.png → images/common/btn_visibility_on_24px.png
View file
Open in desktop
File renamed without changes
0 images/favicon.ico → images/common/favicon.ico
View file
Open in desktop
File renamed without changes.
0 images/ic_facebook.png → images/common/ic_facebook.png
View file
Open in desktop
File renamed without changes
0 images/login/google_sns.png → images/common/ic_google_sns.png
View file
Open in desktop
File renamed without changes
0 images/ic_instagram.png → images/common/ic_instagram.png
View file
Open in desktop
File renamed without changes
0 images/login/kakao_sns.png → images/common/ic_kakao_sns.png
View file
Open in desktop
File renamed without changes
0 images/ic_twitter.png → images/common/ic_twitter.png
View file
Open in desktop
File renamed without changes
0 images/ic_youtube.png → images/common/ic_youtube.png
View file
Open in desktop
File renamed without changes
0 images/login/login_logo.png → images/common/login_logo.png
View file
Open in desktop
File renamed without changes
0 images/logo.png → images/common/logo.png
View file
Open in desktop
File renamed without changes
12 changes: 6 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<head>
<meta charset="utf-8">
<title>판다마켓</title>
<link rel="icon" href="images/favicon.ico">
<link rel="icon" href="images/common/favicon.ico">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css">
<link rel="stylesheet" href="./css/home/style.css">
</head>
<body>
<header>
<nav class="head-nav">
<a href="/">
<img src="./images/logo.png" alt="판다마켓">
<img src="./images/common/logo.png" alt="판다마켓">
</a>
<a class="login-btn" href="/login">
로그인
Expand Down Expand Up @@ -95,16 +95,16 @@
</span>
<span class="sns">
<a href="https://www.facebook.com/" target="_blank">
<img src="/images/ic_facebook.png" alt="">
<img src="/images/common/ic_facebook.png" alt="페이스북 바로가기">
</a>
<a href="https://x.com/" target="_blank">
<img src="/images/ic_twitter.png" alt="">
<img src="/images/common/ic_twitter.png" alt="엑스 바로가기">
</a>
<a href="https://www.youtube.com/" target="_blank">
<img src="/images/ic_youtube.png" alt="">
<img src="/images/common/ic_youtube.png" alt="유튜브 바로가기">
</a>
<a href="https://www.instagram.com/" target="_blank">
<img src="/images/ic_instagram.png" alt="">
<img src="/images/common/ic_instagram.png" alt="인스타그램 바로가기">
</a>
</span>
</div>
Expand Down
19 changes: 11 additions & 8 deletions login/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,41 @@
<head>
<meta charset="utf-8">
<title>판다마켓</title>
<link rel="icon" href="images/favicon.ico">
<link rel="icon" href="images/common/favicon.ico">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css">
<link rel="stylesheet" href="../css/login/login.css">
<link rel="stylesheet" href="../css/common/form.css">
</head>
<body>
<div class="container">
<div class="login_logo">
<a href="/">
<img src="../images/login/login_logo.png" alt="">
<img src="../images/common/login_logo.png" alt="판다마켓 로고">
</a>
</div>
<div class="content">
<form class="signin_container">
<label for="email">이메일</label>
<input type="email" id="email" placeholder="[email protected]">
<input type="email" name="id" id="email" placeholder="[email protected]">
<label for="password">비밀번호</label>
<div class="password-wrapper">
<input type="password" name="password" id="password">
<span class="toggle-visibility">
<img src="../images/login/btn_visibility_off_24px.png" alt="토글 버튼">
<img src="../images/common/btn_visibility_off_24px.png" alt="토글 버튼">
</span>
</div>
<a class="login-form-btn" href="/">로그인</a>
<button type="submit" class="login-form-btn">
로그인
</button>
<!-- <a class="login-form-btn" href="/">로그인</a> -->
</form>
<div class="social-login">
<span>간편 로그인하기</span>
<div class="sns-btn">
<a href="https://www.google.com" target="_blank">
<img src="../images/login/google_sns.png" alt="구글 바로가기">
<img src="../images/common/ic_google_sns.png" alt="구글 바로가기">
</a>
<a href="https://www.kakaocorp.com/page/" target="_blank">
<img src="../images/login/kakao_sns.png" alt="카카오 바로가기">
<img src="../images/common/ic_kakao_sns.png" alt="카카오 바로가기">
</a>
</div>
</div>
Expand Down
19 changes: 11 additions & 8 deletions signup/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<head>
<meta charset="utf-8">
<title>판다마켓</title>
<link rel="icon" href="images/favicon.ico">
<link rel="icon" href="images/common/favicon.ico">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css">
<link rel="stylesheet" href="../css/login/login.css">
<link rel="stylesheet" href="../css/common/form.css">
</head>
<body>
<div class="container">
<div class="login_logo">
<a href="/">
<img src="../images/login/login_logo.png" alt="">
<img src="../images/common/login_logo.png" alt="판다마켓 로고">
</a>
</div>
<div class="content">
Expand All @@ -24,26 +24,29 @@
<div class="password-wrapper">
<input type="password" id="password">
<span class="toggle-visibility">
<img src="../images/login/btn_visibility_off_24px.png" alt="토글 버튼">
<img src="../images/common/btn_visibility_off_24px.png" alt="토글 버튼">
</span>
</div>
<label for="password_confirm">비밀번호 확인</label>
<div class="password-wrapper">
<input type="password" id="password_confirm">
<span class="toggle-visibility">
<img src="../images/login/btn_visibility_on_24px.png" alt="토글 버튼">
<img src="../images/common/btn_visibility_on_24px.png" alt="토글 버튼">
</span>
</div>
<a class="login-form-btn" href="/login">회원가입</a>
<button type="submit" class="login-form-btn">
회원가입
</button>
<!-- <a class="login-form-btn" href="/login">회원가입</a> -->
</form>
<div class="social-login">
<span>간편 로그인하기</span>
<div class="sns-btn">
<a href="https://www.google.com" target="_blank">
<img src="../images/login/google_sns.png" alt="구글 바로가기">
<img src="../images/common/ic_google_sns.png" alt="구글 바로가기">
</a>
<a href="https://www.kakaocorp.com/page/" target="_blank">
<img src="../images/login/kakao_sns.png" alt="카카오 바로가기">
<img src="../images/common/ic_kakao_sns.png" alt="카카오 바로가기">
</a>
</div>
</div>
Expand Down
Loading