Skip to content

Fix/header #89

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
hoospacekor merged 4 commits into from
Jun 27, 2023
Merged

Fix/header #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35b8941
네비게이션오류해결1차
96uoow Jun 27, 2023
3fbdd70
네비게이션오류해결2차
96uoow Jun 27, 2023
d3e113e
console지우기
96uoow Jun 27, 2023
437a334
header충돌해결
96uoow Jun 27, 2023
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
175 changes: 110 additions & 65 deletions src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ export const Header: React.FC = () => {

return (
<div className={styles.header}>
<div className={styles.inner}>
<div className={styles.headerTop}>
<div className={styles.headerTop}>
<div className={styles.inner}>
<a href="/">
<img
src="https://colley.market/web/upload/category/logo/9dec339bd19e5e585ab528ff4c0b5dad_dATXM62tzO_5_top.jpg"
Expand Down Expand Up @@ -157,69 +157,114 @@ export const Header: React.FC = () => {
</div>
</div>
</div>
<div
className={`${scrollActive ? styles['fixed'] : ''} ${
styles['navigation']
}`}>
<ul className={styles.navInner}>
<li>
<a href="/productlist">ALL</a>
</li>
<li>
<a href="/productlist?category=NEW">NEW</a>
</li>
<li>
<a href="/productlist?category=BEST">BEST</a>
</li>
<li>
<a href="/productlist?category=LIVING">
Living
<ul className={styles.dropdown}>
<li>
<a href="/">테이블</a>
</li>
<li>
<a href="/">거실화</a>
</li>
<li>
<a href="/">조명</a>
</li>
<li>
<a href="/">침구</a>
</li>
</ul>
</a>
</li>
<li>
<a href="/productlist?category=KITCHEN">
Kitchen
<ul className={styles.dropdown}>
<li>
<a href="/">컵/머그</a>
</li>
<li>
<a href="/">식기</a>
</li>
<li>
<a href="/">쟁반/접시</a>
</li>
<li>
<a href="/">주방잡화</a>
</li>
<li>
<a href="/">도마</a>
</li>
</ul>
</a>
</li>
<li>
<a href="/productlist?category=STATIONERY">Stationery</a>
</li>
<li>
<a href="/productlist?category=BABY/KIDS">Baby/Kids</a>
</li>
</ul>
</div>
</div>
<div
className={`${scrollActive ? styles['fixed'] : ''} ${
styles['navigation']
}`}>
<ul className={styles.navInner}>
<li>
<a href="/productlist">ALL</a>
</li>
<li>
<a href="/productlist?category=NEW">NEW</a>
</li>
<li>
<a href="/productlist?category=BEST">BEST</a>
</li>
<li>
<a href="/productlist?category=LIVING">
Living
<ul className={styles.dropdown}>
<li>
<div
onClick={() => {
navigate('/')
}}>
테이블
</div>
</li>
<li>
<div
onClick={() => {
navigate('/')
}}>
거실화
</div>
</li>
<li>
<div
onClick={() => {
navigate('/')
}}>
조명
</div>
</li>
<li>
<div
onClick={() => {
navigate('/')
}}>
침구
</div>
</li>
</ul>
</a>
</li>
<li>
<a href="/productlist?category=KITCHEN">
Kitchen
<ul className={styles.dropdown}>
<li>
<div
onClick={() => {
navigate('/')
}}>
컵/머그
</div>
</li>
<li>
<div
onClick={() => {
navigate('/')
}}>
식기
</div>
</li>
<li>
<div
onClick={() => {
navigate('/')
}}>
쟁반/접시
</div>
</li>
<li>
<div
onClick={() => {
navigate('/')
}}>
주방잡화
</div>
</li>
<li>
<div
onClick={() => {
navigate('/')
}}>
도마
</div>
</li>
</ul>
</a>
</li>
<li>
<a href="/productlist?category=STATIONERY">Stationery</a>
</li>
<li>
<a href="/productlist?category=BABY/KIDS">Baby/Kids</a>
</li>
</ul>
</div>
</div>
)
Expand Down
3 changes: 3 additions & 0 deletions src/styles/components/Modal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
position: fixed;
top: 0;
left: 0;
z-index:3;
}

.modal {
Expand All @@ -20,6 +21,8 @@
display: flex;
flex-direction: column;
border-radius: 10px;
position:relative;
z-index:4;

.title {
background-color: $color-black-0;
Expand Down
118 changes: 60 additions & 58 deletions src/styles/layout/header.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,31 @@
@import 'src/styles/common.scss';

.header {
margin-top: 30px;
font-family: 'Montserrat', sans-serif;
.inner {
width: 1240px;
margin: auto;
.headerTop {
display: flex;
justify-content: space-between;
.headerTop {
height: 180px;
display: flex;
justify-content: space-between;
.inner {
width: 1240px;
margin: auto;
> a {
margin-left: 540px;
position:absolute;
top:50px;
left:50%;
transform:translate(-50%,0);
.logo {
width: 162px;
height: 90px;
}
}
.loginTop {
height: 130px;
height: 80px;
display: flex;
flex-direction: column;
align-items: flex-end;
overflow: hidden;
padding-bottom:20px;
.inputBox {
display: flex;
align-items: center;
Expand Down Expand Up @@ -82,63 +86,61 @@
}
}
}
.navigation{
border-top:2px solid $color-white-ed;
border-bottom:2px solid $color-white-ed;
width:1240px;
}
.navigation{
border-top:2px solid $color-white-ed;
border-bottom:2px solid $color-white-ed;
background-color: $color-primary;
width:100%;
height:60px;
position:relative;
z-index:2;
&.fixed{
position:fixed;
top:0;
}
.navInner{
max-width:1240px;
height:60px;
&.fixed{
position:fixed;
top:0;
z-index:10;
}
.navInner{
background-color: white;
line-height:20px;
height:20px;
display:flex;
justify-content: space-evenly;
font-weight:800;
padding:20px 100px;
>li{
width:130px;
text-align: center;
>a{
text-decoration: none;
color: $color-black-0;
.dropdown{
display:none;
width:130px;
margin-top:20px;
margin:auto;
background-color: white;
line-height:20px;
height:20px;
display:flex;
justify-content: space-evenly;
font-weight:800;
padding:20px 100px;
>li{
width:130px;
text-align: center;
height:40px;
>a{
text-decoration: none;
color: $color-black-0;
.dropdown{
display:none;
width:130px;
margin-top:20px;
border:1px solid $color-white-ed;
z-index: 10;
li{
height:35px;
background-color:$color-primary;
border:1px solid $color-white-ed;
z-index: 10;
li{
height:25px;
padding:5px;
background-color:$color-primary;
border:1px solid $color-white-ed;
text-align: center;
line-height:20px;
a{
font-size:13px;
text-decoration: none;
color:$color-black-0;
line-height:25px;
}
text-align: center;
line-height:35px;
div{
font-size:13px;
&:hover{
display:block;
background-color: $color-white-ed;
}
}
}
}
&:hover .dropdown{
display:block;
}
}
}
a{
text-decoration: none;
color: $color-black-0;
&:hover .dropdown{
display:block;
}
}
}
}
Expand Down