diff --git a/.DS_Store b/.DS_Store index 04e5f045..9fa7bd96 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/_redirects b/_redirects new file mode 100644 index 00000000..50a46335 --- /dev/null +++ b/_redirects @@ -0,0 +1 @@ +/* /index.html 200 \ No newline at end of file diff --git a/assets/.DS_Store b/assets/.DS_Store index c5af2de7..ec815b6b 100644 Binary files a/assets/.DS_Store and b/assets/.DS_Store differ diff --git a/assets/eyes-on.png b/assets/eyes-on.png new file mode 100644 index 00000000..467cf49a Binary files /dev/null and b/assets/eyes-on.png differ diff --git a/assets/eyes.png b/assets/eyes.png index 8e80ce22..fb4eeaf4 100644 Binary files a/assets/eyes.png and b/assets/eyes.png differ diff --git a/assets/panda-logo-medium.png b/assets/panda-logo-medium.png new file mode 100644 index 00000000..7db8527a Binary files /dev/null and b/assets/panda-logo-medium.png differ diff --git a/assets/panda-logo-small.png b/assets/panda-logo-small.png new file mode 100644 index 00000000..3d644886 Binary files /dev/null and b/assets/panda-logo-small.png differ diff --git a/css/login.css b/css/common.css similarity index 92% rename from css/login.css rename to css/common.css index aa052cc8..0bdea66e 100644 --- a/css/login.css +++ b/css/common.css @@ -11,6 +11,16 @@ --blue: #3692ff; } +.error-message { + display: none; + position: relative; + bottom: 16px; + left: 16px; + margin-top: 8px; + font-size: 14px; + color: #f74747; +} + * { box-sizing: border-box; margin: 0; @@ -27,10 +37,6 @@ margin-top: 231px; } -#join { - margin-bottom: 231px; -} - .panda-logo-img { width: 396px; height: 132px; @@ -68,8 +74,8 @@ } .eyes { - width: 20px; - height: 18px; + width: 24px; + height: 24px; position: relative; top: 5px; right: 50px; @@ -137,6 +143,7 @@ #join { margin-left: 4px; + margin-bottom: 231px; } .join-first { @@ -155,8 +162,6 @@ @media (max-width: 766px) { .panda-logo-a { - display: block; - width: fit-content; margin: 0 auto; margin-top: 80px; } @@ -197,8 +202,8 @@ } .eyes { - top: -95%; - left: 85%; + top: -53px; + left: 300px; } .simple-login { diff --git a/css/signup.css b/css/signup.css index 7bfdd898..1c1ad99a 100644 --- a/css/signup.css +++ b/css/signup.css @@ -1,209 +1,15 @@ -:root { - --gray-900: #111827; - --gray-800: #1f2937; - --gray-700: #374151; - --gray-600: #4b5563; - --gray-500: #6b7280; - --gray-400: #9ca3af; - --gray-200: #e5e7eb; - --gray-100: #f3f4f6; - --gray-50: #f9fafb; - --blue: #3692ff; -} - -* { - box-sizing: border-box; - margin: 0; - padding: 0; -} - .panda-logo-a { - margin-top: 60px; -} - -.join { - margin-bottom: 178px; -} - -.hearder { - display: flex; - flex-direction: column; - justify-content: center; -} - -.panda-logo-img { - width: 396px; - height: 132px; - margin: 0 122px 40px 122px; -} - -.main { - flex-grow: 1; -} - -.all-elements { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - -.form { - display: flex; - flex-direction: column; -} - -.google-logo, -.kakao-logo { - width: 42px; - height: 42px; -} - -.google-logo { - margin-right: 16px; -} - -.kakao-logo { - margin-right: 23px; -} - -#google { - text-decoration: none; -} -#kakao { - text-decoration: none; -} - -.simple-login { - display: flex; - align-items: center; - justify-content: space-between; - background-color: #e6f2ff; - border-radius: 8px; - color: var(--gray-800); - max-width: 640px; - height: 74px; - padding-left: 23px; -} - -.form label { - margin-bottom: 16px; - font-size: 18px; - font-weight: 700; - font-family: "Pretendard"; -} - -.form input { - margin-bottom: 24px; - border-radius: 12px; - width: 640px; - height: 56px; - background-color: #f3f4f6; - border: 0; - padding: 0 0 0 24px; -} - -.eyes { - width: 20px; - height: 18px; - position: relative; - top: 5px; - right: 50px; -} - -.form button { - margin-bottom: 24px; - width: 640px; - height: 56px; - border-radius: 40px; - border: 0; - background-color: var(--gray-400); - color: #f3f4f6; - font-size: 20px; -} - -.form button:hover { - background-color: var(--blue); -} - -.join { - margin-top: 24px; - display: flex; - justify-content: center; -} - -#join { - margin-left: 4px; -} - -.join-first { - color: var(--gray-800); + margin-top: 48px; } @media (max-width: 1199px) { - .panda-logo-a { - margin-top: 48px; - } - - .join { + #join { margin-bottom: 243px; } } @media (max-width: 766px) { - .panda-logo-a { - display: block; - width: fit-content; - margin: 0 auto; - margin-top: 24px; - } - - .panda-logo-img { - width: 198px; - height: 66px; - margin: 0; - } - - .hearder { - max-width: 400px; - width: 100%; - } - - .form label { - width: 100%; - max-width: 400px; - margin-bottom: 8px; - } - - .form input { - width: 100%; - max-width: 400px; - margin-bottom: 16px; - } - - .password-check-flex { - width: 100%; - max-width: 400px; - margin-bottom: 16px; - height: 56px; - } - - .form button { - width: 100%; - max-width: 400px; - } - - .eyes { - top: -95%; - left: 85%; - } - - .simple-login { - width: 100%; - max-width: 400px; - } - - .join { + #join { margin-bottom: 179px; } } diff --git a/css/style.css b/css/style.css index a7f9ca91..36e782b9 100644 --- a/css/style.css +++ b/css/style.css @@ -1,3 +1,22 @@ +/*유틸리티 클래스*/ +.flex { + display: flex; +} + +.justify-center { + justify-content: center; +} + +.align-center { + align-items: center; +} + +.center { + display: flex; + justify-content: center; + align-items: center; +} + * { box-sizing: border-box; margin: 0; @@ -16,9 +35,7 @@ main { } .nav-flex { - display: flex; justify-content: space-between; - align-items: center; padding: 0 200px; position: fixed; width: 100%; @@ -32,9 +49,6 @@ main { } .login { - display: flex; - justify-content: center; - align-items: center; text-decoration: none; background-color: #3692ff; color: #f3f4f6; @@ -51,12 +65,9 @@ main { max-width: 100%; height: 540px; background-color: #cfe5ff; - display: flex; - justify-content: center; } .landing-page-text { - display: flex; flex-direction: column; position: relative; top: 12.5rem; @@ -65,7 +76,6 @@ main { .large-text { font-size: 2.5rem; - font-family: "Pretendard"; font-weight: 700; line-height: 3.5rem; color: #374151; @@ -78,12 +88,8 @@ main { .see { text-decoration: none; - font-family: "Pretendard"; font-weight: 600; font-size: 1.25rem; - display: flex; - justify-content: center; - align-items: center; width: 357px; height: 56px; border-radius: 40px; @@ -106,16 +112,16 @@ main { object-fit: cover; } +.main-img#last { + height: 397px; +} + .second-page { - display: flex; - justify-content: center; - align-items: center; margin-top: 138px; margin-bottom: 138px; } .main-list { - display: flex; flex-direction: column; } @@ -123,9 +129,7 @@ main { background-color: #fcfcfc; width: 400px; height: 444px; - display: flex; flex-direction: column; - justify-content: center; padding-left: 64px; } @@ -146,9 +150,7 @@ main { background-color: #fcfcfc; width: 400px; height: 444px; - display: flex; flex-direction: column; - justify-content: center; padding-right: 64px; text-align: right; } @@ -157,9 +159,7 @@ main { background-color: #fcfcfc; width: 400px; height: 444px; - display: flex; flex-direction: column; - justify-content: center; padding-left: 64px; } @@ -172,24 +172,19 @@ main { max-width: 100%; height: 540px; background-color: #cfe5ff; - display: flex; - justify-content: center; } .large-text-last { font-size: 2.5rem; - font-family: "Pretendard"; font-weight: 700; line-height: 56px; color: #374151; position: relative; top: 50px; - margin-right: 60px; } .footer { background-color: #111827; - display: flex; justify-content: space-around; align-items: baseline; height: 160px; @@ -201,7 +196,6 @@ main { } .fqa { - display: flex; gap: 30px; } @@ -215,7 +209,6 @@ main { } .last-img { - display: flex; gap: 10px; } @@ -235,18 +228,14 @@ main { } .landing-page-text { - width: auto; - height: 56px; - position: relative; - top: 84px; - left: 400px; - white-space: nowrap; + top: 50px; + justify-content: center; } .large-text { margin-bottom: 24px; } - + h2.large-text br { display: none; } @@ -261,10 +250,11 @@ main { } .main-img { - top: 430px; - right: 255px; + position: absolute; + top: 500px; width: 100%; max-width: 100%; + width: 743px; } .second-page { @@ -325,22 +315,15 @@ main { .landing-page-last { width: 100%; height: 927px; - } - - .reliable { + text-align: center; position: relative; - left: 50px; - } - - .large-text-last { - top: 150px; } .main-img#last { - top: 587px; - height: 397px; - width: 100%; - right: 176px; + position: absolute; + top: 540px; + max-width: 100%; + width: 743px; } } @@ -360,7 +343,9 @@ main { .landing-page-text { width: auto; height: 156px; - left: 280px; + white-space: nowrap; + justify-content: center; + align-items: center; } .large-text { @@ -374,9 +359,9 @@ main { .see-flex { position: relative; - left: 0; + left: 50px; } - + .event-text { font-size: 16px; white-space: nowrap; @@ -399,8 +384,7 @@ main { .main-img { height: 204px; - top: 336px; - right: 177px; + top: 406px; width: 448px; max-width: 448px; object-fit: cover; @@ -414,20 +398,14 @@ main { .large-text-last { font-size: 32px; top: 0; - right: 50px; } .main-img#last { + position: absolute; + top: 342px; + max-width: 100%; width: 375px; - max-width: 375px; height: 198px; - top: 342px; - right: 148px; - } - - .reliable { - position: relative; - left: 40px; } .design { diff --git a/index.html b/index.html index 6aecdaff..3522c01e 100644 --- a/index.html +++ b/index.html @@ -1,59 +1,69 @@ - - - - - - - - - - - - - - - 판다마켓 - - - + + + + + + + + + + + + + 판다마켓 + + + -
-
-
+
+

일상의 모든 물건을
거래해보세요

A cute panda standing there
-
-
- A green panda shirt -
+
+
+ A green panda shirt +
Hot item

-