이승윤

style: styled component 수정

...@@ -13,7 +13,6 @@ const HeaderHeight = '170px'; ...@@ -13,7 +13,6 @@ const HeaderHeight = '170px';
13 13
14 const HeaderTop = styled.div` 14 const HeaderTop = styled.div`
15 background-color: black; 15 background-color: black;
16 - float: up;
17 height: 20px; 16 height: 20px;
18 `; 17 `;
19 const MainContainer = styled.div` 18 const MainContainer = styled.div`
...@@ -32,9 +31,9 @@ const MenuContainer = styled.div` ...@@ -32,9 +31,9 @@ const MenuContainer = styled.div`
32 `; 31 `;
33 32
34 const LogoContainer = styled.div` 33 const LogoContainer = styled.div`
35 - margin-top: 10px; 34 + padding-right: 20px;
36 - float: left; 35 + padding-left: 20px;
37 - padding: 20px; 36 + padding-top: 1%;
38 img { 37 img {
39 width: 130px; 38 width: 130px;
40 39
...@@ -44,13 +43,15 @@ const LogoContainer = styled.div` ...@@ -44,13 +43,15 @@ const LogoContainer = styled.div`
44 `; 43 `;
45 44
46 const SearchContainer = styled.div` 45 const SearchContainer = styled.div`
46 + display: flex;
47 + width: 70%;
48 + position: relative;
47 margin-top: 20px; 49 margin-top: 20px;
48 `; 50 `;
49 51
50 const SLink = styled(NavLink)` 52 const SLink = styled(NavLink)`
51 list-style-type: none; 53 list-style-type: none;
52 color: black; 54 color: black;
53 - float: left;
54 line-height: 55px; 55 line-height: 55px;
55 vertical-align: middle; 56 vertical-align: middle;
56 text-align: center; 57 text-align: center;
...@@ -75,16 +76,13 @@ const SLink = styled(NavLink)` ...@@ -75,16 +76,13 @@ const SLink = styled(NavLink)`
75 } 76 }
76 `; 77 `;
77 const DropDownWrap = styled.div``; 78 const DropDownWrap = styled.div``;
78 -const SearchOptionContainer = styled.div` 79 +const SearchOptionContainer = styled.div``;
79 - float: left;
80 -`;
81 80
82 -const SortOptionContainer = styled.div` 81 +const SortOptionContainer = styled.div``;
83 - float: left;
84 -`;
85 82
86 const OptionContainer = styled.div` 83 const OptionContainer = styled.div`
87 position: absolute; 84 position: absolute;
85 + display: flex;
88 top: 132px; 86 top: 132px;
89 left: 750px; 87 left: 750px;
90 `; 88 `;
...@@ -100,9 +98,7 @@ const AirContainer = styled.div` ...@@ -100,9 +98,7 @@ const AirContainer = styled.div`
100 height: ${HeaderHeight}; 98 height: ${HeaderHeight};
101 `; 99 `;
102 100
103 -const DropDownContainer = styled.div` 101 +const DropDownContainer = styled.div``;
104 - flex-direction: column;
105 -`;
106 102
107 const Header = () => { 103 const Header = () => {
108 const [showModal, setShowModal] = useState(false); 104 const [showModal, setShowModal] = useState(false);
...@@ -117,10 +113,10 @@ const Header = () => { ...@@ -117,10 +113,10 @@ const Header = () => {
117 <> 113 <>
118 <MainContainer> 114 <MainContainer>
119 <HeaderTop /> 115 <HeaderTop />
120 - <LogoContainer onClick={onMainClick}>
121 - <img src="eDrive_logo_v2.png" alt="" />
122 - </LogoContainer>
123 <SearchContainer> 116 <SearchContainer>
117 + <LogoContainer onClick={onMainClick}>
118 + <img src="eDrive_logo_v2.png" alt="" />
119 + </LogoContainer>
124 <DropDownContainer> 120 <DropDownContainer>
125 <DropDownWrap> 121 <DropDownWrap>
126 <DropDownButton 122 <DropDownButton
...@@ -134,7 +130,7 @@ const Header = () => { ...@@ -134,7 +130,7 @@ const Header = () => {
134 /> 130 />
135 </DropDownWrap> 131 </DropDownWrap>
136 </DropDownContainer> 132 </DropDownContainer>
137 - <InputBlock color="blue" fontsize="20px" width="850px" display=""> 133 + <InputBlock color="blue" fontsize="20px" width="70%" display>
138 <input /> 134 <input />
139 </InputBlock> 135 </InputBlock>
140 </SearchContainer> 136 </SearchContainer>
......
...@@ -7,23 +7,25 @@ import { inputColorMap } from '../../lib/styles/palette'; ...@@ -7,23 +7,25 @@ import { inputColorMap } from '../../lib/styles/palette';
7 7
8 const InputBlock = styled.div` 8 const InputBlock = styled.div`
9 width: ${props => props.width}; 9 width: ${props => props.width};
10 - float: ${props => props.float || 'left'};
11 height: ${props => props.height}; 10 height: ${props => props.height};
11 + position: relative;
12 `; 12 `;
13 13
14 const InputWrap = styled.div` 14 const InputWrap = styled.div`
15 padding-top: ${props => props.paddingsize}; 15 padding-top: ${props => props.paddingsize};
16 + position: relative;
16 padding-left: 10px; 17 padding-left: 10px;
17 - width: 70%;
18 height: 100%; 18 height: 100%;
19 color: ${props => inputColorMap[props.color].color}; 19 color: ${props => inputColorMap[props.color].color};
20 outline: none; 20 outline: none;
21 font-size: ${props => props.size}; 21 font-size: ${props => props.size};
22 border: 3px solid ${props => inputColorMap[props.color].borderColor}; 22 border: 3px solid ${props => inputColorMap[props.color].borderColor};
23 - float: left; 23 + width: 100%;
24 `; 24 `;
25 const SearchIconWrap = styled.div` 25 const SearchIconWrap = styled.div`
26 - float: left; 26 + position: absolute;
27 + right: 0;
28 + top: 0;
27 `; 29 `;
28 30
29 const MyInput = ({ 31 const MyInput = ({
......
...@@ -9,7 +9,6 @@ const Main = styled.div` ...@@ -9,7 +9,6 @@ const Main = styled.div`
9 display: flex; 9 display: flex;
10 align-items: center; 10 align-items: center;
11 justify-content: center; 11 justify-content: center;
12 - padding-left: 7%;
13 `; 12 `;
14 13
15 const Container = styled.div` 14 const Container = styled.div`
...@@ -27,9 +26,8 @@ const LogoWrap = styled.div` ...@@ -27,9 +26,8 @@ const LogoWrap = styled.div`
27 `; 26 `;
28 27
29 const SearchBlock = styled.div` 28 const SearchBlock = styled.div`
30 - display: inline-block; 29 + display: flex;
31 - width: 100%; 30 + width: 50%;
32 - margin-left: 23%;
33 `; 31 `;
34 const LoginButtonBlock = styled.div` 32 const LoginButtonBlock = styled.div`
35 position: fixed; 33 position: fixed;
...@@ -57,9 +55,8 @@ const HomePage = () => { ...@@ -57,9 +55,8 @@ const HomePage = () => {
57 { id: 2, name: '개인' }, 55 { id: 2, name: '개인' },
58 { id: 3, name: '부서' }, 56 { id: 3, name: '부서' },
59 ]} 57 ]}
60 - float="left"
61 /> 58 />
62 - <Input color="blue" paddingsize="10px" width="700px" display /> 59 + <Input color="blue" paddingsize="10px" width="100%" display />
63 </SearchBlock> 60 </SearchBlock>
64 61
65 {/* Todo : 로그인 했을 경우 로그인 버튼 숨기기 */} 62 {/* Todo : 로그인 했을 경우 로그인 버튼 숨기기 */}
......