Skip to content

Commit

Permalink
Merge pull request #501 from ZcashFoundation/develop
Browse files Browse the repository at this point in the history
Provide notice for the temporary pausing in acceptance of new grants …
  • Loading branch information
dternyak authored Jul 24, 2020
2 parents e612e4f + 665c12b commit b192f00
Show file tree
Hide file tree
Showing 8 changed files with 247 additions and 140 deletions.
2 changes: 1 addition & 1 deletion backend/requirements/prod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Flask
Flask==1.0.2
MarkupSafe==1.0
MarkupSafe==1.1.1
Werkzeug==0.15.3
Jinja2==2.10.1
itsdangerous==0.24
Expand Down
99 changes: 99 additions & 0 deletions frontend/client/components/Header/Banner.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
.Banner {
padding-left: 10px;
padding-right: 10px;
background-color: #2D2A26;
color: #fff;
overflow-x: hidden;
align-content: center;
justify-content: center;
display: flex;

@media (max-width: 1000px) {
padding-top: 10px;
padding-bottom: 10px;
flex-direction: column;
}

&__inner {
display: flex;
padding: .65rem 0;
align-items: center;
justify-content: center;
flex-direction: row;
max-width: 1000px;
align-content: center;
overflow-x: hidden;
margin-bottom: 0.25rem;

@media (max-width: 1100px) {
max-width: 900px;
margin: 0 auto;
}

@media (max-width: 1000px) {
max-width: 750px;
text-align: center;
padding: 0px 10px;
}

@media(max-width: 600px) {
flex-wrap: wrap;
}
}

&__badge {
padding: 6px 16px;
border-radius: 100px;
font-size: 14px;
line-height: 20px;
background-color: #CF8A00;
font-weight: 700;
text-transform: uppercase;
margin-right: 12px;
margin-top: auto;
margin-bottom: auto;

@media (max-width: 1000px) {
padding: 6px 16px;
border-radius: 100px;
}
}

&__link {
color: #fff;
text-decoration: none;
}

&__body {
display: flex;
align-content: center;
justify-content: center;
padding: 0rem 0.5rem;
max-width: 1000px;
}

&__body-text {
font-size: 14px;
font-weight: 500;
margin-bottom: 0;

> * {
margin: 0;
}

@media (max-width: 800px) {
line-height: 22px;
}

@media(max-width: 600px) {
font-size: 12px;
line-height: 20px;
margin: 1rem 0;
}
}

&__body-link {
color: #CF8A00;
text-decoration: none;
}
}
18 changes: 18 additions & 0 deletions frontend/client/components/Header/Banner.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import './Banner.less'

const Banner = (props: any) => (
<div className="Banner">
<div className="Banner__inner">
<div className="Banner__badge">
<a href="#" className="Banner__link">{props.badgeName}</a>
</div>
<div className="Banner__body">
<p className="Banner__body-text">{props.body}</p>
</div>
</div>
</div>
)


export default Banner
6 changes: 3 additions & 3 deletions frontend/client/components/Header/Drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ class HeaderDrawer extends React.Component<Props> {
<Menu.Item key="/proposals">
<Link to="/proposals">Browse proposals</Link>
</Menu.Item>
<Menu.Item key="/create">
<Link to="/create">Start a proposal</Link>
</Menu.Item>
{/*<Menu.Item key="/create">*/}
{/* <Link to="/create">Start a proposal</Link>*/}
{/*</Menu.Item>*/}
</Menu.ItemGroup>
<Menu.ItemGroup title="Requests">
<Menu.Item key="/requests">
Expand Down
Loading

0 comments on commit b192f00

Please sign in to comment.