Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

feat(frontend): New design for the header and the footer and background #483

Merged
merged 41 commits into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
acc47cb
adjust import svg
icerove Nov 17, 2020
6055a8b
fix header netwrok click
icerove Nov 17, 2020
c4df21f
Merge branch 'master' into frontend/fix-header
icerove Nov 17, 2020
0019c6f
Merge branch 'master' into frontend/fix-header
icerove Nov 24, 2020
41aea58
fix issue
icerove Nov 24, 2020
39f7d8c
fix the error
icerove Nov 25, 2020
aeaa0be
fix large screen
icerove Nov 26, 2020
18b6a93
gix the page
icerove Dec 4, 2020
2f1638d
Merge branch 'master' into frontend/fix-header
icerove Dec 4, 2020
14ba9b9
finish footer
icerove Dec 7, 2020
0989d12
finish mobile header
icerove Dec 8, 2020
bdd55c9
fix test
icerove Dec 8, 2020
30e7cc8
update snapshot
icerove Dec 8, 2020
c6da711
Merge branch 'master' into frontend/fix-header
icerove Dec 8, 2020
d23e170
update snapshot
icerove Dec 8, 2020
e16efc7
fix as comments
icerove Dec 9, 2020
191baae
fix search
icerove Dec 9, 2020
42aad0d
fix as comments
icerove Dec 10, 2020
d0d651c
fix as comments
icerove Dec 10, 2020
f33ccd1
fix footer
icerove Dec 10, 2020
e4716ac
update search
icerove Dec 11, 2020
6023ba4
fix as comments
icerove Dec 15, 2020
2545d1b
fix as comments and search bar
icerove Jan 7, 2021
c87aa16
Merge branch 'master' into frontend/fix-header
icerove Jan 14, 2021
cd5ff7a
delete repeat font family
icerove Jan 14, 2021
2351f23
fix as comments
icerove Jan 14, 2021
3b27779
fix the test
icerove Jan 14, 2021
28df63b
update test
icerove Jan 15, 2021
c201be8
fix as comments
icerove Jan 15, 2021
7b6e6fd
fix mobile annoy
icerove Jan 16, 2021
15a2c74
Merge branch 'master' into frontend/fix-header
icerove Jan 19, 2021
c0dc82d
fix search
icerove Jan 22, 2021
503bb6f
fix: fixed some styling on Account Details page
frol Jan 22, 2021
e4a3a9e
fix: updated test snapshots
frol Jan 22, 2021
cd34501
give border
icerove Jan 25, 2021
ddca528
Merge branch 'frontend/fix-header' of https://github.com/nearprotocol…
icerove Jan 25, 2021
c005787
Merge branch 'master' into frontend/fix-header
icerove Jan 25, 2021
e13ea99
update test
icerove Jan 25, 2021
2867de3
Improvement of search field
shelegdmitriy Jan 26, 2021
d9e97f3
addressed the last styling comment
frol Jan 26, 2021
cd3c20e
Merge branch 'master' into frontend/fix-header
frol Jan 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions frontend/src/components/utils/Footer.jsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { Container, Row, Col } from "react-bootstrap";
import NearLogo from "../../../public/static/images/near_logo.svg";
import Nearkat from "../../../public/static/images/nearkat_prof.svg";

import NearLogo from "../../../public/static/images/near_logo.svg";

