Skip to content

[박형준] Sprint 4 #174

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
kich555 merged 2 commits into from
Nov 17, 2024
Merged

[박형준] Sprint 4 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8fc90b
sprint4
Nov 16, 2024
ad5cc1e
Merge branch 'Basic-박형준' into Basic-박형준-sprint4
junAlexx Nov 16, 2024
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
65 changes: 52 additions & 13 deletions css/style_for_signup_&_login.css → css/authorization.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@
box-sizing: border-box;
}

:root {
--alert: #f74747;
--darkerBlue: #3182f6;
--blue: #3692ff;
--skyBlue: #e6f2ff;
--gray900: #111827;
--gray800: #1f2937;
--gray700: #374151;
--gray600: #4b5563;
--gray500: #6b7289;
--gray400: #9ca3af;
--gray200: #e5e7eb;
--gray100: #f3f4f6;
--gray50: #f9fafb;
}

/* =================== Mobile =================== */

body {
Expand All @@ -22,6 +38,8 @@ body {
max-width: 400px;
width: 100%;

overflow-x: auto;

margin-top: 80px;
margin-bottom: 211px;

Expand Down Expand Up @@ -57,7 +75,7 @@ body {
display: flex;
flex-direction: column;
align-items: stretch;
gap: 8px;
/* gap: 8px; */
}

.form label {
Expand All @@ -71,24 +89,28 @@ body {
.form input {
height: 56px;

width: 100%;

margin-top: 8px;

display: block;

padding: 16px 24px;
border: 0;
border-radius: 12px;

/* margin-top: 16px; */
/* margin-top: 8px; */

background-color: #f3f4f6;
background-color: var(--gray100);
}

.form input:focus {
outline: none;
border: 2px solid #3692ff;
border: 2px solid var(--blue);
}

::placeholder {
color: #9ca3af;
color: var(--gray400);

font-family: Pretendard;
font-size: 16px;
Expand All @@ -107,13 +129,13 @@ body {

.visibility_toggle {
position: absolute;
top: 16px;
/* top: 16px; */
right: 24px;
bottom: 16px;
}

button {
color: #f3f4f6;
color: var(--gray100);
font-family: Pretendard, sans-serif;
font-size: 20px;
font-weight: 600;
Expand All @@ -127,18 +149,18 @@ button {
border: 0;
border-radius: 40px;

background-color: #9ca3af;
background-color: var(--gray400);
}

button:hover {
background-color: #3692ff;
/* background-color: var(--blue); */
cursor: pointer;
}

.footer {
height: 74px;

background-color: #e6f2ff;
background-color: var(--skyBlue);

border-radius: 8px;

Expand Down Expand Up @@ -173,14 +195,14 @@ button:hover {
}

.link_to_login_or_signin {
color: #1f2937;
color: var(--gray800);
font-size: 14px;
font-weight: 500;
text-align: center;
}

.link_to_login_or_signin a {
color: #3182f6;
color: var(--darkerBlue);
}

/* =================== Tablet =================== */
Expand Down Expand Up @@ -219,7 +241,11 @@ button:hover {
}

.form .input_box {
gap: 16px;
/* gap: 16px; */
}

.form input {
margin-top: 16px;
}

.form label {
Expand All @@ -242,3 +268,16 @@ button:hover {
margin-bottom: unset;
}
}

/* Sprint 4 회원가입, 로그인 입력창 경고문구 만들기 */

.alert {
color: var(--alert);
font-size: 14px;
font-weight: 600;
line-height: 24px;

display: none;
}

/* border: 2px solid var(--blue); */
21 changes: 19 additions & 2 deletions css/style_for_index.css → css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,27 @@
box-sizing: border-box;
}

:root {
--blue: #3692ff;
--gray900: #111827;
--gray800: #1f2937;
--gray700: #374151;
--gray600: #4b5563;
--gray500: #6b7289;
--gray400: #9ca3af;
--gray200: #e5e7eb;
--gray100: #f3f4f6;
--gray50: #f9fafb;
}

body {
font-family: Pretendard, sans-serif;

margin: 0;

min-width: 375px;

overflow-x: auto;
}

a {
Expand Down Expand Up @@ -756,7 +771,9 @@ a {
}
}

@media (min-width: 1500px) {
/* 아래 코드가 제대로 동작하지 않아서 주석처리 하였습니다. */

/* @media (min-width: 1500px) {
.nav .space {
flex-grow: 1;
}
Expand All @@ -765,4 +782,4 @@ a {
min-width: 1100px;
flex-grow: 0;
}
}
} */
0 img/for_signup_&_login/google_logo.svg → img/authorization/google_logo.svg
View file
Open in desktop
File renamed without changes
0 img/for_signup_&_login/kakaotalk_logo.svg → img/authorization/kakaotalk_logo.svg
View file
Open in desktop
File renamed without changes
0 img/for_signup_&_login/panda_market_logo.svg → img/authorization/panda_market_logo.svg
View file
Open in desktop
File renamed without changes
0 ..._signup_&_login/visibility_toggle_off.svg → img/authorization/visibility_toggle_off.svg
View file
Open in desktop
File renamed without changes
0 ...r_signup_&_login/visibility_toggle_on.svg → img/authorization/visibility_toggle_on.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/Img_home_01_green_tshirt.svg → img/index/Img_home_01_green_tshirt.svg
View file
Open in desktop
File renamed without changes
0 ...or_index/Img_home_02_magnifying_glass.svg → img/index/Img_home_02_magnifying_glass.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/Img_home_03_folders.svg → img/index/Img_home_03_folders.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/Img_home_bottom_two_pandas.svg → img/index/Img_home_bottom_two_pandas.svg
View file
Open in desktop
File renamed without changes
0 ...ex/Img_home_top_a_panda_with_blue_bag.svg → ...ex/Img_home_top_a_panda_with_blue_bag.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/ic_facebook.svg → img/index/ic_facebook.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/ic_instagram.svg → img/index/ic_instagram.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/ic_main.svg → img/index/ic_main.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/ic_twitter.svg → img/index/ic_twitter.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/ic_youtube.svg → img/index/ic_youtube.svg
View file
Open in desktop
File renamed without changes
0 img/for_index/text_logo_panda_market.svg → img/index/text_logo_panda_market.svg
View file
Open in desktop
File renamed without changes
33 changes: 17 additions & 16 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>판다마켓</title>
<link rel="stylesheet" href="/css/style_for_index.css" />

<link rel="stylesheet" href="/css/index.css" />
</head>
<body>

Expand All @@ -14,9 +15,9 @@
<div class="space left"></div>
<div class="container">
<a class="button market_home" href="/">
<img src="/img/for_index/ic_main.svg" alt="main_icon" />
<img src="/img/index/ic_main.svg" alt="main_icon" />
<img
src="/img/for_index/text_logo_panda_market.svg"
src="/img/index/text_logo_panda_market.svg"
alt="panda_market_text_logo"
/>
</a>
Expand All @@ -39,7 +40,7 @@
<div class="divider"></div>
<div class="img">
<img
src="/img/for_index/Img_home_top_a_panda_with_blue_bag.svg"
src="/img/index/Img_home_top_a_panda_with_blue_bag.svg"
alt="a_panda_with_blue_bag"
/>

Expand All @@ -54,7 +55,7 @@
<!-- Section_2 -->
<div class="section_2">
<img
src="/img/for_index/Img_home_01_green_tshirt.svg"
src="/img/index/Img_home_01_green_tshirt.svg"
alt="green_tshirt"
/>
<div class="text_container">
Expand All @@ -75,7 +76,7 @@
<!-- Section_3 -->
<div class="section_3">
<img
src="/img/for_index/Img_home_02_magnifying_glass.svg"
src="/img/index/Img_home_02_magnifying_glass.svg"
alt="magnifying_glass"
/>

Expand All @@ -96,7 +97,7 @@

<!-- Section_4 -->
<div class="section_4">
<img src="/img/for_index/Img_home_03_folders.svg" alt="folders" />
<img src="/img/index/Img_home_03_folders.svg" alt="folders" />
<div class="text_container">
<div>
<div class="blue_text">Register</div>
Expand Down Expand Up @@ -127,7 +128,7 @@
<div class="divider"></div>
<div class="img">
<img
src="/img/for_index/Img_home_bottom_two_pandas.svg"
src="/img/index/Img_home_bottom_two_pandas.svg"
alt="two_pandas"
/>
</div>
Expand All @@ -143,17 +144,17 @@
<a class="faq" href="/">FAQ</a>
</div>
<div class="links">
<a href="https://www.facebook.com/">
<img src="/img/for_index/ic_facebook.svg" alt="facebook" />
<a href="https://www.facebook.com/" target="_blank">
<img src="/img/index/ic_facebook.svg" alt="facebook" />
</a>
<a href="https://x.com/">
<img src="/img/for_index/ic_twitter.svg" alt="twitter" />
<a href="https://x.com/" target="_blank">
<img src="/img/index/ic_twitter.svg" alt="twitter" />
</a>
<a href="https://www.youtube.com/">
<img src="/img/for_index/ic_youtube.svg" alt="youtube" />
<a href="https://www.youtube.com/" target="_blank">
<img src="/img/index/ic_youtube.svg" alt="youtube" />
</a>
<a href="https://www.instagram.com/">
<img src="/img/for_index/ic_instagram.svg" alt="instagram" />
<a href="https://www.instagram.com/" target="_blank">
<img src="/img/index/ic_instagram.svg" alt="instagram" />
</a>
</div>
</div>
Expand Down
Loading