Skip to content

Commit

Permalink
#25 header menus justiry & footer update
Browse files Browse the repository at this point in the history
  • Loading branch information
dwdjjj committed Oct 14, 2022
1 parent 9d1f8c2 commit 7ec9e52
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 28 deletions.
Binary file added src/assets/github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/github_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/mail_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/메일.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 27 additions & 7 deletions src/components/layout/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,40 @@
import React from "react";
import { FooterBox, FooterContents, FooterIconBox } from "../../styles/layout/footer";
import { ReactComponent as NLslogo } from '../../assets/NL_logo-white.svg'
import {
FooterBox,
FooterContents,
FooterIconBox,
} from "../../styles/layout/footer";
import { ReactComponent as NLslogo } from "../../assets/NL_logo-white.svg";
import gitIcon from "../../assets/github_icon.svg";
import mailIcon from "../../assets/mail_icon.svg";
import { Text } from "../common";

function Footer() {
return (
<FooterBox>
<FooterIconBox>
<NLslogo width="35px"/>
<NLslogo width="35px" />
<a href="https://github.com/Network-Leader">
<img src={gitIcon} alt="github" />
</a>
<img src={mailIcon} alt="mail" />
</FooterIconBox>
<FooterContents>
<Text size="small" color="foot" children="서울특별시 노원구 공릉로" lineheight="28px"/>
<Text size="small" color="foot" children="© 개인정보처리방침 NL. All RIGHT RESERVED" lineheight="28px"/>
<Text
size="small"
color="foot"
children="서울특별시 노원구 공릉로"
lineheight="28px"
/>
<Text
size="small"
color="foot"
children="© 개인정보처리방침 NL. All RIGHT RESERVED"
lineheight="28px"
/>
</FooterContents>
</FooterBox>
)
);
}

export default Footer
export default Footer;
12 changes: 5 additions & 7 deletions src/styles/layout/footer.ts
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
import styled from "@emotion/styled";

const FooterBox = styled.div`
position: absolute;
display: flex;
flex-direction: column;
align-items: center;
/* width: 1441px; */
z-index: 999;
width: 100%;
height: 318px;
left: 0px;
top: 6057px;
background-color: black;
`
`;

const FooterIconBox = styled.div`
display: flex;
min-height: 35px;
margin-top: 148px;
min-width: 942px;
border-bottom: 2px solid white;
`
`;

const FooterContents = styled.div`
min-width: 942px;
color: white;
padding: 40px 0px;
`
`;

export { FooterBox, FooterIconBox, FooterContents };
export { FooterBox, FooterIconBox, FooterContents };
27 changes: 13 additions & 14 deletions src/styles/layout/header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@ const HeaderBox = styled.div`
display: flex;
position: fixed;
top: 0px;
left: 0px;
justify-content: space-between;
/* width: 1441px; */
width: 100%;
height: 105px;
z-index: 999;
/* background-color: black; */
background-image: linear-gradient(to right, black 200px, transparent 200px 411px, black 411px 100%)
`
background-image: linear-gradient(
to right,
black 200px,
transparent 200px 411px,
black 411px 100%
);
`;

const HeaderContents = styled.div`
display: flex;
flex-direction: row;
align-items: center;
margin-left: 400px;
`
margin-right: 200px;
`;

const HeaderMenuItem = styled.div`
display: flex;
Expand All @@ -29,19 +34,13 @@ const HeaderMenuItem = styled.div`
min-width: 100px;
height: 100%;
cursor: pointer;
`
`;

const LogoBox = styled.div`
left: 205px;
margin-left: 200px;
min-width: 211px;
min-height: 101px;
cursor: pointer;
`
`;

export {
HeaderBox,
HeaderContents,
HeaderMenuItem,
LogoBox
};
export { HeaderBox, HeaderContents, HeaderMenuItem, LogoBox };

0 comments on commit 7ec9e52

Please sign in to comment.