diff --git a/public/images/Edit.svg b/public/images/Edit.svg index c727cda..4ebc0c4 100644 --- a/public/images/Edit.svg +++ b/public/images/Edit.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/public/images/Setting.svg b/public/images/Setting.svg index 49d5b96..a900498 100644 --- a/public/images/Setting.svg +++ b/public/images/Setting.svg @@ -1,6 +1,6 @@ - - + + diff --git a/src/components/header/ControlBtn.tsx b/src/components/header/ControlBtn.tsx index 5084df9..aa86957 100644 --- a/src/components/header/ControlBtn.tsx +++ b/src/components/header/ControlBtn.tsx @@ -3,12 +3,17 @@ import styled from "styled-components"; import * as styles from "lib/styles/styles"; import palette from "lib/styles/palette"; -const ControlBtn = ({ massege, onClick }: Props) => { - return onClick()}>{massege}; +const ControlBtn = ({ src , onClick }: Props) => { + return ( + <> + onClick()} /> + + ); }; const Img = styled.img` height: 44px; + cursor: pointer; `; const Btn = styled.button` @@ -32,7 +37,8 @@ const Btn = styled.button` `; interface Props { - massege: String; + src: String; + // massege: String; onClick: (value?: boolean) => void; } diff --git a/src/components/header/Edit.svg b/src/components/header/Edit.svg index c727cda..4ebc0c4 100644 --- a/src/components/header/Edit.svg +++ b/src/components/header/Edit.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/src/components/header/Logo.tsx b/src/components/header/Logo.tsx index 913f673..70e5e8d 100644 --- a/src/components/header/Logo.tsx +++ b/src/components/header/Logo.tsx @@ -17,7 +17,6 @@ const Wrapper = styled.a` align-items: center; justify-content: center; outline: none; - margin-right: 16px; background-color: #009AA8; transition: .2s ${styles.transition}; border-radius: 8px; @@ -30,7 +29,8 @@ const Wrapper = styled.a` `; const Img = styled.img` - height: 44px; + height: 30px; + cursor: pointer; `; export default Logo \ No newline at end of file diff --git a/src/containers/Header.tsx b/src/containers/Header.tsx index 722d499..a98bd22 100644 --- a/src/containers/Header.tsx +++ b/src/containers/Header.tsx @@ -1,4 +1,5 @@ // components +import styled from "styled-components"; import Wrapper from "components/header/Wrapper"; import Layout, { AutoLayout } from "components/header/Layout"; import Logo from "components/header/Logo"; @@ -9,18 +10,30 @@ const Header = ({ onNavToggle, onOptionToggle, onLearningToggle }: Props) => { -
- - - -
- + + + {/* */} + {/* + */}
); }; +const Img = styled.img` + width: 25px; +`; interface Props { onNavToggle: (value?: boolean) => void; onOptionToggle: (value?: boolean) => void;