git.iko.soy/urbit.org
on master help sign in
Merge branch 'next-slim' of github.com:urbit/urbit.org into chore/type
c458a00Gavin Atkinson
content/docs+1−1
compare with master
unifiedsplit

Submodule changed.

content/faq.md+1−1
@@ -289,7 +289,7 @@ Landscape is an experimental Urbit OS web interface that includes social functio
289
289
290Follow our guide on how to boot a ship [here](@/using/install.md).
290Follow our guide on how to boot a ship [here](@/using/install.md).
291
291
292−Get on the [mailing list](/../#mc_embed_signup). Learn [Hoon](@/docs/hoon/_index.md). Sign up for [Hoon School](@/hoonschool.md). [Make stuff](@/using/install.md).
292+Get on the [mailing list](/../#mc_embed_signup). Learn [Hoon](@/docs/tutorials/hoon/_index.md). Sign up for [Hoon School](@/hoonschool.md). [Make stuff](@/using/install.md).
293
293
294
294
295## Urbit Grants
295## Urbit Grants
content/using/develop.md+2−2
@@ -34,9 +34,9 @@ If you’re looking for some guidance, need help, or would prefer direct communi
34
34
35## Application development {#application}
35## Application development {#application}
36
36
37−When creating user applications on Urbit, you aren’t tied to any particular user interface. They can work without providing a response to the user, or by printing to the Dojo, or with an interface in Landscape, which uses [Eyre](@/docs/arvo/eyre.md) (the Arvo vane that serves HTTP to serve a React-based interface to the application through a web browser).
37+When creating user applications on Urbit, you aren’t tied to any particular user interface. They can work without providing a response to the user, or by printing to the Dojo, or with an interface in Landscape, which uses [Eyre](@/docs/tutorials/arvo/eyre.md) (the Arvo vane that serves HTTP to serve a React-based interface to the application through a web browser).
38
38
39−When writing applications, you will often make use of [Gall](@/docs/hoon/hoon-tutorial/gall.md), the Arvo vane that manages user applications.
39+When writing applications, you will often make use of [Gall](@/docs/tutorials/hoon/gall.md), the Arvo vane that manages user applications.
40
40
41If you want to see examples of Urbit applications with common functionality requirements, you can see our [examples](https://github.com/urbit/examples) repository. If you want to get started building applications with a Landscape interface, check out our [create-landscape-app](https://github.com/urbit/create-landscape-app) repository.
41If you want to see examples of Urbit applications with common functionality requirements, you can see our [examples](https://github.com/urbit/examples) repository. If you want to get started building applications with a Landscape interface, check out our [create-landscape-app](https://github.com/urbit/create-landscape-app) repository.
42
42
content/using/operations/using-your-ship.md+2−2
@@ -567,7 +567,7 @@ Tall-form Hoon may require multiple lines:
567~your-urbit:dojo< 2
567~your-urbit:dojo< 2
568```
568```
569
569
570−Hoon uses something called [the subject](@/docs/hoon/hoon-tutorial/the-subject-and-its-legs.md).
570+Hoon uses something called [the subject](@/docs/tutorials/hoon/the-subject-and-its-legs.md).
571The Dojo has its own subject and that's where Hoon's equivalent of variables,
571The Dojo has its own subject and that's where Hoon's equivalent of variables,
572called faces, are stored.
572called faces, are stored.
573
573
@@ -823,7 +823,7 @@ Which outputs a new `urbit.pill` to `pier/.urb/put/urbit.pill`
823
823
824#### `&` - Mark conversion
824#### `&` - Mark conversion
825
825
826−Convert between marks using `&`, with the destination mark first. You can stack multiple mark conversions together, and some marks can only be converted to specific other marks. In this example, [Udon](@/docs/arvo/sail-and-udon.md#udon) is converted to `&hymn` (a mark which supplies the `html`, `head`, `body`, and closing tags) first, before being converted to HTML:
826+Convert between marks using `&`, with the destination mark first. You can stack multiple mark conversions together, and some marks can only be converted to specific other marks. In this example, [Udon](@/docs/tutorials/sail-and-udon.md#udon) is converted to `&hymn` (a mark which supplies the `html`, `head`, `body`, and closing tags) first, before being converted to HTML:
827
827
828```
828```
829~your-urbit:dojo>&html &hymn &udon ';h1#hello: hello'
829~your-urbit:dojo>&html &hymn &udon ';h1#hello: hello'
templates/index.html+11−5
@@ -1,10 +1,9 @@
1{% extends "base.html" %}
1{% extends "base.html" %}
2<!--External links are differentiated on home page.-->
2<!--External links are differentiated on home page.-->
3{% block templatestyles %}
3{% block templatestyles %}
4−<!-- a[href*="//"]:not([href*="{{config.base_url | safe}}"])::after {
4+
5−content: " ↗"; -->
6−}
7{% endblock templatestyles %}
5{% endblock templatestyles %}
6+
8{% block bodyclasses %}class="index"{% endblock bodyclasses %}
7{% block bodyclasses %}class="index"{% endblock bodyclasses %}
9
8
10{% block title %} {{ section.title }} {% endblock title %}
9{% block title %} {{ section.title }} {% endblock title %}
@@ -12,11 +11,18 @@ content: " ↗"; -->
12{% block content %}
11{% block content %}
13
12
14<section class="full p0 vid-insert-wrap full-bleed">
13<section class="full p0 vid-insert-wrap full-bleed">
14+ <video
15− <video class="vid-insert bg-black" autoplay muted loop>
15+ class="vid-insert bg-black"
16+ autoplay
17+ muted
18+ loop
19+ <!-- NB:Gavin: Removed playsinline for the sake of mobile users. -->
20+ <!-- playsinline -->
21+ poster="https://storage.cloud.google.com/media.urbit.org/site/sea30-poster.png">
16 <source
22 <source
17 src="https://storage.googleapis.com/media.urbit.org/site/sea30-1440.mp4"
23 src="https://storage.googleapis.com/media.urbit.org/site/sea30-1440.mp4"
18 type="video/mp4"/>
24 type="video/mp4"/>
19− Your browser does not support the video tag.
25+ Your browser does not support the video tag.
20 </video>
26 </video>
21
27
22 <div class="grid12" style="height: 100%; width:100%;">
28 <div class="grid12" style="height: 100%; width:100%;">
templates/partials/footer.html+49−49
@@ -1,52 +1,52 @@
1<footer class="full-bleed mt4 grid12 bg-black white full pb6">
1<footer class="full-bleed mt4 grid12 bg-black white full pb6">
2− <section class="full grid12 mb4">
2+ <section class="full grid12 mb4">
3− <nav class="c3-5-md c3-5-lg half-1 mt5">
3+ <nav class="c1-4-md c3-5-lg half-1 mt5">
4− <h3 class="mt0 mb0 pt0 pb0">Understanding Urbit</h3>
4+ <h3 class="mt0 mb3 pt0 pb0">Understanding Urbit</h3>
5− <li class="mt2"><a href="/understanding-urbit">Introduction</a></li>
5+ <li class="mt2 f7"><a href="/understanding-urbit">Introduction</a></li>
6− <li class="mt2"><a href="/understanding-urbit/urbit-id">Urbit ID</a></li>
6+ <li class="mt2 f7"><a href="/understanding-urbit/urbit-id">Urbit ID</a></li>
7− <li class="mt2"><a href="/understanding-urbit/technical-overview">Technical Overview</a></li>
7+ <li class="mt2 f7"><a href="/understanding-urbit/technical-overview">Technical Overview</a></li>
8− <li class="mt2"><a href="/understanding-urbit/project-history">Project Status + History</a></li>
8+ <li class="mt2 f7"><a href="/understanding-urbit/project-history">Project Status + History</a></li>
9− </nav>
9+ </nav>
10
10
11− <nav class="c5-7-md c5-7-lg half-2 mt5">
11+ <nav class="c4-7-md c5-7-lg half-2 mt5">
12− <h3 class="mt0 mb0 pt0 pb0">Learn more</h3>
12+ <h3 class="mt0 mb3 pt0 pb0">Learn more</h3>
13− <li class="mt2"><a href="/essays">Essays</a></li>
13+ <li class="mt2 f7"><a href="/essays">Essays</a></li>
14− <li class="mt2"><a href="/updates">Updates</a></li>
14+ <li class="mt2 f7"><a href="/updates">Updates</a></li>
15− <li class="mt2"><a href="/media">Media</a></li>
15+ <li class="mt2 f7"><a href="/media">Media</a></li>
16− <li class="mt2"><a href="/faq">FAQ</a></li>
16+ <li class="mt2 f7"><a href="/faq">FAQ</a></li>
17− </nav>
17+ </nav>
18
18
19− <nav class="c7-9-md c7-9-lg half-1 mt5">
19+ <nav class="c7-10-md c7-9-lg half-1 mt5">
20− <h3 class="mt0 mb0 pt0 pb0">Using + Contributing</h3>
20+ <h3 class="mt0 mb3 pt0 pb0">Using + Contributing</h3>
21− <li class="mt2"><a href="/using/install">Install + Setup</a></li>
21+ <li class="mt2 f7"><a href="/using/install">Install + Setup</a></li>
22− <li class="mt2"><a href="/using/develop">Developer's Guide</a></li>
22+ <li class="mt2 f7"><a href="/using/develop">Developer's Guide</a></li>
23− <li class="mt2"><a href="/using/operations">Operations Manual</a></li>
23+ <li class="mt2 f7"><a href="/using/operations">Operations Manual</a></li>
24− </nav>
24+ </nav>
25− <nav class="c9-11-md c9-11-lg half-2 mt5">
25+ <nav class="c10-13-md c9-11-lg half-2 mt5">
26− <h3 class="mt0 mb0 pt0 pb0">Community</h3>
26+ <h3 class="mt0 mb3 pt0 pb0">Community</h3>
27− <li class="mt2"><a href="https://groups.google.com/a/urbit.org/forum/#!forum/dev">urbit-dev</a></li>
27+ <li class="mt2 f7"><a href="https://groups.google.com/a/urbit.org/forum/#!forum/dev">urbit-dev</a></li>
28− <li class="mt2"><a href="/hoonschool">Hoon School ↗</a></li>
28+ <li class="mt2 f7"><a href="/hoonschool">Hoon School</a></li>
29− <li class="mt2"><a href="https://www.meetup.com/urbit-sf/">Meetups</a></li>
29+ <li class="mt2 f7"><a href="https://www.meetup.com/urbit-sf/">Meetups</a></li>
30− <li class="mt2"><a href="/governance">Governance</a></li>
30+ <li class="mt2 f7"><a href="/governance">Governance</a></li>
31− </nav>
31+ </nav>
32− </section>
32+ </section>
33− <section class="full-bleed full grid12">
33+ <section class="full-bleed full grid12">
34− <nav class="c3-5-md c3-5-lg half-1 mt4 mb5">
34+ <nav class="c1-4-md c3-5-lg half-1 mt4 mb5">
35− <h3 class="mt0 mb0 pt0 pb0">Developers</h3>
35+ <h3 class="mt0 mb3 pt0 pb0">Developers</h3>
36− <li class="mt2"><a href="/docs">Documentation</a></li>
36+ <li class="mt2 f7"><a href="/docs">Documentation</a></li>
37− <li class="mt2"><a href="https://grants.urbit.org">Grants</a></li>
37+ <li class="mt2 f7"><a href="https://grants.urbit.org">Grants</a></li>
38− <li class="mt2"><a href="/bounties">Security Bounties</a></li>
38+ <li class="mt2 f7"><a href="/bounties">Security Bounties</a></li>
39− </nav>
39+ </nav>
40− <nav class="c5-7-md c5-7-lg half-2 mt4 mb5">
40+ <nav class="c4-7-md c5-7-lg half-2 mt4 mb5">
41− <h2 class="mb3 mt0">About Urbit.org</h2>
41+ <h2 class="mb3 mt0">About Urbit.org</h2>
42− <li class="mt2"><a href="/tos">Terms of Service</a></li>
42+ <li class="mt2 f7"><a href="/tos">Terms of Service</a></li>
43− <li class="mt2"><a href="/privacy#scope">Privacy Policy</a></li>
43+ <li class="mt2 f7"><a href="/privacy#scope">Privacy Policy</a></li>
44− </nav>
44+ </nav>
45− <nav class="c7-9-md c7-9-lg half-1 mt4 mb5">
45+ <nav class="c10-13-md c7-9-lg half-1 mt4 mb5">
46− <h2 class="mb3">Need help?</h2>
46+ <h2 class="mb3">Need help?</h2>
47− <li class="mt2"><a href="mailto:support@urbit.org">support@urbit.org ↗</a></li>
47+ <li class="mt2 f7"><a href="mailto:support@urbit.org">support@urbit.org </a></li>
48− <li class="mt2"><a href="https://discord.gg/bkEX6EU">Discord</a></li>
48+ <li class="mt2 f7"><a href="https://discord.gg/bkEX6EU">Discord</a></li>
49− <li class="mt2"><a href="https://github.com/urbit">Github</a></li>
49+ <li class="mt2 f7"><a href="https://github.com/urbit">Github</a></li>
50− </nav>
50+ </nav>
51− </section>
51+ </section>
52− </footer>
52+</footer>