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

merge to main #120

Merged
merged 11 commits into from
Nov 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
design: 헤더 수정
  • Loading branch information
yarimu committed Nov 29, 2024
commit 1e6a98f05ee2d8d6ea6d18f1f54f3de02be88095
1 change: 1 addition & 0 deletions src/components/header/orderHeader/OrderHeaderStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Theme, css } from '@emotion/react';

export const headerStyle = (theme: Theme) => css`
display: flex;
gap: 1.6rem;
align-items: center;
justify-content: space-between;
width: 100%;
Expand Down
76 changes: 39 additions & 37 deletions src/components/header/productHeader/ProductHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,48 +71,50 @@ const ProductHeader = () => {

{/* 유틸리티 섹션 */}
{/* 앱 다운로드 */}
<section css={appLogLayout} aria-labelledby="app-download">
<IcQrcodeWhite24 />
<div css={textContainer}>
<p css={fontEnAppStyle}>AliExpress</p>
<p css={fontMStyle}>앱 다운로드</p>
</div>
</section>

{/* 국가 및 통화 */}
<section css={flagLayout} aria-labelledby="language-currency">
<ImgFlagKorL />
<div css={flagContainer}>
<div>
<section css={appLogLayout} aria-labelledby="app-download">
<IcQrcodeWhite24 />
<div css={textContainer}>
<p css={fontEnAppStyle}>KO/</p>
<p css={fontKRWStyle}>KRW</p>
<p css={fontEnAppStyle}>AliExpress</p>
<p css={fontMStyle}>앱 다운로드</p>
</div>
<IcArrowbottomSWhite12 css={arrowStyle} />
</div>
</section>
</section>

{/* 사용자 계정 */}
<section css={[appLogLayout, relativeStyle]} aria-labelledby="user-account" onClick={() => togglePopup('info')}>
<IcUserWhite24 />
<div css={flagContainer}>
<div css={textContainer}>
<p css={fontMStyle}>환영합니다!/</p>
<p css={fontBStyle}>로그인/회원가입</p>
{/* 국가 및 통화 */}
<section css={flagLayout} aria-labelledby="language-currency">
<ImgFlagKorL />
<div css={flagContainer}>
<div css={textContainer}>
<p css={fontEnAppStyle}>KO/</p>
<p css={fontKRWStyle}>KRW</p>
</div>
<IcArrowbottomSWhite12 css={arrowStyle} />
</div>
<IcArrowbottomSWhite12 css={arrowStyle} />
</div>
{/* 카테고리 팝업 */}
{activePopup === 'info' && <MyList />}
</section>
</section>

{/* 장바구니 */}
<section css={cartLayout} aria-labelledby="cart">
<IcCartWhite24 />
<div css={textContainer}>
<p css={[fontKRWStyle, numBackStyle]}>0</p>
<p css={fontMStyle}>장바구니</p>
</div>
</section>
{/* 사용자 계정 */}
<section css={[appLogLayout, relativeStyle]} aria-labelledby="user-account" onClick={() => togglePopup('info')}>
<IcUserWhite24 />
<div css={flagContainer}>
<div css={textContainer}>
<p css={fontMStyle}>환영합니다!/</p>
<p css={fontBStyle}>로그인/회원가입</p>
</div>
<IcArrowbottomSWhite12 css={arrowStyle} />
</div>
{/* 카테고리 팝업 */}
{activePopup === 'info' && <MyList />}
</section>

{/* 장바구니 */}
<section css={cartLayout} aria-labelledby="cart">
<IcCartWhite24 />
<div css={textContainer}>
<p css={[fontKRWStyle, numBackStyle]}>0</p>
<p css={fontMStyle}>장바구니</p>
</div>
</section>
</div>
</header>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/header/productHeader/ProductHeaderStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ export const relativeStyle = css`
export const headerStyle = (theme: Theme) => css`
display: flex;
gap: 1.6rem;
justify-content: space-between;
justify-content: center;
width: 100vw;
height: 5.4rem;
padding: 0.5rem 5.6rem 0.5rem 2.6rem;
padding: 0.5rem 5.6rem;

background-color: ${theme.colors.gray10};

Expand Down