Skip to content

[최권진] Sprint4 #59

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
dongqui merged 1 commit into from
Feb 12, 2025
Merged

[최권진] Sprint4 #59

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
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions _redirects
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
Binary file modified assets/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added assets/eyes-on.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/eyes.png
View file
Open in desktop
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 assets/panda-logo-medium.png
View file
Open in desktop
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 assets/panda-logo-small.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 15 additions & 10 deletions css/login.css → css/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,10 +37,6 @@
margin-top: 231px;
}

#join {
margin-bottom: 231px;
}

.panda-logo-img {
width: 396px;
height: 132px;
Expand Down Expand Up @@ -68,8 +74,8 @@
}

.eyes {
width: 20px;
height: 18px;
width: 24px;
height: 24px;
position: relative;
top: 5px;
right: 50px;
Expand Down Expand Up @@ -137,6 +143,7 @@

#join {
margin-left: 4px;
margin-bottom: 231px;
}

.join-first {
Expand All @@ -155,8 +162,6 @@

@media (max-width: 766px) {
.panda-logo-a {
display: block;
width: fit-content;
margin: 0 auto;
margin-top: 80px;
}
Expand Down Expand Up @@ -197,8 +202,8 @@
}

.eyes {
top: -95%;
left: 85%;
top: -53px;
left: 300px;
}

.simple-login {
Expand Down
200 changes: 3 additions & 197 deletions css/signup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
Loading
Loading