export default () => (
<Container fluid className="footer-container">
<Row>
<Col className="align-self-center text-center px-0" xs="12" md="3">
<Col className="align-self-center text-center px-0" xs="4" md="3">
<NearLogo className="near-logo" />
</Col>
<Col
className="align-self-center footer-link text-md-left text-center pl-0"
xs="12"
md="5"
xs="8"
md="4"
>
© {new Date().getFullYear()} NEAR Inc. All Rights Reserved.
<br />
Expand All @@ -25,18 +27,15 @@ export default () => (
</Col>
<Col className="text-right d-none d-sm-block ml-auto" md="4" lg="2">
<a className="footer-help-link" href="http://near.chat" target="_blank">
<Row noGutters>
<Row>
<Col md="2">
<img
className="help-image img-responsive"
src="/static/images/footer-nearkat.svg"
/>
<Nearkat className="help-image img-responsive" />
</Col>
<Col className="align-self-center">
<div className="footer-help">
<span className="need-help-contact">Need Help?</span>
<Col className="align-self-center footer-help">
<div>
<span className="need-help-contact">Questions?</span>
<span className="need-help-contact need-help-contact-bottom">
Join Community
Join the Community
</span>
</div>
</Col>
Expand All @@ -51,7 +50,7 @@ export default () => (
font-size: 12px;
line-height: 40px;
color: #999999;
height: 120px;
height: 100px;
width: 100%;
}

Expand Down Expand Up @@ -80,16 +79,30 @@ export default () => (
}

.footer-help {
<<<<<<< HEAD
icerove marked this conversation as resolved.
Show resolved Hide resolved
background: #ffffff;
box-sizing: border-box;
text-align: left;
font-weight: 800;
font-size: 18px;
line-height: 24px;
padding: 24px 40px;
}

.help-image {
height: 150px;
=======
text-align: left;
line-height: 1px;
padding: 40px 20%;
}

.help-image {
margin-top: -50%;
>>>>>>> master
position: relative;
z-index: 2;
left: -35px;
top: -20px;
}

.need-help-contact {
Expand All @@ -109,6 +122,14 @@ export default () => (
color: #0072ce !important;
display: block;
}
<<<<<<< HEAD

.near-logo {
width: 100px;
fill: #acacac;
}
=======
>>>>>>> master
`}</style>
</Container>
);
225 changes: 74 additions & 151 deletions frontend/src/components/utils/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,156 +1,79 @@
import { Container, Row, Col } from "react-bootstrap";
import Link from "next/link";
import { useRouter } from "next/router";

import NearLogoIcon from "../../../public/static/images/near_logo_icon.svg";
import HeaderNetworkDropdown from "./HeaderNetworkDropdown";
import HeaderNavDropdown from "./HeaderNavDropdown";
import Search from "./Search";
import NearLogo from "../../../public/static/images/near_logo.svg";

import HeaderDropdownNav from "./HeaderDropdownNav";
import HeaderNavItem from "./HeaderNavItem";

export default () => (
<Container fluid className="near-main-container">
<Row className="header-container">
<Col xs="2" className="px-0 d-md-none align-self-center">
<Link href="/">
<a>
<NearLogoIcon className="near-logo-icon" />
</a>
</Link>
</Col>

<Col md="auto" xs="6" className="pl-0 d-none d-md-block ">
<Link href="/">
<a>
<NearLogo className="near-logo" />
</a>
</Link>
</Col>

<HeaderNavItem
link="/"
imgLink="/static/images/icon-home.svg"
text="Dashboard"
/>
<HeaderNavItem
link="/accounts"
imgLink="/static/images/icon-contract.svg"
text="Accounts"
/>
<HeaderNavItem
link="/transactions"
imgLink="/static/images/icon-transactions.svg"
text="Transactions"
/>
<HeaderNavItem
link="/blocks"
imgLink="/static/images/icon-blocks.svg"
text="Blocks"
/>

<HeaderNavItem
link="http://near.chat/"
imgLink="/static/images/icon-help.svg"
text="Help"
cls="ml-auto"
/>
<HeaderNavItem
link="https://github.com/near/near-explorer/issues"
imgLink="/static/images/icon-issues.svg"
text="Issues"
/>

<Col className="align-self-center d-none d-sm-block" md="auto">
<span className="header-nav-network-border" />
</Col>

<Col className="align-self-center mb-3 mt-3" md="auto" xs="10">
<HeaderDropdownNav />
</Col>
</Row>
<style jsx global>{`
.modal-body {
font-family: BentonSans;
font-weight: 300;
}

.header-container {
background-color: #24272a;
}

.header-container .near-logo,
.header-container .near-logo-icon {
fill: white;
}

.header-container .near-logo {
margin: 5px 0 5px 15px;
height: 60px;
}

.near-main-container {
width: 100%;
}

.header-nav-network-border {
border: solid 1px #979797;
}

.header-nav-network {
width: 100%;
text-align: left;
}

.header-nav-network:after {
float: right;
margin-top: 0.5em;
}

.header-nav-caret {
position: relative;
}

.dropdown.show .header-nav-caret:before,
.dropdown.show .header-nav-caret:after {
content: "";
position: absolute;
display: block;
width: 0;
height: 0;
border-width: 7px 8px;
border-style: solid;
border-color: transparent;
z-index: 1001;
}
.dropdown.show .header-nav-caret:before {
bottom: -17px;
right: 10px;
border-bottom-color: #ccc;
}
.dropdown.show .header-nav-caret:after {
bottom: -17px;
right: 10px;
border-bottom-color: #fff;
}

.header-nav-item-dropdown-menu {
padding: 12px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
border-radius: 5px;
}

.header-nav-item-dropdown {
font-family: BentonSans;
font-size: 14px;
letter-spacing: 1.8px;
color: #0072ce;
text-transform: uppercase;
padding: 6px 40px 6px 6px;
border-radius: 3px;
}

.header-nav-item-dropdown:hover {
background-color: #e6e6e6;
}
`}</style>
</Container>
);
export default () => {
const router = useRouter();
return (
<Container fluid className="header-container">
<Row noGutters>
<Col xs="6" className="px-0 d-md-none align-self-center">
<Link href="/">
<a>
<NearLogo className="near-main-logo" />
</a>
</Link>
</Col>

<Col md="1" className="d-none d-md-block">
<Link href="/">
<a>
<NearLogo className="near-main-logo" />
</a>
</Link>
</Col>

<Col className="align-self-center pl-3" md="2" xs="6">
<HeaderNetworkDropdown />
</Col>

<Col className="align-self-center text-center" md="7" xs="12">
{router.pathname !== "/" && <Search />}
</Col>

<Col className="align-self-center text-center" md="2">
<Row>
<Col md="6" xs="6" className="pt-2">
<Link href="/">
<a className="header-home">Home</a>
</Link>
</Col>
<Col md="6" xs="6" className="pt-1">
<HeaderNavDropdown />
</Col>
</Row>
</Col>
</Row>
<style jsx global>{`
.header-container {
padding: auto 5px;
width: 100%;
background: #ffffff;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.05);
}

.near-main-logo {
width: 100%;
height: 72px;
padding: 6px;
}

.header-home {
font-weight: 500;
color: #000000;
}

@media (max-width: 780px) {
.near-main-logo {
width: 100%;
}
}
`}</style>
</Container>
);
};
Loading