-
Notifications
You must be signed in to change notification settings - Fork 30
[송미진] 스프린트2 #28
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
Merged
dongqui
merged 3 commits into
codeit-bootcamp-frontend:Basic-송미진
from
songmijin824:Basic-송미진
Jan 16, 2025
The head ref may contain hidden characters: "Basic-\uC1A1\uBBF8\uC9C4"
Merged
[송미진] 스프린트2 #28
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,46 @@ | ||
| * { box-sizing:border-box; margin:0; } | ||
|
|
||
|
|
||
| @font-face { | ||
| font-family: 'Pretendard-Regular'; | ||
| src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); | ||
| font-weight: 400; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| body { font-family: 'Pretendard-Regular'; font-size:15px; font-weight: 400; color:var(--Secondary); } | ||
| a { text-decoration: none; } | ||
|
|
||
| .inner,.box_inner { margin:0 auto; min-width:325px; max-width:1120px; } | ||
|
|
||
| :root { | ||
| --Primary: #3692FF; | ||
| --Secondary: #374151; | ||
| --Secondary_200:#E5E7EB; | ||
| --Secondary_400:#9CA3AF; | ||
| --Secondary_900:#111827; | ||
| } | ||
|
|
||
| .font_1 { font-size:40px; } | ||
| .font_2 { font-size:24px; } | ||
| .font_3 { font-size:18px; } | ||
| input:hover, | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ui.css쪽으로 가는 게 어울릴 거 같네요 🤣 |
||
| input:focus {outline:1px solid #3692FF;} | ||
| input::placeholder { color:#9CA3AF; } | ||
| input[type='submit'] { outline:0; } | ||
|
|
||
| /* 상단 */ | ||
| header { position:sticky; top:0; width:100%; background-color: #fff; z-index: 9999; } | ||
| header .inner { display:flex; justify-content: space-between; align-items: center; padding:13px 0; } | ||
| header .inner .logo_top { } | ||
| header .inner .logo_top img { height:40px; } | ||
| header .inner .logo_top img:last-child { height:35px; } | ||
| header .inner .login_btn { } | ||
|
|
||
|
|
||
|
|
||
| /* 내용 _ mainimg */ | ||
| .main_title { width:100%; background-color: #CFE5FF ; height: 540px; } | ||
| .main_title .inner { | ||
| position:relative; | ||
| height:100%; | ||
| background-image: url(/images/Img_home_top.png); | ||
| background-image: url(../images/Img_home_top.png); | ||
| background-position: bottom right; | ||
| background-repeat: no-repeat; | ||
| } | ||
| .main_title h1 { font-weight:700; margin-bottom:25px; } | ||
| .main_title a { } | ||
| .main_title .text_box { position:absolute; top:40%; left:0; } | ||
|
|
||
|
|
||
| /* 내용 _ section */ | ||
| .section { height: 720px; } | ||
| .section .box_inner { | ||
| display:flex; height: 100%; align-items: center; | ||
|
|
@@ -67,7 +66,7 @@ header .inner .login_btn { } | |
| font-weight: 700; | ||
| color:var(--Primary); | ||
| } | ||
| .section .box_inner .box h1 { | ||
| .section .box_inner .box h2 { | ||
| font-weight: 700; | ||
| margin-top:12px; | ||
| margin-bottom:24px; | ||
|
|
@@ -87,7 +86,7 @@ header .inner .login_btn { } | |
| .section._4 .inner { | ||
| position:relative; | ||
| height:100%; | ||
| background-image: url(/images/Img_home_bottom.png); | ||
| background-image: url(../images/Img_home_bottom.png); | ||
| background-position: bottom right; | ||
| background-repeat: no-repeat; | ||
| margin-top:138px; | ||
|
|
@@ -98,8 +97,9 @@ header .inner .login_btn { } | |
|
|
||
| } | ||
|
|
||
| /* 하단 */ | ||
| footer { | ||
| background-color: var(--Secondary_900); | ||
| background-color: var(--Cool_Gray_900); | ||
| } | ||
| footer .inner { | ||
| position:relative; | ||
|
|
@@ -109,7 +109,7 @@ footer .inner { | |
| padding:32px 0 108px; | ||
| } | ||
| footer .inner .left { | ||
| color:var(--Secondary_400); | ||
| color:var(--Cool_Gray_400); | ||
| } | ||
|
|
||
| footer .inner .center { | ||
|
|
@@ -118,7 +118,7 @@ footer .inner .center { | |
| } | ||
|
|
||
| footer .inner .center a { | ||
| color:var(--Secondary_400); | ||
| color:var(--Cool_Gray_400); | ||
| } | ||
|
|
||
| footer .inner .right { | ||
|
|
@@ -150,23 +150,23 @@ footer .inner .right img { | |
| } | ||
| @media (max-width: 780px) { | ||
|
|
||
| .font_1 { font-size:1.3rem; } | ||
| .font_2 { font-size:1em; } | ||
| .font_3 { font-size:0.8rem; } | ||
| .font_1 { font-size:1.8rem; } | ||
| .font_2 { font-size:1.2em; } | ||
| .font_3 { font-size:1.3rem; } | ||
| .section._4 .inner, .main_title .inner { background-size: contain; } | ||
|
|
||
| .section { height:auto; } | ||
| .section .box_inner { padding:100px 0; } | ||
| .section .box_inner { padding:100px 0 0; height:auto;} | ||
| .section .box_inner .box { flex-direction:column; width:100%; gap: 10px; align-items: stretch; } | ||
| .section .box_inner .box > div { padding: 0 0 24px; } | ||
| .section .box_inner .box > div h1 { margin-top: 12px; margin-bottom: 12px; } | ||
| .section .box_inner .box > div h2 { margin-top: 12px; margin-bottom: 12px; } | ||
| .section .box_inner .box > div br { display:none; } | ||
| .section .box_inner .box img { width:100%; } | ||
| } | ||
|
|
||
| @media (max-width: 375px){ | ||
| a.btn._a { padding: 16px 44px; } | ||
| a.btn._roundedM { padding: 16px 44px; } | ||
| header .inner .logo_top img:first-child { display:none; } | ||
| footer .inner .left { position: absolute; top:65px; } | ||
| .section { height:500px; } | ||
| .section .box_inner { padding:50px 0 0;} | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
|
|
||
|
|
||
|
|
||
| /* 로그인 페이지 */ | ||
|
|
||
| #login { min-height: 100vh; display: flex; align-items: center; } | ||
| .login_wrap { width:95%; max-width:640px; margin:0 auto; text-align: center; } | ||
| .login_wrap .logo { margin-bottom:55px; } | ||
| .login_wrap .logo a { } | ||
| .login_wrap .logo a img { vertical-align: middle; } | ||
| .login_wrap .logo a img:first-child { height:100px; margin-right:22px; } | ||
| .login_wrap .logo a img:last-child { height:50px; } | ||
|
|
||
| .login_wrap .login_box { text-align: left; } | ||
| .login_wrap .login_box label { display:block; font-weight:700; font-size:18px; margin-bottom:16px; } | ||
| .login_wrap .login_box input[type='email'], | ||
| .login_wrap .login_box input[type='password'], | ||
| .login_wrap .login_box input[type='text'] { | ||
| display:block; width:100%; margin-bottom:24px; | ||
| padding:15px 24px; background-color: var(--Cool_Gray_100); | ||
| border-radius: 12px; border:0; | ||
| } | ||
|
|
||
| .login_wrap .login_box input[type='password']{ | ||
| background-image : url('../images/Variant202.png'); | ||
| background-position: center right 20px; | ||
| background-repeat: no-repeat; | ||
| cursor: pointer; | ||
| } | ||
| .login_wrap .login_box input[type='password'].active { | ||
| background-image : url('../images/Default01.png'); | ||
| } | ||
| .login_wrap .login_box input[type='submit'] { | ||
| display:block; width:100%; | ||
| border-radius: 9999px; | ||
| padding:12px 0; color: var(--Cool_Gray_100); | ||
| font-size:20px; font-weight:600; line-height:32px; | ||
| background-color: var(--Primary); border:0; cursor: pointer; | ||
| } | ||
| .login_wrap .login_box input[type='submit']:disabled { background-color: #9CA3AF; } | ||
|
|
||
| .login_wrap .sns_login { | ||
| background-color: #E6F2FF; color:#1F2937; | ||
| padding:14px 23px; margin-top:24px; margin-bottom:24px; border-radius: 8px; | ||
| display:flex; | ||
| align-items: center; | ||
| justify-content: space-between; | ||
| } | ||
| .login_wrap .sns_icon { } | ||
| .login_wrap .sns_icon a { display:inline-block; margin-left:8px; } | ||
| .login_wrap .sns_icon a img { height: 42px; width:42px; } | ||
|
|
||
| .login_wrap .member_sub_box { } | ||
| .login_wrap .member_sub_box span { font-size:14px; } | ||
| .login_wrap .member_sub_box span a { } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,30 @@ | ||
|
|
||
| :root { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 변수를 정의해주셨군요 👍 |
||
| --Secondary: #374151; | ||
| --Secondary_200:#E5E7EB; | ||
|
|
||
|
|
||
| --Primary: #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_200:#E5E7EB; | ||
| --Cool_Gray_100:#F3F4F6; | ||
| --Cool_Gray_50:#F9FAFB; | ||
| } | ||
|
|
||
|
|
||
| .btn { background-color: #3692FF; color:#fff; } | ||
| .btn:hover { background-color: #1967D6; color:#fff; } | ||
| .btn:active { background-color: #1251AA; color:#fff; } | ||
| .btn.n_act { background-color: #9CA3AF; color:#fff; } | ||
|
|
||
| .btn._a { display:inline-block; padding:16px 124px; border-radius: 50px; } | ||
| .btn._b { display:inline-block; padding:12px 20px; border-radius: 8px; } | ||
| .btn._roundedM { display:inline-block; padding:16px 124px; border-radius: 50px; } | ||
| .btn._roundedS { display:inline-block; padding:12px 20px; border-radius: 8px; } | ||
|
|
||
| .font_1 { font-size:40px; } | ||
| .font_2 { font-size:24px; } | ||
| .font_3 { font-size:18px; } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
해당 css파일은 이제 공통으로 사용되기 어려울 거 같습니다! 헤더나, 섹션, 푸터 모두 랜딩 페이지에만 적용되는 것들이고 다른 페이지에는 불필요한 스타일들이죠!
layout.css는 랜딩 페이지 스타일로 두고, 공통 부분을 따로 빼시는 것도 좋을 거 같아요 :)