Skip to content

Commit

Permalink
feat: add more transition animation, fix some designs
Browse files Browse the repository at this point in the history
  • Loading branch information
KRimwoo committed Feb 13, 2024
1 parent 7b7e11b commit 404d1ce
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 4 deletions.
7 changes: 7 additions & 0 deletions src/app/about/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

const Template = ({ children }: { children: React.ReactNode }) => {
return <div className="layout-container">{children}</div>
}

export default Template
7 changes: 7 additions & 0 deletions src/app/my-page/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

const Template = ({ children }: { children: React.ReactNode }) => {
return <div className="layout-container">{children}</div>
}

export default Template
1 change: 1 addition & 0 deletions src/app/panel/MuiThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ const MuiThemeProvider = ({ children }: { children: React.ReactNode }) => {
padding: '0px',
borderRadius: '4px',
height: 'auto',
minHeight: '32px',
backgroundColor: theme.palette.background.tertiary,
color: theme.palette.text.normal,
lineHeight: '150%',
Expand Down
6 changes: 5 additions & 1 deletion src/app/signup/panel/PasswordField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ const PasswordField = ({
showPassword={showPassword}
setShowPassword={setShowPassword}
/>
<IconButton onClick={deletePassword} size="small">
<IconButton
onClick={deletePassword}
size="small"
sx={{ paddingY: 0 }}
>
<HighlightOffIcon sx={{ color: 'text.alternative' }} />
</IconButton>
</>
Expand Down
2 changes: 2 additions & 0 deletions src/app/team-list/panel/TeamsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ const TeamsList = ({ prop }: { prop: ITeamInfo[] }) => {
sx={{ p: '0.25rem' }}
height={'75vh'}
flex={'2rem'}
className="layout-container"
key={showTeams}
>
<Stack direction={'row'}>
<Typography fontWeight={'bold'} my={'1rem'}>
Expand Down
1 change: 1 addition & 0 deletions src/app/teams/[id]/board/@setting/page.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ export const mobilePage = {
export const inputContainer = {
background: (theme: Theme) => theme.palette.background.tertiary,
padding: '0rem 0.75rem',
alignItems: 'center',
}
8 changes: 6 additions & 2 deletions src/app/teams/[id]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Stack, Container, Box, useMediaQuery } from '@mui/material'
import useTeamPageState from '@/states/useTeamPageState'
import TeamSidebar from './panel/NavBar'
import * as style from '@/components/NavBarLayout.style'
import useMedia from '@/hook/useMedia'

const TeamLayout = ({
params,
Expand All @@ -24,7 +25,8 @@ const TeamLayout = ({
}, [])

const isFourRow = useMediaQuery('(min-width:997px)')

const { isPc } = useMedia()

if (layout === 'FULLPAGE') {
return (
<Container sx={style.container}>
Expand All @@ -42,7 +44,9 @@ const TeamLayout = ({
sx={style.stack}
>
<TeamSidebar id={id} />
<Box sx={style.contentBox}>{children}</Box>
<Box sx={{ ...style.contentBox, width: isPc ? undefined : '100%' }}>
{children}
</Box>
</Stack>
</Container>
)
Expand Down
7 changes: 7 additions & 0 deletions src/app/teams/template.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

const Template = ({ children }: { children: React.ReactNode }) => {
return <div className="layout-container">{children}</div>
}

export default Template
1 change: 1 addition & 0 deletions src/components/EyeIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const EyeIcon = ({
onClick={() => {
setShowPassword(showPassword === 'password' ? 'text' : 'password')
}}
sx={{ paddingY: 0 }}
>
{showPassword === 'password' ? (
<VisibilityIcon sx={{ color: 'text.alternative' }} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/ListPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const ListPageContainer = ({ children }: IChildrenProps) => {
const { isPc } = useMedia()
return (
<Stack
sx={{ ...style.ListPageContainer, padding: isPc ? '2rem' : '0' }}
sx={{ ...style.ListPageContainer, padding: isPc ? '2rem' : '1rem' }}
spacing={'2rem'}
>
{children}
Expand Down

0 comments on commit 404d1ce

Please sign in to comment.