Skip to content

Commit a67ef77

Browse files
authored
Merge pull request #60 from Keywordream-PDA/feature/info
뒤로 가기 버튼 추가, footer 아이콘 교체
2 parents e75702a + 9439846 commit a67ef77

File tree

9 files changed

+37
-17
lines changed

9 files changed

+37
-17
lines changed

public/back.png

2.84 KB
Loading

public/bluehouse.png

-104 KB
Binary file not shown.

public/favorite.png

1.41 KB
Loading

public/house.png

1.93 KB
Loading

public/treasure_box.png

-14.4 KB
Binary file not shown.

src/components/Footer.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.footer-copyright-text {
22
color: #6c6c6c !important;
33
text-decoration: none;
4-
54
}
65

76
.footer-navbar {

src/components/Footer.jsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,28 @@ const Footer = () => {
1212
>
1313
<Container>
1414
<Navbar.Text className="footer-copyright-text">
15-
<Link to="/search">
15+
16+
<Link to="#" onClick={() => window.history.back()}>
1617
{" "}
1718
<img
18-
src={process.env.PUBLIC_URL + "/search.png"}
19-
alt="search glass"
19+
src={process.env.PUBLIC_URL + "/back.png"}
20+
alt="back"
2021
className="footer-icon"
2122
/>
2223
</Link>
2324
<Link to="/main">
2425
{" "}
2526
<img
26-
src={process.env.PUBLIC_URL + "/bluehouse.png"}
27-
alt="Blue House"
27+
src={process.env.PUBLIC_URL + "/house.png"}
28+
alt="House"
2829
className="footer-icon"
2930
/>
3031
</Link>
3132
<Link to="/mypage">
3233
{" "}
3334
<img
34-
src={process.env.PUBLIC_URL + "/treasure_box.png"}
35-
alt="treasure box"
35+
src={process.env.PUBLIC_URL + "/favorite.png"}
36+
alt="userFavorite"
3637
className="footer-icon"
3738
/>
3839
</Link>

src/components/Header.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.header-icon {
2+
width: 1.5rem;
3+
margin-top: 2rem;
4+
/* 이미지 간의 간격을 조정합니다. */
5+
}
6+
.header-title {
7+
display: flex;
8+
justify-content: space-between;
9+
}

src/components/Header.jsx

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,26 @@ const Header = () => {
1111
fixed="top"
1212
style={{ height: "8%", padding: "2vh 4vh", backgroundColor: "white" }}
1313
>
14-
<Link to="/">
15-
<img
16-
src={logo}
17-
width="160px"
18-
className="logo-img"
19-
alt="Keywordream logo"
20-
style={{ marginTop: "15px", paddingLeft: "0vh" }}
21-
/>
22-
</Link>
14+
<div className="header-title">
15+
<Link to="/">
16+
<img
17+
src={logo}
18+
width="160px"
19+
className="logo-img"
20+
alt="Keywordream logo"
21+
style={{ marginTop: "2rem", paddingLeft: "0vh" }}
22+
/>
23+
</Link>
24+
25+
<Link to="/search">
26+
{" "}
27+
<img
28+
src={process.env.PUBLIC_URL + "/search.png"}
29+
alt="search glass"
30+
className="header-icon"
31+
/>
32+
</Link>
33+
</div>
2334
<Container></Container>
2435
</Navbar>
2536
);

0 commit comments

Comments
 (0)