-
Notifications
You must be signed in to change notification settings - Fork 2
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
[Noelsky-code] 메인 페이지 헤더 , 바디 UI, 호버 구현 #30
Merged
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
8cdf0fe
Feat: server express 생성
ddaynew365 6ae60ee
Feat: eslint, prettier 적용
ddaynew365 ba1a04e
Feat : 메인 페이지 헤더 유저 아이콘 UI 생성 #2
Noelsky-code f94f2a4
Feat : 메인 페이지 헤더 로고 레이아웃 #5
Noelsky-code 3503966
Fix : 메인 헤더 로고 수정 #5
Noelsky-code 587020b
Fix : 메인 헤더 유저 아이콘 수정 #2
Noelsky-code 2316dc1
Feat : MainPageBody Template 추가 #6
Noelsky-code 522a485
fix : jsx 주석 다시 추가
Noelsky-code 32105c1
feat : MainPageBody left,right 프레임 추가 #6
Noelsky-code d7f2466
fix : 메인 페이지 헤더 로고 레이아웃 css 수정 #5
Noelsky-code 1d79cb7
feat : 메인 페이지 바디 이미지 레이아웃 생성 #6
Noelsky-code f0ec2b4
feat : 메인 페이지 이미지 css before 적용 #6
Noelsky-code 87fdf68
feat : 메인 페이지 이미지 레이아웃 수정 #6
Noelsky-code dd2359e
feat : 메인 페이지 이미지 호버 - 왼쪽 구현 #11
Noelsky-code 7b9fc34
update : 메인 페이지 헤더 유저 아이콘 css 수정 #5
Noelsky-code 15cccd9
Feat : 메인 페이지 이미지 호버 이벤트 구현 #11
Noelsky-code a72fd88
[#10]Remove: typeorm 제거
ddaynew365 771210a
merge conflict
ddaynew365 48e285c
Merge pull request #31 from boostcampwm-2021/Feat/SettingServer
jin-Pro 621b43c
Revert "[Feat/setting server] 개발환경세팅"
jin-Pro e9413e3
Merge pull request #32 from boostcampwm-2021/revert-31-Feat/SettingSe…
jin-Pro ca20621
Error: merge conflict
ddaynew365 6b93c42
Feat : 메인 페이지 헤더 유저 아이콘 UI 생성 #2
Noelsky-code 3d54eeb
Feat : 메인 페이지 헤더 로고 레이아웃 #5
Noelsky-code 9409d7a
Fix : 메인 헤더 로고 수정 #5
Noelsky-code 736df4a
Fix : 메인 헤더 유저 아이콘 수정 #2
Noelsky-code 6096ff3
Feat : MainPageBody Template 추가 #6
Noelsky-code 4458371
fix : jsx 주석 다시 추가
Noelsky-code 798fc33
feat : MainPageBody left,right 프레임 추가 #6
Noelsky-code 74d975b
fix : 메인 페이지 헤더 로고 레이아웃 css 수정 #5
Noelsky-code 93206f9
feat : 메인 페이지 바디 이미지 레이아웃 생성 #6
Noelsky-code ff6e9be
feat : 메인 페이지 이미지 css before 적용 #6
Noelsky-code 741fb3c
feat : 메인 페이지 이미지 레이아웃 수정 #6
Noelsky-code 666f786
feat : 메인 페이지 이미지 호버 - 왼쪽 구현 #11
Noelsky-code 96456e4
update : 메인 페이지 헤더 유저 아이콘 css 수정 #5
Noelsky-code b58c5cb
Feat : 메인 페이지 이미지 호버 이벤트 구현 #11
Noelsky-code 90caf8f
Merge branch 'Feat/MainPage' of https://github.com/boostcampwm-2021/w…
Noelsky-code 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 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,18 +1,16 @@ | ||
/** @jsxImportSource @emotion/react */ | ||
import React from "react"; | ||
import { css } from "@emotion/react"; | ||
import logo from "../assets/Logo.svg"; | ||
|
||
const mainHeaderLogoStyle = css` | ||
font-family: Romanesco; | ||
font-style: Regular; | ||
font-size: 96px; | ||
position: relative; | ||
left: 30%; | ||
top: 40%; | ||
left: 40%; | ||
top: 70%; | ||
`; | ||
|
||
function MainHeaderLogo() { | ||
return <div css={mainHeaderLogoStyle}>CowDogTing</div>; | ||
return <img alt="mainLogo" src={logo} css={mainHeaderLogoStyle} />; | ||
} | ||
|
||
export default MainHeaderLogo; |
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.
나는 이부분에 대해서 top과 left말고 flex 정렬을 사용할것 같아