Skip to content

Commit dea771d

Browse files
authored
Merge pull request #189 from D3vPals/feat/#187
fix: emptyLoadingPage styled-component props $추가, 미디어쿼리 경고로 인한 screen…
2 parents 4007e34 + d72824e commit dea771d

File tree

20 files changed

+125
-66
lines changed

20 files changed

+125
-66
lines changed

package-lock.json

Lines changed: 62 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"react-textarea-autosize": "^8.5.7",
3030
"sanitize.css": "^13.0.0",
3131
"styled-components": "^6.1.13",
32-
"vite-plugin-compression": "^0.5.1",
3332
"zod": "^3.24.1",
3433
"zustand": "^5.0.2"
3534
},
@@ -67,6 +66,7 @@
6766
"typescript": "~5.6.2",
6867
"typescript-eslint": "^8.18.2",
6968
"vite": "^6.0.5",
69+
"vite-plugin-compression": "^0.5.1",
7070
"vitest": "^2.1.8"
7171
},
7272
"eslintConfig": {

src/components/common/emptyLoadingPage/EmptyLoadingPage.styled.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ export const Container = styled.div<EmptyLoadingPageProps>`
55
width: 100%;
66
height: ${({ height }) => height};
77
8-
@media screen ${({ theme }) => theme.mediaQuery.tablet} {
9-
height: ${({ tHeight }) => tHeight};
8+
@media ${({ theme }) => theme.mediaQuery.tablet} {
9+
height: ${({ $tHeight }) => $tHeight};
1010
}
1111
12-
@media screen ${({ theme }) => theme.mediaQuery.mobile} {
13-
height: ${({ mHeight }) => mHeight};
12+
@media ${({ theme }) => theme.mediaQuery.mobile} {
13+
height: ${({ $mHeight }) => $mHeight};
1414
}
1515
`;

src/components/common/emptyLoadingPage/EmptyLoadingPage.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import * as S from './EmptyLoadingPage.styled';
22

33
export interface EmptyLoadingPageProps {
44
height: string;
5-
tHeight: string;
6-
mHeight: string;
5+
$tHeight: string;
6+
$mHeight: string;
77
}
88

99
export default function EmptyLoadingPage({
1010
height,
11-
tHeight,
12-
mHeight,
11+
$tHeight,
12+
$mHeight,
1313
}: EmptyLoadingPageProps) {
1414
return (
1515
<S.Container
1616
height={height}
17-
tHeight={tHeight}
18-
mHeight={mHeight}
17+
$tHeight={$tHeight}
18+
$mHeight={$mHeight}
1919
></S.Container>
2020
);
2121
}

src/components/common/layout/Layout.styled.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ export const LayoutContainer = styled.div`
66
max-width: ${({ theme }) => theme.layout.width.desktop};
77
padding: 0 120px;
88
9-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
9+
@media ${({ theme }) => theme.mediaQuery.tablet} {
1010
padding: 0 60px;
1111
}
1212
13-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
13+
@media ${({ theme }) => theme.mediaQuery.mobile} {
1414
padding: 0;
1515
}
1616
`;

src/components/common/noResultPage/NoResultPage.styled.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const Container = styled.div<Pick<NoResultPageProps, 'height'>>`
88
justify-content: center;
99
align-items: center;
1010
11-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
11+
@media ${({ theme }) => theme.mediaQuery.mobile} {
1212
height: ${({ height }) => `calc(${height}*0.5)`};
1313
}
1414
`;
@@ -25,7 +25,7 @@ export const Wrapper = styled.div`
2525
export const Title = styled.span`
2626
font-size: 1.5rem;
2727
28-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
28+
@media ${({ theme }) => theme.mediaQuery.mobile} {
2929
font-size: 1rem;
3030
}
3131
`;

src/components/common/skillTagBox/SkillTagBox.styled.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ export const Container = styled.div<Pick<SkillTagBoxProps, 'width'>>`
88
background-color: ${({ theme }) => theme.color.white};
99
padding: 2rem;
1010
11-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
11+
@media ${({ theme }) => theme.mediaQuery.tablet} {
1212
padding: 1.5rem;
1313
}
1414
15-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
15+
@media ${({ theme }) => theme.mediaQuery.mobile} {
1616
border-radius: ${({ theme }) => theme.borderRadius.primary};
1717
padding: 1rem;
1818
}
@@ -55,7 +55,7 @@ export const ResetButton = styled.button`
5555
transition: all 100ms ease-in;
5656
}
5757
58-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
58+
@media ${({ theme }) => theme.mediaQuery.tablet} {
5959
padding: 0.4rem;
6060
gap: 0.4rem;
6161
svg {
@@ -67,7 +67,7 @@ export const ResetButton = styled.button`
6767
}
6868
}
6969
70-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
70+
@media ${({ theme }) => theme.mediaQuery.mobile} {
7171
padding: 0.2rem;
7272
gap: 0.2rem;
7373
svg {
@@ -79,11 +79,11 @@ export const ResetButton = styled.button`
7979
export const ResetSpan = styled.span`
8080
font-size: 1rem;
8181
82-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
82+
@media ${({ theme }) => theme.mediaQuery.tablet} {
8383
font-size: 0.9rem;
8484
}
8585
86-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
86+
@media ${({ theme }) => theme.mediaQuery.mobile} {
8787
font-size: 0.7rem;
8888
}
8989
`;

src/components/common/skillTagBox/skillTag/SkillTag.styled.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const Wrapper = styled.div<{ $select: boolean }>`
2121
transition: all 100ms ease-in-out;
2222
}
2323
24-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
24+
@media ${({ theme }) => theme.mediaQuery.tablet} {
2525
padding: 0.4rem;
2626
gap: 0.4rem;
2727
font-size: 0.9rem;
@@ -31,7 +31,7 @@ export const Wrapper = styled.div<{ $select: boolean }>`
3131
}
3232
}
3333
34-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
34+
@media ${({ theme }) => theme.mediaQuery.mobile} {
3535
padding: 0.2rem;
3636
gap: 0.2rem;
3737
font-size: 0.8rem;

src/components/common/skillTagBox/skillTag/skillTagImg/SkillTagImg.styled.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ export const SkillImg = styled.img<Pick<SkillTagImgProps, '$select'>>`
1212
border: 1px solid
1313
${({ theme, $select }) => ($select ? 'none' : theme.color.border)};
1414
15-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
15+
@media ${({ theme }) => theme.mediaQuery.tablet} {
1616
width: 2rem;
1717
}
1818
19-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
19+
@media ${({ theme }) => theme.mediaQuery.mobile} {
2020
width: 1.5rem;
2121
}
2222
`;

src/components/home/projectCardLists/ProjectCardLists.styled.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ export const CardListTitleWrapper = styled.div``;
99
export const CardListTitle = styled.h1`
1010
padding: 6rem 0 2rem 0;
1111
12-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
12+
@media ${({ theme }) => theme.mediaQuery.tablet} {
1313
padding: 4rem 0 2rem 0;
1414
}
1515
16-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
16+
@media ${({ theme }) => theme.mediaQuery.mobile} {
1717
padding: 2rem 0 2rem 0;
1818
font-size: 1.5rem;
1919
}
@@ -32,13 +32,13 @@ export const Wrapper = styled.div<{ $flex: boolean }>`
3232
width: 100%;
3333
}
3434
35-
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
35+
@media ${({ theme }) => theme.mediaQuery.tablet} {
3636
grid-template-columns: ${({ $flex }) =>
3737
$flex ? '' : 'repeat(auto-fit, minmax(40%, 1fr))'};
3838
gap: 2rem;
3939
}
4040
41-
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
41+
@media ${({ theme }) => theme.mediaQuery.mobile} {
4242
width: 100%;
4343
grid-template-columns: ${({ $flex }) =>
4444
$flex ? '' : 'repeat(auto-fit, minmax(50%, 1fr))'};

0 commit comments

Comments
 (0)