Skip to content

Commit a2d62c9

Browse files
baeggminbaeggmin
authored
Merge pull request #65 from alvin-kum/Basic-금정훈-sprint2
[금정훈] sprint2
2 parents b053974 + 3c29c1b commit a2d62c9

12 files changed

Lines changed: 218 additions & 25 deletions

File tree

‎css/common.css‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@import './reset.css';
2+
3+
* {
4+
box-sizing: border-box;
5+
}
6+
7+
html,
8+
body {
9+
height: 100%;
10+
}
11+
12+
body {
13+
margin: 0;
14+
background: #f7f8fd;
15+
color: #0b1f66;
16+
font-family: 'Pretendard', 'Noto Sans KR', sans-serif;
17+
;
18+
}

css/style.css renamed to css/home/style.css

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
@import './reset.css';
2-
3-
* {
4-
box-sizing: border-box;
5-
}
6-
7-
html, body {
8-
height: 100%;
9-
}
1+
@import '../common.css';
102

113
body {
12-
margin: 0;
13-
background: #f7f8fd;
14-
color: #0b1f66;
15-
font-family: 'Pretendard', 'Noto Sans KR', sans-serif;;
4+
margin: 72.5px 0 0;
165
}
176

187
header {
8+
position: fixed;
199
width: 100%;
10+
height: 72.5px;
11+
top: 0;
12+
left: 0;
13+
background-color: #FFFFFF;
2014
display: flex;
2115
justify-content: center;
2216
max-width: 1920px;

‎css/login/login.css‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
@import '../common.css';
2+
3+
.container {
4+
width: 100%;
5+
height: 100%;
6+
display: flex;
7+
justify-content: center;
8+
align-items: center;
9+
flex-direction: column;
10+
margin: 0 auto;
11+
}
12+
13+
.content {
14+
margin-top: 40px;
15+
}
16+
17+
.signin_container{
18+
display: flex;
19+
flex-direction: column;
20+
}
21+
22+
label {
23+
display: block;
24+
font-size: 18px;
25+
font-weight: 700;
26+
line-height: 26px;
27+
margin-bottom: 16px;
28+
}
29+
30+
input {
31+
width: 640px;
32+
height: 56px;
33+
padding: 16px 24px;
34+
margin-bottom: 24px;
35+
border: #F3F4F6 2px solid;
36+
border-radius: 12px;
37+
font-size: 16px;
38+
font-weight: 400;
39+
line-height: 26px;
40+
color: #1F2937;
41+
background-color: #F3F4F6;
42+
}
43+
.password-wrapper{
44+
position: relative;
45+
}
46+
47+
.toggle-visibility {
48+
position: absolute;
49+
top: 16px;
50+
right: 24px;
51+
}
52+
53+
.login-form-btn {
54+
width: 640px;
55+
height: 56px;
56+
margin-bottom: 24px;
57+
font-size: 20px;
58+
font-weight: 600;
59+
line-height: 32px;
60+
color: #F3F4F6;
61+
background-color: #3692FF;
62+
padding: 12px;
63+
text-align: center;
64+
text-decoration: none;
65+
border-radius: 40px;
66+
}
67+
68+
.social-login {
69+
display: flex;
70+
justify-content: space-between;
71+
align-items: center;
72+
width: 640px;
73+
height: 74px;
74+
padding: 16px 23px;
75+
margin-bottom: 24px;
76+
border-radius: 8px;
77+
background-color: #E6F2FF;
78+
}
79+
80+
.sns-btn {
81+
display: flex;
82+
gap: 16px;
83+
}
84+
85+
.signup-text {
86+
text-align: center;
87+
font-size: 14px;
88+
font-weight: 500;
89+
color: #1F2937;
90+
line-height: 24px;
91+
}

‎images/favicon.ico‎

15 KB
Binary file not shown.

‎images/login/btn_visibility_off_24px.png‎

837 Bytes
Loading

‎images/login/btn_visibility_on_24px.png‎

709 Bytes
Loading

‎images/login/google_sns.png‎

1.55 KB
Loading

‎images/login/kakao_sns.png‎

1.41 KB
Loading

‎images/login/login_logo.png‎

6.21 KB
Loading

‎index.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
<head>
44
<meta charset="utf-8">
55
<title>판다마켓</title>
6+
<link rel="icon" href="images/favicon.ico">
67
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css">
7-
<link rel="stylesheet" href="./css/style.css">
8+
<link rel="stylesheet" href="./css/home/style.css">
89
</head>
910
<body>
1011
<header>
@@ -94,16 +95,16 @@
9495
</span>
9596
<span class="sns">
9697
<a href="https://www.facebook.com/" target="_blank">
97-
<img src="/images/ic_facebook.png" alt="페이스북 바로가기">
98+
<img src="/images/ic_facebook.png" alt="">
9899
</a>
99100
<a href="https://x.com/" target="_blank">
100-
<img src="/images/ic_twitter.png" alt="트위터 바로가기">
101+
<img src="/images/ic_twitter.png" alt="">
101102
</a>
102103
<a href="https://www.youtube.com/" target="_blank">
103-
<img src="/images/ic_youtube.png" alt="유튜브 바로가기">
104+
<img src="/images/ic_youtube.png" alt="">
104105
</a>
105106
<a href="https://www.instagram.com/" target="_blank">
106-
<img src="/images/ic_instagram.png" alt="인스타그램 바로가기">
107+
<img src="/images/ic_instagram.png" alt="">
107108
</a>
108109
</span>
109110
</div>

0 commit comments

Comments
 (0)