git.iko.soy/urbit.org
on master help sign in
Merge pull request #1640 from urbit/grants-design
59a4b03Gordon
pages/grants.js+109−129
compare with master
unifiedsplit
@@ -129,158 +129,138 @@ export default function Grants({ posts, categories, types, search }) {
129 // Heading and Introduction
129 // Heading and Introduction
130 }
130 }
131 <Section wide>
131 <Section wide>
132− <div className="flex flex-column justify-between pb-16">
133− <div className="measure">
134− <h1 className="pb-16">Grants</h1>
132+ <h1 className="pb-16">Grants Program</h1>
135− <p className="mb-8 lead">
133+ <p className="mb-8 lead">
136− The Urbit Foundation's Grants program is one of our primary
134+ The Urbit Foundation's Grants program is one of our primary
137− mechanisms for distributing address space to the creators and
135+ mechanisms for distributing address space to creators and developers.
138− builders out there that help Urbit to succeed.
136+ </p>
139− </p>
140− <p className="lead mb-8">
141− Read on to learn more about the various types of grants we
142− issue, get started on your own grant, and view past and present
143− grants that have been funded.
144− </p>
145− </div>
146− </div>
147− <div className="flex flex-wrap">
148− <Link href="#grant-types" passHref>
149− <a className="button-lg bg-blue-400 text-white mr-2">
150− Learn More
151− </a>
152− </Link>
153− <Link href="#join-community" passHref>
154− <a className="button-lg bg-black text-white mr-2">
155− Join the Community
156− </a>
157− </Link>
158− <Link href="#view-grants" passHref>
159− <a className="button-lg bg-wall-400 text-white mr-2">
160− View Grants
161− </a>
162− </Link>
163− </div>
164 </Section>
137 </Section>
165 {
138 {
166 // Grants Programs
139 // Grants Programs
167 }
140 }
168 <Section wide short>
141 <Section wide short>
169− <div className="flex flex-column justify-between pb-12">
142+ <div className="b-12">
170− <div className="measure">
171 <h2 id="grant-types" className="pb-12">
143 <h2 id="grant-types" className="pb-12">
172 Grant types
144 Grant types
173 </h2>
145 </h2>
174− <p className="mb-8">
175− The Urbit Foundation provides three different kinds of grants.
176− No matter what kind of grant you're working on, you'll receive
177− lots of support from the Foundation and a helpful, enthusiastic
178− community.
179− </p>
180− {/* Proposals */}
181− <p className="mb-4">
182− <b>Proposals</b> are for receiving funding for your project
183− &mdash; we fund all kinds projects, not strictly technical ones,
184− so don't hesitate to pitch your idea!
185− </p>
186− <Link href="/grants/proposals" passHref>
187− <a className="button-sm bg-blue-400 text-white mb-8 max-w-fit">
188− Submit a Proposal
189− </a>
190− </Link>
191
146
192− {/* Apprenticeships */}
147+ <div className="flex flex-column flex-wrap md:flex-nowrap grid-cols-2 gap-x-12 pb-12">
193− <p className="mb-4">
194− <b>Apprenticeships</b> are practical learning opportunities for
195− new Urbit developers provided by members of the Urbit community.
196− They're one of the best ways to level up your skills, and often
197− lead to full-time jobs.
198− </p>
199− <Link href="/grants/apprenticeships" passHref>
200− <a className="button-sm bg-green-400 text-white mb-8 max-w-fit">
201− Become an Apprentice
202− </a>
203− </Link>
204
148
205− {/* Bounties */}
149+ <div className="md:basis-1/2">
150+ {/* Proposals */}
151+ <h3>Proposals</h3>
152+ <p className="mb-4">
153+ Proposals are the main way to get funding for your project. We fund all kinds projects, not strictly technical ones,
154+ so don't hesitate to pitch your idea!
155+ </p>
156+ <Link href="/grants/proposals" passHref>
157+ <a className="button-sm bg-blue-400 text-white mb-8 max-w-fit">
158+ Submit a Proposal
159+ </a>
160+ </Link>
161+
162+ {/* Apprenticeships */}
163+ <h3>Apprenticeships</h3>
206− <p className="mb-4">
164+ <p className="mb-4">
165+ Apprenticeships are practical learning opportunities for
166+ new Urbit developers provided by members of the Urbit community.
167+ They're one of the best ways to level up your skills and often
168+ lead to full-time jobs.
169+ </p>
170+ <Link href="/grants/apprenticeships" passHref>
171+ <a className="button-sm bg-green-400 text-white mb-8 max-w-fit">
172+ Become an Apprentice
173+ </a>
174+ </Link>
175+ </div>
176+
177+ <div className="md:basis-1/2">
178+ {/* Bounties */}
179+ <h3>Bounties</h3>
180+ <p className="mb-4">
207− <b>Bounties</b> are contracts for work provided by either the
181+ Bounties are contracts for work provided by either the
208− Urbit Foundation or from trusted partners in our ecosystem.
182+ Urbit Foundation or from trusted partners in our ecosystem.
209− </p>
183+ </p>
210− <div className="flex flex-wrap">
184+ <div className="flex flex-wrap">
211− <Link href="/grants/bounties#post-a-bounty" passHref>
185+ <Link href="/grants/bounties#post-a-bounty" passHref>
212− <a className="button-sm bg-yellow-300 text-black mr-2 max-w-fit">
186+ <a className="button-sm bg-yellow-300 text-black mr-2 max-w-fit">
213− Post a Bounty
187+ Post a Bounty
214− </a>
188+ </a>
215− </Link>
189+ </Link>
216− <Link href="/grants/bounties" passHref>
190+ <Link href="/grants/bounties" passHref>
217− <a className="button-sm bg-wall-400 text-white max-w-fit">
191+ <a className="button-sm bg-wall-400 text-white max-w-fit">
218− Learn more
192+ Learn more
219− </a>
193+ </a>
220− </Link>
194+ </Link>
195+ </div>
221− </div>
196+ </div>
222 </div>
197 </div>
223 </div>
198 </div>
224 </Section>
199 </Section>
225
200
226 <Section wide short>
201 <Section wide short>
227− <div className="flex flex-column justify-between">
228− <div className="measure">
229− <h2 id="join-community" className="pb-12">
230− Community
231− </h2>
232− <p className="mb-4">
233− We believe that grants are more successful when tackled with the
234− support of a community, and community starts with individual
235− relationships.
236− </p>
237− <ul className="mb-4">
238− <li>
239− <p>
240− <Link href="/grants/proposals">Proposals</Link> are approved
241− and stewarded by past grant workers
242− </p>
243− </li>
244− <li>
245− <p>
246− <Link href="/grants/bounties">Bounties</Link> are overseen
247− by those that post them
248− </p>
249− </li>
250− <li>
251− <p>
252− <Link href="/grants/apprenticeships">Apprenticeships</Link>{" "}
253− are largely about building a relationship between apprentice
254− and mentor
255− </p>
256− </li>
257− </ul>
258
202
259− <p className="mb-8">
203+ <h2 id="join-community" className="pb-12">
260− Whether you're gearing up to submit your proposal or just
204+ Community
261− thinking about it, the best way to get started is to join the
205+ </h2>
262− Foundation group on Urbit:
263− </p>
264
206
265− <JoinGroup
207+ <div className="flex flex-column flex-wrap md:flex-nowrap grid-cols-2 gap-x-12 pb-12">
266− emphasize
267− className="mb-8"
268− groupName="~wolref-podlex/foundation"
269− />
270
208
209+ <div className="md:basis-1/2">
210+
211+ <p className="mb-4">
212+ We believe that grants are more successful when tackled with the
213+ support of a community, and community starts with individual
214+ relationships.
271− <p>
215+ </p>
216+ <ul className="mb-4">
217+ <li className="mb-2">
218+ <p>
219+ <Link href="/grants/proposals">Proposals</Link> are approved
220+ and stewarded by past grant workers.
221+ </p>
222+ </li>
223+ <li className="mb-2">
224+ <p>
225+ <Link href="/grants/bounties">Bounties</Link> are overseen
226+ by those that post them.
227+ </p>
228+ </li>
229+ <li className="mb-2">
230+ <p>
231+ <Link href="/grants/apprenticeships">Apprenticeships</Link>{" "}
232+ are largely about building a relationship between apprentice
233+ and mentor.
234+ </p>
235+ </li>
236+ </ul>
237+ </div>
238+
239+
240+ <div className="md:basis-1/2">
241+ <p className="mb-8">
242+ Whether you're gearing up to submit your proposal or just
243+ thinking about it, the best way to get started is to join the
244+ Foundation group on Urbit:
245+ </p>
246+
247+ <JoinGroup
248+ emphasize
249+ className="mb-8"
250+ groupName="~wolref-podlex/foundation"
251+ />
252+
253+ <p>
272− If you're not on the network, reach out to us at{" "}
254+ If you're not on the network, check out our <Link href="/getting-started">Getting Started</Link> guide.
273− <a href="mailto:grants@urbit.org">grants@urbit.org</a> and we'll
274− get back to you within a couple of days.
275− </p>
255+ </p>
276− </div>
256+ </div>
277 </div>
257 </div>
278 </Section>
258 </Section>
279
259
280− {/* View Grants */}
260+ {/* Grants */}
281 <Section wide>
261 <Section wide>
282 <h2 id="view-grants" className="pb-8">
262 <h2 id="view-grants" className="pb-8">
283− View Grants
263+ Grants
284 </h2>
264 </h2>
285 <h5 className="text-wall-600 font-semibold my-2">Programs</h5>
265 <h5 className="text-wall-600 font-semibold my-2">Programs</h5>
286 <div className="flex flex-wrap items-center pb-2">
266 <div className="flex flex-wrap items-center pb-2">
pages/index.js+1−1
@@ -85,7 +85,7 @@ export default function Home({ posts, events, grantNumbers, search }) {
85 }
85 }
86 <Section narrow>
86 <Section narrow>
87 <div className="flex items-center pb-12">
87 <div className="flex items-center pb-12">
88− <h2 className="m-0 p-0 mr-4">Grants</h2>
88+ <h2 className="m-0 p-0 mr-4">Grants Program</h2>
89 </div>
89 </div>
90 <div className="flex flex-col md:flex-row w-full items-center md:items-start bg-green-100 px-8 py-8 rounded-xl">
90 <div className="flex flex-col md:flex-row w-full items-center md:items-start bg-green-100 px-8 py-8 rounded-xl">
91 <div className="flex items-center flex-col p-4 w-full">
91 <div className="flex items-center flex-col p-4 w-full">