Skip to content

Commit 42dd49e

Browse files
authored
Merge pull request #175 from D3vPals/feat/#174
Feat/#174
2 parents 236973e + abe7dbb commit 42dd49e

File tree

7 files changed

+40
-14
lines changed

7 files changed

+40
-14
lines changed

src/components/common/header/Header.styled.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ export const HeaderContainer = styled.div`
1717
width: 70px;
1818
height: 70px;
1919
}
20+
21+
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
22+
width: 50px;
23+
height: 50px;
24+
}
2025
}
2126
2227
.panel {
@@ -67,4 +72,7 @@ export const HeaderContainer = styled.div`
6772
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
6873
padding: 10px 60px;
6974
}
75+
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
76+
padding: 10px 16px;
77+
}
7078
`;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ export const LayoutContainer = styled.div`
99
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
1010
padding: 0 60px;
1111
}
12+
13+
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
14+
padding: 0;
15+
}
1216
`;

src/components/home/projectCardLists/cardList/CardList.styled.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const Container = styled.article`
44
position: relative;
55
cursor: pointer;
66
width: 100%;
7-
min-width: 19rem;
7+
min-width: 15rem;
88
height: 22rem;
99
border: 1px solid ${({ theme }) => theme.color.border};
1010
border-radius: 2rem;

src/components/home/projectStats/ProjectStats.styled.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,23 @@ export const Container = styled.section`
66
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
77
padding: 3rem 0;
88
}
9+
10+
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
11+
padding: 2rem 0;
12+
}
913
`;
1014
export const Wrapper = styled.div`
1115
width: 100%;
1216
display: grid;
1317
grid-template-columns: repeat(auto-fill, minmax(30%, auto));
18+
justify-content: space-evenly;
1419
1520
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
16-
display: grid;
17-
grid-template-columns: repeat(auto-fill, minmax(40%, auto));
18-
padding: 0 4rem;
19-
gap: 1rem;
2021
}
2122
2223
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
24+
grid-template-columns: repeat(auto-fill, minmax(30%, auto));
25+
gap: 1rem;
2326
padding: 0;
2427
}
2528
`;

src/components/home/projectStats/projectStat/ProjectStat.styled.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ import styled from 'styled-components';
22

33
export const Container = styled.div`
44
display: flex;
5-
justify-content: center;
6-
flex: 1;
7-
padding-left: 1.25rem;
5+
padding-left: 2rem;
86
align-items: center;
97
gap: 1rem;
108
119
@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
12-
justify-content: start;
13-
padding-left: 2rem;
10+
gap: 0.5rem;
11+
}
12+
13+
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
14+
padding-left: 1rem;
15+
gap: 0.3rem;
16+
align-items: start;
1417
}
1518
`;
1619

@@ -24,7 +27,7 @@ export const Border = styled.div`
2427
}
2528
2629
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
27-
height: 2rem;
30+
width: 0.1rem;
2831
}
2932
`;
3033

src/pages/home/Home.styled.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ import styled from 'styled-components';
33
export const Container = styled.main`
44
width: 100%;
55
`;
6+
7+
export const Wrapper = styled.div`
8+
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
9+
padding: 0 20px;
10+
}
11+
`;

src/pages/home/Home.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ const Home = () => {
99
return (
1010
<S.Container>
1111
<Banner />
12-
<ProjectStats />
13-
<SearchFiltering />
14-
<ProjectCardLists />
12+
<S.Wrapper>
13+
<ProjectStats />
14+
<SearchFiltering />
15+
<ProjectCardLists />
16+
</S.Wrapper>
1517
<ReactQueryDevtools initialIsOpen={false} />
1618
</S.Container>
1719
);

0 commit comments

Comments
 (0)