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.

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

style: header zindex #109

Merged
merged 1 commit into from
Oct 24, 2023
Merged

style: header zindex #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/components/common/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const LogoWrapper = styled.header`
position: fixed;
top: 0px;
background: ${COLOR.WHITE};
z-index: 1;
z-index: 0.5;
`;

export default Header;
2 changes: 2 additions & 0 deletions src/components/common/HeaderWithButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ const LogoWrapper = styled.header`
padding: 1rem 12rem;
background: ${COLOR.WHITE};
z-index: 1;
position: fixed;
top: 0px;
`;

const IconButton = styled.button`
Expand Down
25 changes: 15 additions & 10 deletions src/components/provider/ProviderGiftList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import React, { useEffect, useState } from "react";
import { useState } from "react";
import List from "components/common/List";
import { GiftList } from "types/giftList.type";
import EditGiftModal from "./EditGiftModal";
// import giftList from "data/giftData";
import { useParams } from "react-router-dom";
import useGift from "hooks/queries/useGift";
import styled from "styled-components";

export default function ProviderGiftList() {
const { targetId } = useParams();
Expand All @@ -27,13 +26,15 @@ export default function ProviderGiftList() {
return (
<>
{data && (
<List
giftList={data.giftList}
couponList={data.couponList}
type="editable"
onClickClose={handleDelete}
onClickEdit={handleEdit}
/>
<ListWrapper>
<List
giftList={data.giftList}
couponList={data.couponList}
type="editable"
onClickClose={handleDelete}
onClickEdit={handleEdit}
/>
</ListWrapper>
)}
{data && editedGiftId && (
<EditGiftModal
Expand All @@ -45,3 +46,7 @@ export default function ProviderGiftList() {
</>
);
}

const ListWrapper = styled.div`
padding-bottom: 20rem;
`;