Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: redo landing header #5646

Merged
merged 4 commits into from
Dec 18, 2019
Merged

chore: redo landing header #5646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a54d44
- claeanup landing page
thelostone-mc Dec 17, 2019
121cc15
add styles header boxes
octavioamu Dec 17, 2019
8fb453a
add notification when logged
octavioamu Dec 17, 2019
207d423
fix image
octavioamu Dec 18, 2019
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
4 changes: 2 additions & 2 deletions app/assets/v2/css/buttons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ button:focus {
}

.btn {
border-radius: 5px;
border-radius: 3px;
}

.btn-gc-blue,
Expand Down Expand Up @@ -285,7 +285,7 @@ button:focus {

.btn-gc-grey {
color: #171717;
background-color: #cbcbcb;
background-color: #EEE;
}

.btn-gc-grey:not(:disabled):not(.disabled).active {
Expand Down
117 changes: 46 additions & 71 deletions app/assets/v2/css/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,21 @@
background-color: transparent;
}

.banner {
background-color: #0d023b;
background-size: cover;
background-position: 0px 0px;
background-repeat: no-repeat;
position: relative;
color: #fff;
padding-top: 8rem;
.banner__h2 {
line-height: 3rem;
}

.homepage .banner #fund-issue {
border: 2px solid #3E00FF;
}

.optimize_oss p,
.realign p {
color: #4A4A4A;
}

.banner h1 {
font-weight: normal;
font-size: 2rem;
}

.banner h1,
.banner p {
margin-bottom: 2.5rem;
}

.banner .buttons {
display: flex;
justify-content: center;
}

.homepage .btn-gc-green {
color: #0D0764;
color: white;
}

.homepage .newsletter {
Expand All @@ -73,7 +56,7 @@
}

.homepage #tree-svg svg {
max-width: 17rem;
max-width: 19rem;
}

.articles .article {
Expand Down Expand Up @@ -110,22 +93,6 @@
margin: auto;
}

.content-links a {
color: #fff;
text-decoration: underline;
}

.banner .buttons a {
flex-grow: 1;
font-weight: 600;
}

.row h2 {
font-weight: 500;
font-size: 1.75rem;
margin-bottom: 0.6rem;
}

img.play {
max-height: 3rem;
}
Expand Down Expand Up @@ -253,7 +220,7 @@ p.video-preview__index {

.video-preview__title {
font-size: 32px;
font-weight: bold;
font-weight: 600;
color: #fff;
max-width: 14em;
line-height: 1.35;
Expand Down Expand Up @@ -317,7 +284,7 @@ figure:hover::before {
background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, .3) 100%);
}

