diff --git a/src/components/BoxContainer/BoxContainer.tsx b/src/components/BoxContainer/BoxContainer.tsx index f5d9467..86ce601 100644 --- a/src/components/BoxContainer/BoxContainer.tsx +++ b/src/components/BoxContainer/BoxContainer.tsx @@ -1,9 +1,9 @@ import React from 'react'; import styled from "styled-components"; -const BoxContainer = (props: { children: React.ReactNode; }) => { +const BoxContainer = (props: { children: React.ReactNode, isGNB: boolean }) => { return ( - + {props.children} ); @@ -11,14 +11,14 @@ const BoxContainer = (props: { children: React.ReactNode; }) => { export default BoxContainer; -const Container = styled.div` +const Container = styled.div<{isGNB: boolean}>` display: flex; flex-direction: row; flex-wrap: wrap; width: 100%; gap: 12px; padding: 12px 16px; - max-height: 715px; + max-height: ${({ isGNB }) => isGNB ? "659px" : "715px"}; overflow: hidden; overflow-y:auto; &::-webkit-scrollbar { diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx index 521372e..ba09bd9 100644 --- a/src/pages/Home/Home.tsx +++ b/src/pages/Home/Home.tsx @@ -60,7 +60,7 @@ const Home = () => {
- + diff --git a/src/pages/Ranking/Ranking.tsx b/src/pages/Ranking/Ranking.tsx index a894cdd..e5b7cb6 100644 --- a/src/pages/Ranking/Ranking.tsx +++ b/src/pages/Ranking/Ranking.tsx @@ -37,7 +37,7 @@ const Ranking = () => { 랭킹 3일 연속 금연일 기준 - + {rank.slice(0, 3).map((obj, idx) => { const top3Order: number[] = [2, 1, 3]; diff --git a/src/pages/Record/Record.tsx b/src/pages/Record/Record.tsx index 8496128..a4b1a52 100644 --- a/src/pages/Record/Record.tsx +++ b/src/pages/Record/Record.tsx @@ -36,7 +36,7 @@ const Record = () => {
기록
- + diff --git a/src/pages/RetryForm/RetryForm.tsx b/src/pages/RetryForm/RetryForm.tsx index b3f661d..5f84492 100644 --- a/src/pages/RetryForm/RetryForm.tsx +++ b/src/pages/RetryForm/RetryForm.tsx @@ -21,7 +21,7 @@ const RetryForm = () => { 금연 재도전 { window.location.href = "/home" }} /> - +