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.

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

master -> stable #10289

Merged
merged 6 commits into from
Mar 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
239 changes: 239 additions & 0 deletions app/assets/v2/images/home/Flying_ppl_optimized.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 0 additions & 16 deletions app/assets/v2/js/grants/_detail.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,6 @@ Vue.mixin({

}).catch(console.error);
},
backNavigation: function() {
const vm = this;
const lgt = localStorage.getItem('last_grants_title') || 'Grants';

const lgi = (document.referrer.indexOf(location.host) != -1 && !document.referrer.includes('grants/new')) ? 'javascript:history.back()' : '/grants/explorer';

if (lgi && lgt) {
vm.$set(vm.backLink, 'url', lgi);
vm.$set(vm.backLink, 'title', lgt);
}
},
scrollToElement(element) {
const container = this.$refs[element];

Expand Down Expand Up @@ -174,15 +163,10 @@ if (document.getElementById('gc-grant-detail')) {
grant: {},
tabSelected: 0,
tab: null,
backLink: {
url: '/grants',
title: 'Grants'
}
};
},
mounted: function() {
this.enableTab();
this.backNavigation();
this.fetchGrantDetails();
}
});
Expand Down
81 changes: 81 additions & 0 deletions app/assets/v2/scss/jtbd.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,84 @@
max-width: 100%;
}
}

.home-carousel {
.carousel-inner {
min-height: 500px;
}
.grants {
display: flex;
h3 {
margin-top: 2rem;
}
.dates {
font-weight: normal;
font-family: 'Miriam Libre';
font-size: 32px;
color: $gc-teal-400;
text-align: center;
}
img {
width: 40%;
margin: 0 auto;
}
a {
width: 20%;
margin-left: 40%;
}
background-image: url(static('v2/images/home/GR13_desktopBanner_bg.png'));
background-size: 100% auto;
background-repeat: no-repeat;
min-height: 450px;
text-align: center;
}
li {
background-color: $gc-violet-400;
}
.carousel-caption {
h5 {
color: $gray-900;
}
}
.carousel-indicator {
z-index: auto;
}
}
.header-image {
img {
width: 100%;
}
}
@media screen and (max-width: 768px) {
.home-carousel {
.carousel-inner {
min-height: 525px;
}
.grants {
margin-top: 40px;
.dates {
margin-top: 0;
}
min-height: 425px;
img {
width: 60%;
margin: 0 auto;
}
a {
width: 50%;
margin-left: 25%;
}
}

}
.build-slide {
h1 {
font-size: 24px;
}
p {
font-size: 20px;
margin-bottom: 0;
}
}

}
6 changes: 3 additions & 3 deletions app/assets/v2/scss/lib/bootstrap/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
@include font-size($navbar-toggler-font-size);
line-height: 1;
background-color: transparent; // remove default button style
border: $border-width solid transparent; // remove default button style
border: none; // remove default button style
@include border-radius($navbar-toggler-border-radius);

