Skip to content

Commit

Permalink
style: 화면 최대 너비, 최소 높이 관련 스타일링
Browse files Browse the repository at this point in the history
  • Loading branch information
Arooming committed Jan 9, 2024
1 parent 3fe2fe4 commit f455d38
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 7 deletions.
21 changes: 15 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Global, ThemeProvider } from '@emotion/react';
import styled from '@emotion/styled';
import { QueryClient, QueryClientProvider } from 'react-query';

import Router from './Router';
Expand All @@ -9,13 +10,21 @@ const queryClient = new QueryClient();

function App() {
return (
<QueryClientProvider client={queryClient}>
<ThemeProvider theme={theme}>
<Global styles={gStyle} />
<Router />
</ThemeProvider>
</QueryClientProvider>
<Wrapper>
<QueryClientProvider client={queryClient}>
<ThemeProvider theme={theme}>
<Global styles={gStyle} />
<Router />
</ThemeProvider>
</QueryClientProvider>
</Wrapper>
);
}

const Wrapper = styled.div`
border: none;
background-color: '#F5F5F5';
min-height: calc(var(--vh, 1vh) * 100);
`;

export default App;
10 changes: 9 additions & 1 deletion src/styles/GlobalStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,18 @@ const gStyle = css`
#root, body, html {
max-width: 43rem;
margin: 0 auto;
-ms-overflow-style: none; /* 인터넷 익스플로러 */
scrollbar-width: none; /* 파이어폭스 */
}
#root::-webkit-scrollbar {
display: none; /* 크롬, 사파리, 오페라, 엣지 */
}
* {
max-width: 43rem;
box-sizing: border-box;
}
Expand Down Expand Up @@ -214,7 +222,7 @@ const gStyle = css`
}
@font-face {
font-family: 'Pretendard';
font-family: Pretendard;
src: url('https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.css');
}
`;
Expand Down

0 comments on commit f455d38

Please sign in to comment.