Skip to content

Commit 05d6cef

Browse files
authored
Merge pull request #33 from AcneLog/dev
dev to main [파비콘 설정 및 홈 화면 css 조절]
2 parents fa41fcd + 38e0dfe commit 05d6cef

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
5+
<link rel="icon" href="/favicon.ico" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>AcneLog</title>
88
</head>

public/favicon.ico

226 KB
Binary file not shown.

src/pages/Homepage/Home.styles.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ export const Header = styled.div`
1616
//리스트 공통
1717
export const List = styled.div`
1818
display: flex;
19-
gap: 0.55rem;
20-
overflow-x: auto;
19+
gap: 0.4rem;
2120
`;
2221
//전체보기 버튼
2322
export const PeoplesLogButton = styled.button`
@@ -35,26 +34,26 @@ export const Itm = styled.div`
3534
text-align: center;
3635
cursor: pointer;
3736
img {
38-
padding: 0.2rem;
39-
border-radius: 1rem;
37+
margin-bottom: 0.3rem;
38+
border-radius: 1.7rem;
4039
}
4140
`;
4241

4342
//피플즈로그 게시물 개수
4443
export const PostCountText = styled.p`
4544
font-size: 0.75rem;
4645
color: #737373;
47-
margin-left: -2.5rem;
48-
margin-top: -0.4rem;
46+
margin-right: 2.5rem;
47+
margin-top: -0.2rem;
48+
font-weight: normal;
4949
`;
5050

5151
export const TodaysItemItm = styled.div`
5252
font-size: 1rem;
5353
width: 100%;
5454
cursor: pointer;
5555
img {
56-
padding: 0.2rem;
57-
border-radius: 0.75rem;
56+
border-radius: 1.7rem;
5857
}
5958
margin-bottom: 6.25rem;
6059
`;

src/pages/Homepage/Home.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import useCustomNavigate from '../../hooks/useNavigate';
22
import * as S from './Home.styles';
33
import { acneImages, youtubeThumbnails, productRecommendations } from './homeDummyData';
44
import Banner from '../../assets/banner.svg';
5+
import sharp from '../../assets/img/sharpIcon.svg';
56

67
function Home() {
78
const goToPage = useCustomNavigate();
@@ -29,10 +30,10 @@ function Home() {
2930
style={{
3031
display: 'flex',
3132
alignItems: 'center',
32-
gap: '0.25rem',
33+
gap: '0.5rem',
3334
}}
3435
>
35-
<img src="src/assets/img/sharpIcon.svg" width="20%" />
36+
<img src={sharp} width="20%" />
3637
<span>{item.description}</span>
3738
</div>
3839
<S.PostCountText>게시글 10개</S.PostCountText>

0 commit comments

Comments
 (0)