diff --git a/client/src/component/Header.js b/client/src/component/Header.js
index f159d757c..e9b58dd40 100644
--- a/client/src/component/Header.js
+++ b/client/src/component/Header.js
@@ -7,6 +7,10 @@ import { useState } from 'react';
import UserMenu from './UserMenu';
import styled from 'styled-components';
+const Li = styled.li`
+ font-size: 1.2rem;
+`;
+
function Header() {
// const test = useSelector((state) => state);
@@ -31,7 +35,7 @@ function Header() {
src={logo}
alt="logo "
className="header-logo"
- style={{ minWidth: '150px' }}
+ style={{ minWidth: '200px' }}
/>
@@ -40,19 +44,19 @@ function Header() {
to="/main"
style={{ color: 'inherit', textDecoration: 'inherit' }}
>
-
메인페이지
+ 메인페이지
- 무료 정보 게시판
+ 무료 정보 게시판
- 유료 정보 게시판
+ 유료 정보 게시판
diff --git a/client/src/component/Search.js b/client/src/component/Search.js
index fe51dfab3..77d3a24be 100644
--- a/client/src/component/Search.js
+++ b/client/src/component/Search.js
@@ -28,8 +28,11 @@ export const InputContainer = styled.div`
box-shadow: ${boxShadow};
}
> select {
- font-size: 1rem;
+ font-size: 1.2rem;
+ /* padding: 7px 5px; */
flex: 1;
+ border-radius: 5px;
+ height: 30px;
}
> span {
border: 1px solid purple;
@@ -40,8 +43,10 @@ export const InputContainer = styled.div`
justify-content: center;
align-items: center;
> input {
- font-size: 1rem;
+ font-size: 1.3rem;
flex: 1;
+ padding: 5px;
+ border: 0;
}
> #delete-button {
font-size: 1.3rem;
diff --git a/client/src/component/UserMenu.js b/client/src/component/UserMenu.js
index 97cc94c4d..caa842d58 100644
--- a/client/src/component/UserMenu.js
+++ b/client/src/component/UserMenu.js
@@ -94,13 +94,24 @@ function UserMenu() {
-
로그인
-
-
+
회원가입
diff --git a/client/src/fonts/fonts.js b/client/src/fonts/fonts.js
index 92560a2e5..9599b6d03 100644
--- a/client/src/fonts/fonts.js
+++ b/client/src/fonts/fonts.js
@@ -1,6 +1,12 @@
import { createGlobalStyle } from 'styled-components';
import EliceDigitalCodingRegular from './EliceDigitalCoding_Regular.woff';
import EliceDigitalCodingBold from './EliceDigitalCoding_Bold.woff';
+import 다이어리 from './다이어리.woff';
+import 강원도Bold from './강원도Bold.woff';
+import 강원도Light from './강원도Light.woff';
+import gang2 from './gang2.woff';
+import 순천B from './순천B.woff';
+import 순천R from './순천R.woff';
export default createGlobalStyle`
@font-face {
@@ -19,5 +25,51 @@ export default createGlobalStyle`
font-style: normal;
}
-
+ @font-face {
+ font-family: '다이어리';
+ src: local('다이어리'),
+ url(${다이어리}) format('woff');
+ font-weight: 300;
+ font-style: normal;
+ }
+
+ @font-face {
+ font-family: '강원도Bold';
+ src: local('강원도Bold'),
+ url(${강원도Bold}) format('woff');
+ font-weight: 300;
+ font-style: normal;
+ }
+
+ @font-face {
+ font-family: 'gang2';
+ src: local('gang2'),
+ url(${gang2}) format('woff');
+ font-weight: 300;
+ font-style: normal;
+ }
+
+ @font-face {
+ font-family: '강원도Light';
+ src: local('강원도Light'),
+ url(${강원도Light}) format('woff');
+ font-weight: 300;
+ font-style: normal;
+ }
+
+ @font-face {
+ font-family: '순천B';
+ src: local('순천B'),
+ url(${순천B}) format('woff');
+ font-weight: 300;
+ font-style: normal;
+ }
+
+ @font-face {
+ font-family: '순천R';
+ src: local('순천R'),
+ url(${순천R}) format('woff');
+ font-weight: 300;
+ font-style: normal;
+ }
`;
diff --git a/client/src/fonts/gang2.woff b/client/src/fonts/gang2.woff
new file mode 100644
index 000000000..d6e3611ec
Binary files /dev/null and b/client/src/fonts/gang2.woff differ
diff --git "a/client/src/fonts/\352\260\225\354\233\220\353\217\204Bold.woff" "b/client/src/fonts/\352\260\225\354\233\220\353\217\204Bold.woff"
new file mode 100644
index 000000000..89f975322
Binary files /dev/null and "b/client/src/fonts/\352\260\225\354\233\220\353\217\204Bold.woff" differ
diff --git "a/client/src/fonts/\352\260\225\354\233\220\353\217\204Light.woff" "b/client/src/fonts/\352\260\225\354\233\220\353\217\204Light.woff"
new file mode 100644
index 000000000..47e823470
Binary files /dev/null and "b/client/src/fonts/\352\260\225\354\233\220\353\217\204Light.woff" differ
diff --git "a/client/src/fonts/\353\213\244\354\235\264\354\226\264\353\246\254.woff" "b/client/src/fonts/\353\213\244\354\235\264\354\226\264\353\246\254.woff"
new file mode 100644
index 000000000..6de0a7820
Binary files /dev/null and "b/client/src/fonts/\353\213\244\354\235\264\354\226\264\353\246\254.woff" differ
diff --git "a/client/src/fonts/\354\210\234\354\262\234B.woff" "b/client/src/fonts/\354\210\234\354\262\234B.woff"
new file mode 100644
index 000000000..ec3117239
Binary files /dev/null and "b/client/src/fonts/\354\210\234\354\262\234B.woff" differ
diff --git "a/client/src/fonts/\354\210\234\354\262\234R.woff" "b/client/src/fonts/\354\210\234\354\262\234R.woff"
new file mode 100644
index 000000000..24a71ee18
Binary files /dev/null and "b/client/src/fonts/\354\210\234\354\262\234R.woff" differ
diff --git a/client/src/images/searchBack.jpg b/client/src/images/searchBack.jpg
new file mode 100644
index 000000000..d59257d81
Binary files /dev/null and b/client/src/images/searchBack.jpg differ
diff --git a/client/src/pages/Outline.js b/client/src/pages/Outline.js
index 3ea87a287..bb7caf76e 100644
--- a/client/src/pages/Outline.js
+++ b/client/src/pages/Outline.js
@@ -8,8 +8,8 @@ const EntireContainer = styled.div`
* {
box-sizing: border-box;
word-break: keep-all;
- /* font-family: 'Helvetica', 'Arial', sans-serif; */
font-family: 'Elice Bold';
+ font-family: '순천B';
}
`;
@@ -17,6 +17,8 @@ const BodyContainer = styled.div`
* {
margin: 0;
font-family: 'Elice Regular';
+ font-family: '다이어리';
+ font-family: '순천R';
}
`;
diff --git a/client/src/pages/user/Home.js b/client/src/pages/user/Home.js
index 48442ee3d..1ca31bac1 100644
--- a/client/src/pages/user/Home.js
+++ b/client/src/pages/user/Home.js
@@ -57,7 +57,11 @@ function Home() {
-