Skip to content

Commit 5b4912d

Browse files
giliomeejggiliomeejg
authored
Merge branch 'gitcoinco:master' into master
2 parents 4e56f0d + 5692c6b commit 5b4912d

File tree

6 files changed

+158
-28
lines changed

6 files changed

+158
-28
lines changed

‎app/dashboard/templates/shared/cart_nav.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<a href="{% url 'grants:cart' %}" class="gc-cart__icon nav-link dropdown-toggle dropdown-toggle-md-no-caret" id="cartDropdown" role="button"
44
@mouseover="onLinkMouseOver" @click="onLinkClick"
55
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
6-
<i class="far fa-shopping-cart fa-fw fa-lg"></i>
6+
<!-- <i class="far fa-shopping-cart fa-fw fa-lg"></i> -->
77
<span class="pl-3 d-md-none">Cart</span>
88
<span class="cart-notification-dot notification__dot ml-2 ml-md-0" :class="{'notification__dot_active': cart_data_count}">[[ cart_data_count ]]</span>
99
</a>

‎app/grants/templates/grants/explorer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
<div class="navCart dropdown gc-cart" v-if="!searchVisible && sticky_active">
260260
<a href="" class="gc-cart__icon d-block" role="button" @click="$refs.navCart.init()"
261261
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="padding: 0.3rem 1rem;">
262-
<i class="far fa-shopping-cart fa-fw fa-lg"></i>
262+
<!-- <i class="far fa-shopping-cart fa-fw fa-lg"></i> -->
263263
<span class="cart-notification-dot notification__dot ml-2 mt-n1" :class="{'notification__dot_active': cart_data_count}">[[ cart_data_count ]]</span>
264264
</a>
265265
<div class="dropdown-menu dropdown-menu-right gc-cart-box p-0 px-3 overflow-hidden" aria-labelledby="cartDropdown" style="margin-top: 6px; min-width: 352px;">

