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

[Feature] #58 Mobile Wrapper 추가 #59

Merged
merged 2 commits into from
Nov 21, 2024
Merged

[Feature] #58 Mobile Wrapper 추가 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0641e97
🎨Design: Mobile Wrapper 추가
ruehan Nov 21, 2024
811e94f
🐛Fix: 폰트 변경
ruehan Nov 21, 2024
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
27 changes: 25 additions & 2 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import GlobalStyle from '@/styles/globalStyle'
import { lightTheme, darkTheme } from '@/styles/theme'
import { useState } from 'react'
import { RouterProvider } from 'react-router-dom'
import { ThemeProvider } from 'styled-components'
import styled, { ThemeProvider } from 'styled-components'
import { Helmet, HelmetProvider } from 'react-helmet-async'

function App() {
Expand All @@ -24,7 +24,9 @@ function App() {
Toggle Theme
</button>
<GlobalStyle />
<RouterProvider router={router} />
<MobileWrapper>
<RouterProvider router={router} />
</MobileWrapper>
<PWABadge />
</ThemeProvider>
</HelmetProvider>
Expand All @@ -33,3 +35,24 @@ function App() {
}

export default App

const MobileWrapper = styled.div`
font-family: 'SUIT', sans-serif;
display: flex;
flex-direction: column;
justify-content: space-between;
width: 100%;
color: ${({ theme }) => theme.colors.grayscale.font_1}; /* 기본 텍스트 색상 (Font_1) */
background-color: ${({ theme }) => theme.colors.brand.lighten_3}; /* 배경색 (GC_4) */
min-width: 340px;
max-width: 430px;
min-height: calc(var(--vh, 1vh) * 100);
margin: auto;
position: relative;
-ms-overflow-style: none;
scrollbar-width: none;

&::-webkit-scrollbar {
display: none;
}
`
2 changes: 0 additions & 2 deletions src/styles/globalStyle.ts
View file
Open in desktop
ruehan marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ const GlobalStyle = createGlobalStyle`
font-family: 'SUIT', sans-serif; /* SUIT 폰트 적용 */
line-height: 1.5;
letter-spacing: -0.025em;
color: ${({ theme }) => theme.colors.grayscale.font_1}; /* 기본 텍스트 색상 (Font_1) */
background-color: ${({ theme }) => theme.colors.brand.lighten_3}; /* 배경색 (GC_4) */
}

/* 버튼 스타일 */
Expand Down
Loading