@include hover-focus() {
Expand All @@ -132,8 +132,8 @@
// or image file as needed.
.navbar-toggler-icon {
display: inline-block;
width: 1.5em;
height: 1.5em;
width: 1.3em;
height: 1.3em;
vertical-align: middle;
content: "";
background: 50% / 100% 100% no-repeat;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/v2/scss/top-nav.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

// SVGs for mobile nav
html {
--navbar-toggle-open: url("data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20width='30'%20height='30'%20viewBox='0%200%2030%2030'%3E%3Cpath%20stroke='currentColor'%20stroke-linecap='round'%20stroke-miterlimit='10'%20stroke-width='2'%20d='M4%207h22M4%2015h22M4%2023h22'%20/%3E%3C/svg%3E");
--navbar-toggle-close: url("data:image/svg+xml,%3Csvg%20width='30px'%20height='30px'%20viewBox='0%200%2030%2030'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%20id='Page-1'%20stroke='none'%20stroke-width='1'%20fill='none'%20fill-rule='evenodd'%3E%3Cg%20id='Artboard'%20transform='translate(-146.000000,%20-156.000000)'%20fill-rule='nonzero'%3E%3Cg%20id='download'%20transform='translate(77.000000,%2045.000000)'%3E%3Cpath%20d='M73,118%20L95,134%20M73,134%20L95,118'%20id='Shape-Copy-2'%20stroke='currentColor'%20stroke-width='2'%20stroke-linecap='round'%3E%3C/path%3E%3Crect%20id='Path'%20x='69'%20y='111'%20width='30'%20height='30'%3E%3C/rect%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
--navbar-toggle-open: url("data:image/svg+xml,%3csvg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath fill-rule='evenodd' clip-rule='evenodd' d='M3 8V6H21V8H3ZM3 13H21V11H3V13ZM3 18H21V16H3V18Z' fill='black'/%3e%3c/svg%3e");
--navbar-toggle-close: url("data:image/svg+xml,%3csvg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M19 6.41L17.59 5L12 10.59L6.41 5L5 6.41L10.59 12L5 17.59L6.41 19L12 13.41L17.59 19L19 17.59L13.41 12L19 6.41Z' fill='black'/%3e%3c/svg%3e");
}

.top-nav {
Expand Down
2 changes: 1 addition & 1 deletion app/grants/templates/grants/detail/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h2 class="font-bigger-1 font-weight-bold mb-3">
<grant-details :grant="grant" v-if="grant?.id">
<img :src="grant.logo_url" alt="" height="290px" class="d-block w-100 mb-4" style="object-fit: contain; background: black;" :style="grant.image_css">
<div class="container mb-3">
<a :href="backLink.url" class="font-body" rel="noopener noreferrer"><i class="fas fa-chevron-left mr-2"></i>Back to [[backLink.title]] </a>
<a href="/grants/explorer" class="font-body" rel="noopener noreferrer"><i class="fas fa-chevron-left mr-2"></i>Back to Grants </a>
</div>
</grant-details>

Expand Down
34 changes: 0 additions & 34 deletions app/grants/templates/grants/landing/active_clr_round.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,40 +21,6 @@ <h4 class="font-weight-bold mb-2" id="match-pools">Discover Match Rounds</h4>
{% include 'grants/landing/round_by_type.html' with active_rounds=active_ecosystem_rounds %}
{% endif %}

{# Hard-coding the Gitcoin Building Gitcoin mini banner ... #}
<div class="col-12 col-lg-6">
<a
href="https://grants.gtcdao.net/"
class="active-clr-banner d-block text-decoration-none position-relative mt-3"
target="_blank"
rel="noopener"
>
<div class="position-absolute w-100 h-100" style="
top: 0;
right: 0;
background: url('{% static 'landingpage/Gitcoin_Building_Gitcoin.jpg' %}') no-repeat center;
"
>
</div>
<div style="color: #0E0333" class="round-details d-flex p-3 justify-content-between position-relative">
<div>
<p class="pr-5 font-bigger-1" style="max-height: 30px; overflow: hidden;">GR12 - GITCOIN BUILDING GITCOIN</p>
<button class="btn btn-primary" type="submit" style="border:none; background-color: #0E0333 ">Launch App &nbsp;<i class="fa fa-external-link"></i></button>
</div>
<div class="text-right">
<p class="mb-0 font-bigger-2 font-weight-light">$25K</span>
<p class="mt-0 font-smaller-1">available</span>
</div>
</div>
</a>

<div class="font-body d-flex" style="background-color: #F4F4F4;">
<p class="px-3 py-2 my-auto" style="color: #0E0333 ">
Main: Decentralized projects building for Gitcoin
</p>
</div>
</div>

</div>

</div>
Expand Down
40 changes: 29 additions & 11 deletions app/retail/templates/home/index2021.html

Large diffs are not rendered by default.