‎app/grants/templates/grants/landing/gitcoin-alpha.html

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
<div class="container">
2+
<div class="row">
3+
<div class="pl-0 col-12 col-sm-12 col-md-12 mt-5 mb-3">
4+
<h1 class="font-weight-bold">
5+
The Gitcoin Program Alpha Round (17-31 Jan)
6+
</h1>
7+
<p class="font-weight-light">
8+
Join us as we build on our new protocol (still in testing) during the
9+
<a
10+
href="https://go.gitcoin.co/blog/announcing-the-gitcoin-alpha-tests?utm_source=gitcoin.co"
11+
title="Alpha test season!"
12+
target="_blank"
13+
>Alpha Test Season!</a
14+
>
15+
The Gitcoin Program Alpha Round is a set of 3
16+
<a
17+
href="https://wtfisqf.com/?grant=&grant=&grant=&grant=&match=1000&utm_source=gitcoin.co"
18+
target="_blank"
19+
title="Quadratic Funding"
20+
>Quadratic Funding</a
21+
>
22+
grants rounds that will allocate a
23+
<strong>$1M total matching pool</strong> to
24+
<strong>200 grantees</strong> working on
25+
<strong>Open Source, Ethereum Infrastructure</strong>, and
26+
<strong>Climate Solutions</strong>.<br /><br />
27+
28+
<i>
29+
For the full announcement, read
30+
<a
31+
href="https://go.gitcoin.co/blog/announcing-the-gitcoin-alpha-round?utm_source=gitcoin.co"
32+
target="_blank"
33+
title="Announcing: The Gitcoin Program Alpha Round"
34+
>Announcing: The Gitcoin Program Alpha Round</a
35+
>.
36+
</i>
37+
<br />
38+
For a full guide on how to donate on our new donation platform, grants
39+
explorer, visit
40+
<a
41+
href="https://support.gitcoin.co/gitcoin-knowledge-base/gitcoin-grants-protocol/grants-explorer-guide?utm_source=gitcoin.co"
42+
target="_blank"
43+
title="Grants Explorer Guide"
44+
>Grants Explorer Guide</a
45+
>.
46+
</p>
47+
</div>
48+
<div class="row">
49+
<div class="col-12 col-md-4 pt-3">
50+
<h2>
51+
<a
52+
href="https://grant-explorer.gitcoin.co/#/round/1/0x1b165fe4da6bc58ab8370ddc763d367d29f50ef0"
53+
>Climate Solutions Round</a
54+
>
55+
</h2>
56+
<p>
57+
The <strong>Climate Solutions Round</strong> features
58+
<strong>40 climate projects</strong> from GR15 that were invited
59+
because they received the most support based on the number of unique
60+
contributors, and <strong>ten</strong> bundled use cases for the
61+
remaining GR15 projects working in Renewable Energy, Carbon Markets,
62+
Verification Infrastructure, Oceans & Forest, Agriculture, Community
63+
Engagement, Creative Works, Climate Research, Climate Advocacy &
64+
Activism, and Emerging Markets and Indigenous Communities.
65+
</p>
66+
<p>
67+
<a
68+
href="https://grant-explorer.gitcoin.co/#/round/1/0x1b165fe4da6bc58ab8370ddc763d367d29f50ef0"
69+
class="btn btn-primary"
70+
>Donate</a
71+
>
72+
</p>
73+
</div>
74+
<div class="col-12 col-md-4 pt-3">
75+
<h2>
76+
<a
77+
href="https://grant-explorer.gitcoin.co/#/round/1/0xd95a1969c41112cee9a2c931e849bcef36a16f4c"
78+
>Open Source Software Round</a
79+
>
80+
</h2>
81+
<p>
82+
The <strong>Open Source Software Round</strong> features
83+
<strong>250 grantees</strong> invited based on previous funding
84+
criteria from GR14 and GR15 outlined in this <a
85+
href="https://gov.gitcoin.co/t/discussion-feedback-request-grants-protocol-alpha-round-eligibility/11873?utm_source=gitcoin.co"
86+
target="_blank"
87+
title="Governance post from GR14 and GR15"
88+
>governance post</a
89+
>. In addition, grants must meet these requirements:
90+
</p>
91+
<ul>
92+
<li>
93+
Be an open-source project with meaningful Github activity in the
94+
prior three months demonstrating work completed towards the
95+
project's mission.
96+
</li>
97+
<li>
98+
Primarily focused on developing on top of or advancing the broader
99+
Ethereum and/or Web3 industry.
100+
</li>
101+
</ul>
102+
<p>
103+
<a
104+
href="https://grant-explorer.gitcoin.co/#/round/1/0xd95a1969c41112cee9a2c931e849bcef36a16f4c"
105+
class="btn btn-primary"
106+
>Donate</a
107+
>
108+
</p>
109+
</div>
110+
<div class="col-12 col-md-4 pt-3">
111+
<h2>
112+
<a
113+
href="https://grant-explorer.gitcoin.co/#/round/1/0xe575282b376e3c9886779a841a2510f1dd8c2ce4"
114+
>Ethereum Infrastructure Round</a
115+
>
116+
</h2>
117+
<p>
118+
The <strong>Ethereum Infrastructure Round</strong> features
119+
<strong>30 projects</strong> who are building in direct support of the
120+
Ethereum ecosystem. This includes areas like core client devs, tooling
121+
providers, developer education, and those showcasing the power of
122+
critical ecosystem ideas. Additionally, grants should be open source
123+
if they are software related. Similar to the OSS round, grants were
124+
invited to apply based on the GR14 and GR15 funding criteria outlined
125+
in the governance post linked above.
126+
</p>
127+
<p>
128+
<a
129+
href="https://grant-explorer.gitcoin.co/#/round/1/0xe575282b376e3c9886779a841a2510f1dd8c2ce4"
130+
class="btn btn-primary"
131+
>Donate</a
132+
>
133+
</p>
134+
</div>
135+
</div>
136+
</div>
137+
</div>

‎app/grants/templates/grants/landing/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,13 @@
7676
{% endif %}
7777

7878
<div id="grants-showcase">
79+
{% include 'grants/landing/gitcoin-alpha.html' %}
7980
{% include 'grants/landing/landing_qf_active.html' %}
8081
<div class="">
8182
<div v-if="isLandingPage" class="my-5">
8283
{% include 'grants/landing/active_clr_round.html'%}
8384
</div>
84-
<div class="mb-5 py-5 bg-violet-100">
85+
<!-- <div class="mb-5 py-5 bg-violet-100">
8586
<div class="container">
8687
<div class="row justify-content-between align-items-center mb-4">
8788
<div class="col-auto">
@@ -120,7 +121,7 @@ <h4 class="font-weight-bold pt-0 pb-2 mt-0 pl-0">Discover Grants</h4>
120121
</div>
121122
</div>
122123
123-
</div>
124+
</div> -->
124125

125126
</div>
126127
</div>

