Skip to content

chore : 로고 / 용어 수정 #174

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
cccwon2 merged 5 commits into from
Dec 16, 2024
Merged

chore : 로고 / 용어 수정 #174

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b674c7f
Merge remote-tracking branch 'origin/dev' into refactor/form
hongggyelim Dec 16, 2024
e357366
fix: 로고 수정
hongggyelim Dec 16, 2024
4b6aef6
fix: 용어 수정
hongggyelim Dec 16, 2024
a8596ac
fix: 헤더 높이 수정
hongggyelim Dec 16, 2024
074a3ba
fix: 헤더 보더 삭제
hongggyelim Dec 16, 2024
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 added public/logo.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: 8 additions & 17 deletions src/app/components/layout/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function Header() {
};
const headerStyle =
"fixed left-0 right-0 top-0 z-40 border-b border-b-line-100 bg-lime-100 -tracking-widest md:tracking-normal";
const navStyle = "mx-auto flex h-16 min-w-[327px] items-center justify-between px-6 max-w-screen-xl ";
const navStyle = "mx-auto max-h-[60px] flex h-16 min-w-[327px] items-center justify-between px-6 max-w-screen-xl ";
const menuStyle = "ml-4 flex h-16 items-center gap-4 md:ml-8 md:gap-6 lg:ml-[46px]";
const skeletonStyle = "w-16 animate-pulse bg-lime-200";
// 로딩 시간이 1초 이상일 때만 스켈레톤 UI 표시
Expand All @@ -56,14 +56,10 @@ export default function Header() {
{/* 로고와 메인 네비게이션 */}
<div className="flex items-center">
{/* 로고 스켈레톤 - 이미지로 대체*/}
<Image
src="/logo.svg"
alt="Work Root Logo"
width={200}
height={60}
className="w-32 hover:opacity-90 sm:w-40 md:w-[200px]"
/>

<div className="flex gap-[6px]">
<Image src="/logo.png" alt="Work Root" width={56} height={32} className="w-14" />
<div className="hidden items-center text-3xl font-semibold text-lime-600 md:flex">WorkRoot</div>
</div>
{/* 메뉴 스켈레톤 - 실제 메뉴와 동일한 위치에 배치 */}
<div className={menuStyle}>
<div className={cn("h-6", skeletonStyle)} />
Expand All @@ -86,14 +82,9 @@ export default function Header() {
<nav className={navStyle}>
{/* 로고와 메인 네비게이션 */}
<div className="flex items-center">
<Link href="/" className="text-xl text-white hover:text-blue-100">
<Image
src="/logo.svg"
alt="WorkRoot"
width={200}
height={60}
className="w-32 hover:opacity-90 md:w-[200px]"
/>
<Link href="/" className="flex items-center gap-[6px] text-xl">
<Image src="/logo.png" alt="Work Root" width={56} height={32} className="w-14 hover:opacity-90" />
<div className="hidden items-center text-3xl font-semibold text-lime-600 md:flex">WorkRoot</div>
</Link>

<div className={menuStyle}>
Expand Down
Loading