.compass{
.compass {
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -329,25 +296,25 @@ figure:hover::before {
.compass__dashes,
.compass__inner,
.compass__outer,
.compass__arrow{
.compass__arrow {
position: absolute;
}

.compass__dashes{
.compass__dashes {
width: 50%;
}

.compass__inner{
.compass__inner {
width: 120%;
animation: rock_small ease-in-out 6s infinite;
}

.compass__outer{
.compass__outer {
width: 80%;
animation: rock_big ease-in-out 7s infinite;
}

.compass__arrow{
.compass__arrow {
width: 20%;
animation: rock_arrow ease-in-out 4s infinite;
}
Expand All @@ -366,7 +333,7 @@ figure:hover::before {
}

@keyframes rock_small {
0%, 100%{
0%, 100% {
transform: rotate(-5deg);
}
50%{
Expand All @@ -375,7 +342,7 @@ figure:hover::before {
}

@keyframes rock_big {
0%, 100%{
0%, 100% {
transform: rotate(-4deg);
}
50%{
Expand All @@ -384,7 +351,7 @@ figure:hover::before {
}

@keyframes rock_arrow {
0%, 100%{
0%, 100% {
transform: rotate(35deg);
}
50%{
Expand All @@ -399,12 +366,6 @@ figure:hover::before {
}
}

@media (max-width: 1200px) {
.banner img {
position: absolute;
bottom: -2px;
}
}

@media (max-width: 1024px) {
.realign-img,
Expand All @@ -416,13 +377,6 @@ figure:hover::before {
margin-top: 4rem;
}

.bots-img {
display: none;
}

.banner {
padding-bottom: 5rem;
}

.articles .article {
margin-bottom: 3rem;
Expand All @@ -434,38 +388,59 @@ figure:hover::before {
margin-bottom: 1.5rem;
}

.video-row{
.video-row {
grid-template-columns: 1fr;
}
}

@media (max-width: 768px) {
.compass{
.compass {
height: 300px;
}

.compass__dashes{
.compass__dashes {
width: auto;
}
.compass__inner{
.compass__inner {
width: auto;
}

.compass__outer{
.compass__outer {
width: auto;
}

.compass__arrow{
.compass__arrow {
width: auto;
}
}

@media (max-width: 375px) {
.video-preview{
.video-preview {
--padding: 2rem;
}

.video-preview__title {
font-size: 24px;
}
}

.box-cta {
background: #0D0764;
margin: 2em;
padding: 3em;
}

.box-cta__left {
box-shadow: 33px 33px 0 -20px #3E00FF;

}

.box-cta__right {
box-shadow: -33px 33px 0 -20px #3E00FF;
}

.box-cta__title {
font-size: 24px;
border-bottom: 4px solid var(--gc-green);
font-weight: 700;
}
Binary file added app/assets/v2/images/home/bg-index.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/assets/v2/images/home/bots.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/dashboard/templates/shared/labs_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
<span class="navbar-toggler-icon"></span>
</button>
{% if user.is_authenticated %}
{% include 'shared/notifications.html' %}
{% if user.is_staff %}
{% include 'shared/chat_nav.html' %}
{% endif %}
{% include 'shared/notifications.html' %}
{% endif %}
</div>

Expand Down
10 changes: 6 additions & 4 deletions app/dashboard/templates/shared/newsletter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ <h4 class="col-12 font-title font-weight-semibold py-1" id="newsletter-title">
{% trans "Join Our Newsletter!" %}
{% endif %}
</h4>
I want to
<span class="mr-2">
I want to
</span>
<nav class="nav justify-content-center d-inline-flex btn-group btn-group-sm my-3" id="myTab" role="tablist">
<a class="nav-link active btn btn-gc-grey" id="funderForm-tab" data-toggle="tab" href="#funderForm" role="tab" aria-controls="funderForm" aria-selected="true">fund bounties</a>
<a class="nav-link btn btn-gc-grey" id="hunterForm-tab" data-toggle="tab" href="#hunterForm" role="tab" aria-controls="hunterForm" aria-selected="false">work on bounties</a>
<a class="nav-link active btn btn-gc-grey py-2 px-3" id="funderForm-tab" data-toggle="tab" href="#funderForm" role="tab" aria-controls="funderForm" aria-selected="true">fund bounties</a>
<a class="nav-link btn btn-gc-grey py-2 px-3" id="hunterForm-tab" data-toggle="tab" href="#hunterForm" role="tab" aria-controls="hunterForm" aria-selected="false">work on bounties</a>
</nav>
<div class="tab-content" id="myTabContent">
<!-- funders newsletter -->
Expand All @@ -39,7 +41,7 @@ <h4 class="col-12 font-title font-weight-semibold py-1" id="newsletter-title">
{% endif %}
<div class="col-12 pt-3">
<input name="EMAIL" id="newsletter-input" placeholder="Enter your email" required>
<button id="newsletter-subscribe-funder" type="submit" class="button button--primary subscribe ml-lg-2"><i class="far fa-envelope mr-2"></i>Subscribe</button>
<button id="newsletter-subscribe-funder" type="submit" class="button button--primary subscribe py-2"><i class="far fa-envelope mr-2"></i>Subscribe</button>
</div>
{% if not hide_newsletter_consent %}
<span style="display: block; margin-top: 3px; font-size: 10px;">
Expand Down
2 changes: 1 addition & 1 deletion app/grants/templates/grants/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<span class="navbar-toggler-icon"></span>
</button>
{% if user.is_authenticated %}
{% include 'shared/notifications.html' %}
{% if user.is_staff %}
{% include 'shared/chat_nav.html' %}
{% endif %}
{% include 'shared/notifications.html' %}
{% endif %}
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/kudos/templates/shared/kudos_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<span class="navbar-toggler-icon"></span>
</button>
{% if user.is_authenticated %}
{% include 'shared/notifications.html' %}
{% if user.is_staff %}
{% include 'shared/chat_nav.html' %}
{% endif %}
{% include 'shared/notifications.html' %}
{% endif %}
</div>

Expand Down
4 changes: 2 additions & 2 deletions app/quests/templates/quests/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
<span class="navbar-toggler-icon"></span>
</button>
{% if user.is_authenticated %}
{% include 'shared/notifications.html' %}
{% if user.is_staff %}
{% include 'shared/chat_nav.html' %}
{% endif %}
{% include 'shared/notifications.html' %}
{% endif %}
</div>

<div class="collapse navbar-collapse order-1" id="navbarSupportedContent">

<nav class="navbar-nav ml-auto mr-3">
<a class="nav-link selected interior" href="{% url 'quests_index' %}">{% trans "Quests Explorer" %}</a>
<a class="nav-link interior" href="{% url 'quests_index' %}#leaderboard_top">{% trans "Leaderboard" %}</a>
Expand Down
Loading