Showing
1 changed file
with
18 additions
and
21 deletions
| ... | @@ -31,14 +31,15 @@ const MenuContainer = styled.div` | ... | @@ -31,14 +31,15 @@ const MenuContainer = styled.div` |
| 31 | `; | 31 | `; |
| 32 | 32 | ||
| 33 | const LogoContainer = styled.div` | 33 | const LogoContainer = styled.div` |
| 34 | - margin-top: 20px; | 34 | + margin-top: 10px; |
| 35 | float: left; | 35 | float: left; |
| 36 | padding: 20px; | 36 | padding: 20px; |
| 37 | img { | 37 | img { |
| 38 | - width: 100px; | 38 | + width: 130px; |
| 39 | 39 | ||
| 40 | vertical-align: bottom; | 40 | vertical-align: bottom; |
| 41 | } | 41 | } |
| 42 | + cursor: pointer; | ||
| 42 | `; | 43 | `; |
| 43 | 44 | ||
| 44 | const SearchContainer = styled.div` | 45 | const SearchContainer = styled.div` |
| ... | @@ -83,8 +84,8 @@ const SortOptionContainer = styled.div` | ... | @@ -83,8 +84,8 @@ const SortOptionContainer = styled.div` |
| 83 | 84 | ||
| 84 | const OptionContainer = styled.div` | 85 | const OptionContainer = styled.div` |
| 85 | position: absolute; | 86 | position: absolute; |
| 86 | - top: 129px; | 87 | + top: 132px; |
| 87 | - left: 650px; | 88 | + left: 750px; |
| 88 | `; | 89 | `; |
| 89 | 90 | ||
| 90 | const UserContainer = styled.div` | 91 | const UserContainer = styled.div` |
| ... | @@ -115,7 +116,9 @@ const Header = () => { | ... | @@ -115,7 +116,9 @@ const Header = () => { |
| 115 | <> | 116 | <> |
| 116 | <MainContainer> | 117 | <MainContainer> |
| 117 | <HeaderTop /> | 118 | <HeaderTop /> |
| 118 | - <LogoContainer onClick={onMainClick}>로고</LogoContainer> | 119 | + <LogoContainer onClick={onMainClick}> |
| 120 | + <img src="eDrive_logo_v2.png" alt="" /> | ||
| 121 | + </LogoContainer> | ||
| 119 | <SearchContainer> | 122 | <SearchContainer> |
| 120 | <DropDownContainer> | 123 | <DropDownContainer> |
| 121 | <DropDownWrap> | 124 | <DropDownWrap> |
| ... | @@ -124,11 +127,7 @@ const Header = () => { | ... | @@ -124,11 +127,7 @@ const Header = () => { |
| 124 | float="left" | 127 | float="left" |
| 125 | fontsize="20px" | 128 | fontsize="20px" |
| 126 | height="50px" | 129 | height="50px" |
| 127 | - options={[ | 130 | + options={[{ id: 1, name: '전체' }]} |
| 128 | - { id: 1, name: '전체' }, | ||
| 129 | - { id: 2, name: '개인' }, | ||
| 130 | - { id: 3, name: '부서' }, | ||
| 131 | - ]} | ||
| 132 | /> | 131 | /> |
| 133 | </DropDownWrap> | 132 | </DropDownWrap> |
| 134 | </DropDownContainer> | 133 | </DropDownContainer> |
| ... | @@ -141,33 +140,31 @@ const Header = () => { | ... | @@ -141,33 +140,31 @@ const Header = () => { |
| 141 | <SLink activeClassName="active" to="/search"> | 140 | <SLink activeClassName="active" to="/search"> |
| 142 | 전체 | 141 | 전체 |
| 143 | </SLink> | 142 | </SLink> |
| 144 | - <SLink to="/search_categori1">개인</SLink> | ||
| 145 | - <SLink to="/search_categori2">부서</SLink> | ||
| 146 | </ul> | 143 | </ul> |
| 147 | </MenuContainer> | 144 | </MenuContainer> |
| 148 | <OptionContainer> | 145 | <OptionContainer> |
| 149 | - <SearchOptionContainer onClick={openModal}> | ||
| 150 | - <Button color="white">고급 검색</Button> | ||
| 151 | - </SearchOptionContainer> | ||
| 152 | - <Modal showModal={showModal} setShowModal={setShowModal} /> | ||
| 153 | <SortOptionContainer> | 146 | <SortOptionContainer> |
| 154 | <DropDownButton | 147 | <DropDownButton |
| 155 | color="white" | 148 | color="white" |
| 156 | width="85px" | 149 | width="85px" |
| 157 | - fontsize="16px" | 150 | + fontsize="15px" |
| 158 | - height="38px" | 151 | + height="36px" |
| 159 | - title="정렬" | 152 | + title="정렬(기본)" |
| 160 | options={[ | 153 | options={[ |
| 161 | - { id: 0, name: '정렬' }, | 154 | + { id: 0, name: '정렬(기본)' }, |
| 162 | { id: 1, name: '날짜빠른순' }, | 155 | { id: 1, name: '날짜빠른순' }, |
| 163 | { id: 2, name: '크기높은순' }, | 156 | { id: 2, name: '크기높은순' }, |
| 164 | { id: 3, name: '크기낮은순' }, | 157 | { id: 3, name: '크기낮은순' }, |
| 165 | ]} | 158 | ]} |
| 166 | /> | 159 | /> |
| 167 | </SortOptionContainer> | 160 | </SortOptionContainer> |
| 161 | + <SearchOptionContainer onClick={openModal}> | ||
| 162 | + <Button color="gray">고급 검색</Button> | ||
| 163 | + </SearchOptionContainer> | ||
| 164 | + <Modal showModal={showModal} setShowModal={setShowModal} /> | ||
| 168 | </OptionContainer> | 165 | </OptionContainer> |
| 169 | <UserContainer> | 166 | <UserContainer> |
| 170 | - <Button color="white" width="100px" height="50px" fontsize="20px"> | 167 | + <Button color="blue" width="100px" height="50px" fontsize="20px"> |
| 171 | 사용자 님 | 168 | 사용자 님 |
| 172 | </Button> | 169 | </Button> |
| 173 | </UserContainer> | 170 | </UserContainer> | ... | ... |
-
Please register or login to post a comment