‎app/grants/templates/grants/landing/landing_qf_active.html

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h6 class="gc-font-base mt-1 d-block d-md-inline">Maximize Your Impact! Your cur
2828
</div>
2929
</div>
3030
{% endif %}
31-
<div class="row justify-content-between align-items-center my-5">
31+
<!-- <div class="row justify-content-between align-items-center my-5">
3232
<div class="col-md">
3333
<h1 class="mb-md-3 mt-md-0 mb-2 mt-4">
3434
Discover and Fund <br> Public Goods
@@ -41,7 +41,6 @@ <h4 class="text-wrap gc-font-base font-weight-normal mb-md-5 mb-4 pt-md-4 pt-1 t
4141
</h3>
4242
<div class="my-3">
4343
<a class="btn btn-lg btn-primary d-block d-sm-inline" href="{% url 'grants:grants_explorer' %}">{% trans 'View All Grants' %}</a>
44-
<!-- <a class="btn btn-lg btn-outline-primary ml-sm-3 d-block d-sm-inline mt-2 mt-sm-0" href="/grants/new">{% trans 'Create a Grant' %}</a> -->
4544
</div>
4645
<p class="font-subheader mt-4 mb-2">
4746
<a target="_blank" href="https://gitcoin.notion.site/gitcoin/Gitcoin-Grantee-Onboarding-Document-bbfe106a32534fb5a011f09c121257c3">
@@ -54,14 +53,7 @@ <h4 class="text-wrap gc-font-base font-weight-normal mb-md-5 mb-4 pt-md-4 pt-1 t
5453
</a>
5554
</p>
5655
</div>
57-
<!-- <div class="col-md order-md-last order-first">
58-
{% if show_main_round_banner %}
59-
<img src="{% static 'v2/images/grants/gr14-banner.png' %}" class="d-block w-100"/>
60-
{% else %}
61-
<img src="{% static 'v2/images/grants/garden_qf_landing.png' %}" height="auto" width="100%" />
62-
{% endif %}
63-
</div> -->
64-
</div>
56+
</div> -->
6557

6658

6759
<!-- This div is where the hero image goes-->

‎app/retail/templates/home/protocol-grants/protocol-grants.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@
156156
margin-left: calc(0px - 108px * (var(--reducedWidth) / 100));
157157
}
158158

159-
160159
@media only screen and (max-width: 950px) {
161160
#protocol-grants .grants .text {
162161
top: 80px;
@@ -181,41 +180,42 @@
181180
}
182181
}
183182
}
183+
184+
p.round-text a { text-decoration: underline; }
184185
</style>
185186

186187
<section>
187188
<div class="container" id="protocol-grants">
188189
<div class="row bg-light protocol">
189190
<div class="text p-sm-5 pl-2 pr-2 pb-2 pt-5">
190-
<h1 class="text-uppercase font-weight-bold">Grants Protocol</h1>
191-
<p>
192-
Grants Protocol aims to decentralize funding access, empowering any
193-
community to run their own grants program.
191+
<h1 class="font-weight-bold">Gitcoin Alpha Round</h1>
192+
<p class="round-text">
193+
We invite you to participate in our Gitcoin Program Alpha Round, a set of 3 Quadratic Funding grants rounds that will allocate a $1M total matching pool to <a href="https://grant-explorer.gitcoin.co/#/round/1/0xd95a1969c41112cee9a2c931e849bcef36a16f4c">Open Source</a>, <a href="https://grant-explorer.gitcoin.co/#/round/1/0xe575282b376e3c9886779a841a2510f1dd8c2ce4">Ethereum Infrastructure</a>, and <a href="https://grant-explorer.gitcoin.co/#/round/1/0x1b165fe4da6bc58ab8370ddc763d367d29f50ef0">Climate Solutions</a>.
194194
</p>
195195

196196
<a
197-
href="https://go.gitcoin.co/blog/introduction-to-grants-protocol"
197+
href="/grants"
198198
class="text-uppercase button"
199-
title="Explore Gitcoin Grants Protocol"
200-
>Explore Grants Protocol</a
199+
title="View Rounds & Browse Grants"
200+
>View Rounds & Browse Grants</a
201201
>
202202
</div>
203203

204204
<div class="protocol-img"></div>
205205
</div>
206206
<div class="row bg-dark grants">
207207
<div class="text p-sm-5 p-2">
208-
<h1 class="text-uppercase font-weight-bold">Gitcoin Grants</h1>
208+
<h1 class="font-weight-bold">Grants Protocol</h1>
209209
<p>
210-
Gitcoin Grants is a canonical example of the Grants Protocol's
211-
capabilities, and will continue its mission to support public goods.
210+
Grants Protocol aims to decentralize funding access, empowering any
211+
community to run their own grants program.
212212
</p>
213213

214214
<a
215-
href="/grants"
215+
href="https://go.gitcoin.co/blog/introduction-to-grants-protocol"
216216
class="text-uppercase button"
217-
title="See Gitcoin Grants"
218-
>See Gitcoin Grants</a
217+
title="Explore Gitcoin Grants Protocol"
218+
>Explore Grants Protocol</a
219219
>
220220
</div>
221221

0 commit comments

Comments
 (0)