Skip to content
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.

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

[이형준]sprint2 #41

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 removed Basic-이형준-sprint1/images/Img_home_01.png
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Img_home_01@2x.png
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Img_home_02.png
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Img_home_02@2x.png
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Img_home_03.png
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Img_home_03@2x.png
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Img_home_bottom.png
Binary file not shown.
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Img_home_top.png
Binary file not shown.
Binary file removed Basic-이형준-sprint1/images/Property 1=Typo.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 0 additions & 12 deletions Basic-이형준-sprint1/login/index.html

This file was deleted.

36 changes: 36 additions & 0 deletions css/base/global.css
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

전역적으로 사용될 css들 따로 파일로 만드신거 좋네요!

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}

:root {
--brand-blue: #3692ff;
--cool-gray-900: #111827;
--cool-gray-800: #1f2937;
--cool-gray-700: #374151;
--cool-gray-600: #4B5563;
--cool-gray-500: #6B7280;
--cool-gray-400: #9ca3af;
--cool-gray-300: #d1d5db;
--cool-gray-200: #e5e7eb;
--cool-gray-100: #f3f4f6;
--cool-gray-50: #f9fafb;
--error-red: #f74747;

/* arbitrarily named color value */
--gray-00: #ffffff;
--main-background-color: #cfe5ff;
}

html {
font-family: Pretendard, sans-serif;
}

button, input {
border: none;
}

button, a {
cursor: pointer;
}
49 changes: 49 additions & 0 deletions css/base/reset.css
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reset css 부분을 하나로 합치지 않고 파일로 따로 구분해서 관리해주시는 것도 좋은 것 같습니다.

Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}

/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}

body {
line-height: 1;
}

ol, ul {
list-style: none;
}

blockquote, q {
quotes: none;
}

blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}

table {
border-collapse: collapse;
border-spacing: 0;
}
67 changes: 22 additions & 45 deletions Basic-이형준-sprint1/style.css → css/home.css
Original file line number Diff line number Diff line change
@@ -1,53 +1,28 @@
* {
box-sizing: border-box;
}

:root {
--gray-00: #ffffff;
--brand-blue: #3692ff;
--cool-gray-900: #111827;
--cool-gray-800: #1f2937;
--cool-gray-700: #374151;
--cool-gray-600: #4B5563;
--cool-gray-500: #6B7280;
--cool-gray-400: #9ca3af;
--cool-gray-300: #d1d5db;
--cool-gray-200: #e5e7eb;
--cool-gray-100: #f3f4f6;
--cool-gray-50: #f9fafb;

/* arbitrarily named color value */
--main-background-color: #cfe5ff;
}

html {
font-size: 32px;
font-family: Pretendard, sans-serif;
}

body {
margin: 0;
}

header {
background-color: var(--gray-00);
display: flex;
padding: 0 200px;
padding: 10px 200px;
justify-content: space-between;
align-items: center;
position: sticky;
top: 0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sticky 사용하신거 좋네요! 추가로 sticky와 fixed의 차이점도 공부해보시면 좋을 것 같습니다.

z-index: 1;
}

.main-logo-block {
display: flex;
justify-content: center;
}

.main-logo {
display: inline-block;
width: 153px;
height: 51px;
cursor: pointer;

margin-top: 5px;
margin-bottom: -5px;
}

.main-top > div,
.mainpage,
.main-page,
.main-bottom > div {
width: 1200px;
margin: 0 auto;
Expand All @@ -59,7 +34,7 @@ header {
height: 720px;
}

.mainpage {
.main-page {
display: flex;
gap: 64px;
margin-top: 138;
Expand All @@ -77,12 +52,12 @@ p, h3 {
justify-content: center;
}

.rightmain .content-block h3,
.rightmain .content-block p {
.right-main .content-block h3,
.right-main .content-block p {
text-align: right;
Comment on lines +55 to +56
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이런 경우, 새로운 class 명을 하나 추가해서 해당 h3와 p 태그에 적용시켜주는 것도 좋습니다.

}

.mainpage.rightmain {
.main-page.right-main {
justify-content: end;
flex-flow: row-reverse;
}
Expand All @@ -97,7 +72,7 @@ p.main-content {
p.sub-content {
font-size: 24px;
font-weight: 500;
line-height: 28.8px;
line-height: 29px;
}

p {
Expand Down Expand Up @@ -139,7 +114,7 @@ p {
}

.item-button {
border-radius: 40px;
border-radius: 999px;
font-size: 20px;
width: 357px;
height: 56px;
Expand Down Expand Up @@ -192,16 +167,18 @@ footer {
}

.privacy-faq-link {
margin-top: -10px;
display: flex;
gap: 10px;
justify-content: center;
}

.external-link {
cursor: pointer;
text-decoration: none;
}

.toppage,
.bottompage {
.top-page,
.bottom-page {
position: relative;
height: 540px;
display: flex;
Expand Down
107 changes: 107 additions & 0 deletions css/login.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
.logo-image {
display: inline-block;
width: 396px;
height: 132px;
}

.logo-block {
width: 396px;
margin: 60px auto 40px;
}

.content {
width: 640px;
margin: 0 auto;
display: flex;
flex-direction: column;
gap: 24px;
}

h3 {
font-size: 18px;
font-weight: 700;
color: var(--cool-gray-800);
margin-bottom: 16px;
}

input {
width: 640px;
height: 56px;
border-radius: 12px;
background-color: var(--cool-gray-100);
color: var(--cool-gray-400);
font-size: 16px;
font-weight: 400;
padding: 16px 24px;
}

input:focus {
outline: 2px solid var(--brand-blue);
}

.password-input {
position: relative;
}

.visibility-button {
width: 24px;
height: 24px;
position: absolute;
top: 16px;
right: 24px;
}

button {
width: 640px;
height: 56px;
border-radius: 999px;
background-color: var(--brand-blue);
color: var(--cool-gray-100);
font-size: 20px;
font-weight: 600;
}

button:disabled {
background-color: var(--cool-gray-400);
}

.simple-login {
background-color: #e6f2ff;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 색깔도 변수로 사용해주시면 좋겠네요!

border-radius: 8px;
width: 640px;
height: 74px;
display: flex;
padding: 0 23px;
justify-content: space-between;
align-items: center;
}

.simple-login > p {
font-size: 16px;
font-weight: 500;
}

.simple-buttons {
display: flex;
gap: 16px;
}

.simple-login-button {
width: 42px;
height: 42px;
}

.about-signup-page,
.about-login-page {
display: flex;
justify-content: center;
align-items: center;
gap: 4px;
font-size: 15px;
font-weight: 500;
}

.signup-page-link,
.login-page-link {
color: var(--brand-blue);
}
Binary file added images/Img_home_top.png
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 images/btn_visibility_off.png
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 images/btn_visibility_on.png
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 images/ic_google_login.png
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 images/ic_kakaotalk_login.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Binary file added images/logo.png
Binary file added images/logo_with_typo.png
Loading
Loading