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

[FE] Fix/ 머지 후 충돌 해결 #403

Merged
merged 1 commit into from
Sep 13, 2023
Merged

[FE] Fix/ 머지 후 충돌 해결 #403

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
42 changes: 10 additions & 32 deletions frontend/src/components/Layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const Layout = ({ children }: LayoutProps) => {
return (
<ToastProvider>
<ModalProvider>
<NavbarHighlightsProvider>
<CoordinatesProvider>
<MarkerProvider>
<SeeTogetherProvider>
Expand Down Expand Up @@ -54,33 +53,17 @@ const Layout = ({ children }: LayoutProps) => {
overflow="auto"
padding="0 20px 20px 20px"
>
<Flex
$justifyContent="space-between"
padding="20px 20px 0 20px"
>
<Box>
<Logo />
<Space size={3} />
</Box>
</Flex>
<Flex
height="calc(100vh - 52px)"
$flexDirection="column"
overflow="auto"
padding="0 20px 20px 20px"
>
{children}
</Flex>
<Navbar $layoutWidth={width} />
</LayoutFlex>
<Map/>
</MediaWrapper>
{children}
</Flex>
<Navbar $layoutWidth={width} />
<Toast />
</TagProvider>
</SeeTogetherProvider>
</MarkerProvider>
</CoordinatesProvider>
</NavbarHighlightsProvider>
</LayoutFlex>
<Map />
</MediaWrapper>
</TagProvider>
</SeeTogetherProvider>
</MarkerProvider>
</CoordinatesProvider>
</ModalProvider>
</ToastProvider>
);
Expand All @@ -92,7 +75,6 @@ const LogoWrapper = styled.section<{
width: 372px;
display: flex;
padding: 12px 20px 0 20px;

@media (max-width: 1076px) {
${({ $layoutWidth }) =>
$layoutWidth === '372px' &&
Expand All @@ -113,7 +95,6 @@ const MediaWrapper = styled.section<{
display: flex;
width: 100vw;
overflow: hidden;

@media (max-width: 1076px) {
flex-direction: ${({ $isAddPage, $layoutWidth }) => {
if ($isAddPage) return 'column';
Expand All @@ -122,14 +103,11 @@ const MediaWrapper = styled.section<{
}
`;


const LayoutFlex = styled(Flex)<{ $layoutWidth: '372px' | '100vw' }>`
transition: all ease 0.3s;

@media (max-width: 1076px) {
height: ${({ $layoutWidth }) => $layoutWidth === '372px' && '50vh'};
transition: none;
}
`;

export default Layout;