Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2021-1-capstone-design1
/
GCL_Project1
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
이승윤
2021-06-12 19:04:43 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c69a46b3515e4d155215fafd9a41510d20a10af7
c69a46b3
1 parent
74e36e62
style: styled component 수정
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
26 deletions
frontend/src/components/Header.js
frontend/src/components/common/Input.js
frontend/src/pages/HomePage.js
frontend/src/components/Header.js
View file @
c69a46b
...
...
@@ -13,7 +13,6 @@ const HeaderHeight = '170px';
const
HeaderTop
=
styled
.
div
`
background-color: black;
float: up;
height: 20px;
`
;
const
MainContainer
=
styled
.
div
`
...
...
@@ -32,9 +31,9 @@ const MenuContainer = styled.div`
`
;
const
LogoContainer
=
styled
.
div
`
margin-top: 1
0px;
float: left
;
padding
: 20px
;
padding-right: 2
0px;
padding-left: 20px
;
padding
-top: 1%
;
img {
width: 130px;
...
...
@@ -44,13 +43,15 @@ const LogoContainer = styled.div`
`
;
const
SearchContainer
=
styled
.
div
`
display: flex;
width: 70%;
position: relative;
margin-top: 20px;
`
;
const
SLink
=
styled
(
NavLink
)
`
list-style-type: none;
color: black;
float: left;
line-height: 55px;
vertical-align: middle;
text-align: center;
...
...
@@ -75,16 +76,13 @@ const SLink = styled(NavLink)`
}
`
;
const
DropDownWrap
=
styled
.
div
``
;
const
SearchOptionContainer
=
styled
.
div
`
float: left;
`
;
const
SearchOptionContainer
=
styled
.
div
``
;
const
SortOptionContainer
=
styled
.
div
`
float: left;
`
;
const
SortOptionContainer
=
styled
.
div
``
;
const
OptionContainer
=
styled
.
div
`
position: absolute;
display: flex;
top: 132px;
left: 750px;
`
;
...
...
@@ -100,9 +98,7 @@ const AirContainer = styled.div`
height:
${
HeaderHeight
}
;
`
;
const
DropDownContainer
=
styled
.
div
`
flex-direction: column;
`
;
const
DropDownContainer
=
styled
.
div
``
;
const
Header
=
()
=>
{
const
[
showModal
,
setShowModal
]
=
useState
(
false
);
...
...
@@ -117,10 +113,10 @@ const Header = () => {
<>
<
MainContainer
>
<
HeaderTop
/>
<
SearchContainer
>
<
LogoContainer
onClick
=
{
onMainClick
}
>
<
img
src
=
"eDrive_logo_v2.png"
alt
=
""
/>
<
/LogoContainer
>
<
SearchContainer
>
<
DropDownContainer
>
<
DropDownWrap
>
<
DropDownButton
...
...
@@ -134,7 +130,7 @@ const Header = () => {
/
>
<
/DropDownWrap
>
<
/DropDownContainer
>
<
InputBlock
color
=
"blue"
fontsize
=
"20px"
width
=
"
850px"
display
=
""
>
<
InputBlock
color
=
"blue"
fontsize
=
"20px"
width
=
"
70%"
display
>
<
input
/>
<
/InputBlock
>
<
/SearchContainer
>
...
...
frontend/src/components/common/Input.js
View file @
c69a46b
...
...
@@ -7,23 +7,25 @@ import { inputColorMap } from '../../lib/styles/palette';
const
InputBlock
=
styled
.
div
`
width:
${
props
=>
props
.
width
}
;
float:
${
props
=>
props
.
float
||
'left'
}
;
height:
${
props
=>
props
.
height
}
;
position: relative;
`
;
const
InputWrap
=
styled
.
div
`
padding-top:
${
props
=>
props
.
paddingsize
}
;
position: relative;
padding-left: 10px;
width: 70%;
height: 100%;
color:
${
props
=>
inputColorMap
[
props
.
color
].
color
}
;
outline: none;
font-size:
${
props
=>
props
.
size
}
;
border: 3px solid
${
props
=>
inputColorMap
[
props
.
color
].
borderColor
}
;
float: left
;
width: 100%
;
`
;
const
SearchIconWrap
=
styled
.
div
`
float: left;
position: absolute;
right: 0;
top: 0;
`
;
const
MyInput
=
({
...
...
frontend/src/pages/HomePage.js
View file @
c69a46b
...
...
@@ -9,7 +9,6 @@ const Main = styled.div`
display: flex;
align-items: center;
justify-content: center;
padding-left: 7%;
`
;
const
Container
=
styled
.
div
`
...
...
@@ -27,9 +26,8 @@ const LogoWrap = styled.div`
`
;
const
SearchBlock
=
styled
.
div
`
display: inline-block;
width: 100%;
margin-left: 23%;
display: flex;
width: 50%;
`
;
const
LoginButtonBlock
=
styled
.
div
`
position: fixed;
...
...
@@ -57,9 +55,8 @@ const HomePage = () => {
{
id
:
2
,
name
:
'개인'
},
{
id
:
3
,
name
:
'부서'
},
]}
float
=
"left"
/>
<
Input
color
=
"blue"
paddingsize
=
"10px"
width
=
"
700px
"
display
/>
<
Input
color
=
"blue"
paddingsize
=
"10px"
width
=
"
100%
"
display
/>
<
/SearchBlock>
{
/* Todo : 로그인 했을 경우 로그인 버튼 숨기기 */
}
...
...
Please
register
or
login
to post a comment