on master help sign in
Resolve conflict
commitb91954c92b47ee0f1ed6fd00d353a9fd96aa6532 authorMatilde Park <matilde@tlon.io> dateTue 15 Oct 2019, 12:14 (7 years ago) parent3fbeeb45eea203
11 files changed+48−62
content/docs+1−1 content/understanding-urbit/network-and-os.md+1−1 content/understanding-urbit/project-history.md+3−3 content/understanding-urbit/simple-durable-yours.md+1−1 content/understanding-urbit/technical-overview.md+1−1 content/understanding-urbit/urbit-id.md+4−16 content/understanding-urbit/your-last-computer.md+3−3 templates/partials/navigation-docs.html+1−1 templates/partials/pagination.html+25−25 templates/understanding-urbit/list.html+8−8 templates/understanding-urbit/post.html−2
content/docs+1−1

Submodule changed.

content/understanding-urbit/network-and-os.md+1−1
@@ -12,7 +12,7 @@ hide_previous_title = "true"
1212
1313Our phones are cluttered with apps, ads, and notifications. Our laptops are basically just web browsers that connect us to services controlled by MEGACORP. Who knows where your messages, images, contacts, and connections live, let alone how long they’ll last or who is looking at them.
1414
15−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-phones%402x.png">
15+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-phones%402x.png">
1616
1717The digital world feels like a theme park built to maximize ENGAGEMENT — but we think it’s BORING. What happened to the vision of a computer as a tool that would expand and enrich our lives?
1818
content/understanding-urbit/project-history.md+3−3
@@ -11,15 +11,15 @@ hide_previous_title = "true"
1111Can you move to Urbit today and never look back? Not quite yet. Urbit is still young.
1212
1313
14−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/project-history/project-status-landscape-earth%402x.png">
14+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/project-history/project-status-landscape-earth%402x.png">
1515
1616Currently, Urbit ID is live and deployed. That means you can own a piece of Urbit — if you can find one. There are thousands of people that can potentially invite you, and we give away invites from time to time. Your Urbit ID gets you a name, a sigil, and access to Urbit OS.
1717
18−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/project-history/project-status-bridge%402x.png">
18+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/project-history/project-status-bridge%402x.png">
1919
2020You can interact with your Urbit ID and invite friends using [Bridge](https://bridge.urbit.org), the Urbit authentication system. You can also use Bridge to boot the current alpha of Urbit OS. Soon you’ll be able to use Bridge for payments and to explore the Urbit network.
2121
22−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/project-history/project-status-landscape%402x.png">
22+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/project-history/project-status-landscape%402x.png">
2323
2424Urbit OS is a solid alpha. We use it every day to coordinate and chat about the future of Urbit. You’re [welcome to join](@/using/install.md). Our standards are high, so we aren’t asking everyone to use Urbit OS yet. If you’re someone who wants to customize their own software and experiment with a new system, [check it out](@/using/install.md). Otherwise, [join the mailing list](https://urbit.us11.list-manage.com/subscribe/post?u=972a03db9e0c6c25bb58de8c8&amp;id=be143888d2). We have exciting things planned for 2020.
2525
content/understanding-urbit/simple-durable-yours.md+1−1
@@ -20,7 +20,7 @@ We spend all our time switching between services, juggling logins and different
2020
2121If computers are going to be a part of our lives for generations to come, we need a sound foundation for them. We need a _system_, not a grab bag of apps and services. Urbit is that system.
2222
23−<img class="ba mv5" src="https://media.urbit.org/site/understanding-urbit/simple-durable-yours/simple-durable-yours-rock%402x.png">
23+<img class="ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/simple-durable-yours/simple-durable-yours-rock%402x.png">
2424
2525We built Urbit from scratch to be a system that’s simple, durable, and yours. Everything that computing today is not — but should be.
2626
content/understanding-urbit/technical-overview.md+1−1
@@ -28,7 +28,7 @@ As a compliment to Urbit ID, we implemented the [Urbit HD wallet](https://github
2828
2929Until Urbit OS is completely secure (in the next year or so, we hope), you can interact with Urbit ID through a standalone, browser-based interface called [Bridge](https://bridge.urbit.org). Bridge lets you securely manage your keys, transfer your Urbit ID, log in to Urbit OS, and so on.
3030
31−<img class="ba mv5" src="https://media.urbit.org/site/understanding-urbit/technical-overview/technical-overview-kernel@2x.png">
31+<img class="ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/technical-overview/technical-overview-kernel@2x.png">
3232
3333In the simplest terms, Urbit OS is three things: a file, a key, and a program. The file is a log of everything that has ever happened to your Urbit. The key is derived from the same key you own your Urbit ID with.
3434
content/understanding-urbit/urbit-id.md+4−16
@@ -14,7 +14,7 @@ Every time you post a comment, like something, send a message, or use any app or
1414
1515We don’t like being owned by someone else. We think your identity and wallet should feel like a unique and precious object that you can always carry with you. So we built Urbit ID.
1616
17−<img class="ba mv5" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-cards%402x.png">
17+<img class="ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-cards%402x.png">
1818
1919Urbit ID is meant to feel like a civilizational key. If your Urbit ID were a piece of hardware, you could tap it to unlock a door, swipe it to buy a coffee, and plug it into any computer to log in. It’s a unique, beautiful object that’s both an address and a wallet. It’s a key to a secret club and the ticket to your digital life.
2020
@@ -28,7 +28,7 @@ Urbit ID is a completely separate system from Urbit OS. It’s finished and depl
2828
2929For those curious to understand Urbit ID a bit better, we’ll cover the basics of how Urbit ID works.
3030
31−<img class="ba mv5" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-paperwallet%402x.png">
31+<img class="ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-paperwallet%402x.png">
3232
3333
3434Your Urbit ID is a short, memorable address that anyone can use to connect with you that *doesn’t* depend on any company. It’s an address you own completely and can keep forever.
@@ -47,18 +47,6 @@ First, there are only so many Urbit IDs, so they cost something. Since they cost
4747
4848<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-address-space-1.svg">
4949
50−<!-- <table class="w-100 w-80-xl m0a f5 pt4 mono">
51−<tr><td>2<sup>8</sup> </td><td> <code>256</code> <span class="fr">galaxies</span></td></tr>
52−<tr><td>2<sup>16</sup></td><td> <code>65,536</code> <span class="fr">stars</span></td></tr>
53−<tr><td>2<sup>32</sup></td><td> <code>4,294,967,296</code> <span class="fr">planets</span></td></tr>
54−<tr><td>2<sup>64</sup></td><td> <code>rly big number</code> <span class="fr">moons</span></td></tr>
55−</table>
56−
57−<table class="w-100 w-80-xl m0a pt4 pb4 f5 mono">
58−<tr><td>1 galaxy</td><td><span class="fl"> =</span> <span class="fr"><code>2<sup>8</sup> (256)</code> stars</span></td></tr>
59−<tr><td>1 star</td><td><span class="fl"> =</span><span class="fr"><code>2<sup>16</sup> (65K)</code> planets</span></td></tr>
60−<tr><td>1 planet</td><td><span class="fl"> =</span><span class="fr"><code>2<sup>32</sup> (4B)</code> moons</span></td></tr>
61−</table> -->
6250
6351Second, Urbit IDs are distributed by a sponsorship tree. Each sponsor issues a fixed number of addresses. Since there are lots of sponsors, there are lots of ways to get an Urbit ID — not just one central authority.
6452
@@ -70,10 +58,10 @@ Finally, galaxies form a senate that can upgrade the logic of the Urbit ID syste
7058
7159Urbit ID isn’t just a design. It’s [live and deployed](https://azimuth.network) to the Ethereum blockchain.
7260
73−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-sigils%402x.png">
61+<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-sigils%402x.png">
7462
7563Urbit IDs are digital property, and we think of the entire address space of Urbit IDs as a vast territory of digital land.
7664
7765The scarcity tree of Urbit ID address space drives decentralization even while the project is young, which is great. If Urbit ID is going to last a long time and succeed as neutral infrastructure, it has to be owned and controlled by a wide variety of people.
7866
79−When we launched the Urbit ID system, in January of 2019, there were a few thousand different star and galaxy holders – stewards of this digital land. Since then, that number is on the rise.
67+When we launched the Urbit ID system, in January of 2019, there were a few thousand different star and galaxy holders – stewards of this digital land. Since then, that number is on the rise.
content/understanding-urbit/your-last-computer.md+3−3
@@ -13,13 +13,13 @@ This whole ‘simple, durable, yours’ thing may sound good, but what does it a
1313First, let’s talk about what it should feel like in the future.
1414
1515
16−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/your-last-computer/your-last-computer-waves%402x.png">
16+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/your-last-computer/your-last-computer-waves%402x.png">
1717
1818Imagine that you can login from anywhere with one simple, memorable name and password. And when you do, an entire OS appears for you. Inside is your whole digital life. Every conversation you’ve ever had, all your biometric data — every step and heartbeat. Your personal mesh of devices: your doors, your car, your irrigation. All of your communities, every message you’ve shared with friends and family. Every connection you’ve made and every archival piece of data, in one place. Secure and private, forever.
1919
2020You own and control this OS completely. Your system doesn’t live on someone else’s server, so there’s no risk of leaking it in a mass data breach or losing it when a service shuts down. Your Urbit is a sealed, secure, and durable system.
2121
22−<img class="ba mv5" src="https://media.urbit.org/site/understanding-urbit/your-last-computer/your-last-computer-is-rock%402x.png">
22+<img class="ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/your-last-computer/your-last-computer-is-rock%402x.png">
2323
2424We’re on our way to this future, building it step by step, but we’re not there yet. The Urbit of today is much more stripped down.
2525
@@ -33,6 +33,6 @@ It’s a simple system for intentional digital communities. A first step away fr
3333
3434We think that a new system like this, even in a simple form, will be a relief from the chaos of the current web. Think of it as a “back to the land” computing movement. If we’re ever going to build new digital cities, they’ll have to start as a few colonies on the frontier.
3535
36−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/your-last-computer/your-last-computer-ocean%402x.png">
36+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/your-last-computer/your-last-computer-ocean%402x.png">
3737
3838Your Urbit is a simpler computer, a quieter computer, a more private computer. We want it to feel predictable, safe, and reliable — things only a complete, sealed system can do. This, we hope, can get us a world where technology keeps us connected, but doesn’t dominate our lives.
templates/partials/navigation-docs.html+1−1
@@ -6,7 +6,7 @@
66 <a href="{{config.base_url}}/docs/">
77 Documentation
88 </a>
9− <button id="js-search-window-toggle" class="mt2 mb4" type="button" style="outline:none">
9+ <button id="js-search-window-toggle" class="mt2 mb4 dn db-m db-l db-xl" type="button" style="outline:none">
1010 <span id="search-icon" class="f3 gray3">⚲</span><span class="ml3 gray2">Search</span>
1111 </button>
1212 <ul>
templates/partials/pagination.html+25−25
@@ -1,14 +1,14 @@
11<footer class="relative mt4">{% if page.earlier %}
22 <a class="bb-0" href="{{page.earlier.permalink}}">
3− <nav class="previous mv5 absolute right-1 t-right">
3+ <nav class="previous absolute right-1 t-right">
44 {% if page.extra.hide_previous_title %} {% else %}<p class="mb0 f5">Previous Post:</p>{% endif %}
55 <p {% if page.extra.flatten_pagination %}
6− data-flat="true"
7− class="
6+ data-flat="true"
7+ class="mt5 mb6
88 {% else %}
9− class="fw6 f5 f4-l f4-xl
9+ class="mt0 mb0 fw6 f5
1010 {% endif %}
11− mb0 mt0">{{page.earlier.title}}</p>
11+ ">{{page.earlier.title}}</p>
1212 <time class="mono db f5 mb5">{{page.earlier.date | date(format="~%Y.%-m.%-d") }}</time>
1313 </nav>
1414 </a>
@@ -16,43 +16,43 @@
1616 {% elif page.heavier and not page.extra.hidenext %}
1717
1818 <a class="bb-0" href="{{page.heavier.permalink}}">
19− <nav class="previous mv5 absolute right-1 t-right">
19+ <nav class="previous absolute right-1 t-right">
2020 {% if page.extra.hide_next_title %} {% else %}<p class="mb0 f5">Next Post:</p>{% endif %}
2121 <p {% if page.extra.flatten_pagination %}
22− data-flat="true"
23− class="
22+ data-flat="true"
23+ class="mt5 mb6
2424 {% else %}
25− class="fw6 f5 f4-l f4-xl
25+ class="mt0 mb0 fw6 f5
2626 {% endif %}
27− mb0 mt0">{{page.heavier.title}}</p>
27+ mt5 mb6">{{page.heavier.title}}</p>
2828 </nav>
2929 </a>
3030 {% endif %}
3131
3232 {% if page.relative_path == "understanding-urbit/simple-durable-yours.md" %}
3333 <a class="bb-0" href="/understanding-urbit/">
34− <nav class="next mv5 absolute left-1 t-left">
34+ <nav class="next absolute left-1 t-left">
3535 <p {% if page.extra.flatten_pagination %}
36− data-flat="true"
37− class="
36+ data-flat="true"
37+ class="mt5 mb6
3838 {% else %}
39− class="fw6 f5 f4-l f4-xl
39+ class="mt0 mb0 fw6 f5
4040 {% endif %}
41− mb0 mt0">Introduction</p>
41+ mt5 mb6">Introduction</p>
4242 </nav>
4343 </a>
4444 {% elif page.later %}
4545
4646 <a class="bb-0" href="{{page.later.permalink}}">
47− <nav class="next mv5 absolute left-1">
47+ <nav class="next absolute left-1">
4848 {% if page.extra.hide_next_title %} {% else %}<p class="mb0 f5">Next Post:</p>{% endif %}
4949 <p {% if page.extra.flatten_pagination %}
50− data-flat="true"
51− class="
50+ data-flat="true"
51+ class="mt5 mb6
5252 {% else %}
53− class="fw6 f5 f4-l f4-xl
53+ class="mt0 mb0 fw6 f5
5454 {% endif %}
55− mb0 mt0">{{page.later.title}}</p>
55+ mt5 mb6">{{page.later.title}}</p>
5656 <time class="mono db f5 mb5">{{page.later.date | date(format="~%Y.%-m.%-d") }}</time>
5757 </nav>
5858 </a>
@@ -61,15 +61,15 @@
6161 {% elif page.lighter and not page.extra.hideprevious %}
6262
6363 <a class="bb-0" href="{{page.lighter.permalink}}">
64− <nav class="next mv5 absolute left-1">
64+ <nav class="next absolute left-1">
6565 {% if page.extra.hide_previous_title %} {% else %}<p class="mb0 f5">Previous Post:</p>{% endif %}
6666 <p {% if page.extra.flatten_pagination %}
67− data-flat="true"
68− class="
67+ data-flat="true"
68+ class="mt5 mb6
6969 {% else %}
70− class="fw6 f5 f4-l f4-xl
70+ class="mt0 mb0 fw6 f5
7171 {% endif %}
72− mb0 mt0">{{page.lighter.title}}</p>
72+ mt5 mb6">{{page.lighter.title}}</p>
7373 </nav>
7474 </a>
7575 {% endif %}
templates/understanding-urbit/list.html+8−8
@@ -11,10 +11,10 @@
1111
1212 {% include "partials/navigation-search.html" %}
1313
14− <li class="dn mw5-xl mw5-l db-xl page-indiced mv2"><a class="fw6 f6" href="/understanding-urbit/">Introduction</a></li>
15− {% set posts = get_section(path="understanding-urbit/_index.md") %}
16− {% for directorypage in posts.pages %}
17− <li class="dn mw5-xl mw5-l db-xl page-indiced mv2"><a class="f6" href="{{directorypage.permalink}}">{{directorypage.title}}</a></li>
14+ <li class="dn mw5-xl mw5-l db-xl page-indiced mv2"><a class="fw6 f6" href="/understanding-urbit/">Introduction</a></li>
15+ {% set posts = get_section(path="understanding-urbit/_index.md") %}
16+ {% for directorypage in posts.pages %}
17+ <li class="dn mw5-xl mw5-l db-xl page-indiced mv2"><a class="f6" href="{{directorypage.permalink}}">{{directorypage.title}}</a></li>
1818 {% endfor %}
1919
2020</nav>
@@ -35,9 +35,9 @@
3535 <img class="full c7-10-lg row-1 mt0 mb2 mb4-xl w-100 ba" src="https://storage.googleapis.com/media.urbit.org/site/understanding-urbit/intro/intro-3.svg" alt="An Urbit ship with its previous versions in a lifetime archive" />
3636</section>
3737<section class="full-bleed full grid12">
38− <p class="full c4-7-lg mt0 mb4 mb2-xl lh-copy">You own your Urbit like you own Bitcoin.
38+ <p class="full c4-7-lg mt0 mb6 mb2-xl lh-copy">You own your Urbit like you own Bitcoin.
3939 Each Urbit is a piece of a new network that’s owned and controlled by its users.</p>
40− <img class="full c7-10-lg row-1 mt0 mb7 mb7-xl w-100 ba" src="https://storage.googleapis.com/media.urbit.org/site/understanding-urbit/intro/intro-4.svg" alt="An Urbit ship communicating with other ships" />
40+ <img class="full c7-10-lg row-1 mt0 mb2 mb7-xl w-100 ba" src="https://storage.googleapis.com/media.urbit.org/site/understanding-urbit/intro/intro-4.svg" alt="An Urbit ship communicating with other ships" />
4141</section>
4242 <section id="megacorp" class="full full-bleed grid12 bg-black">
4343 <img class="full c4-10-lg mt7" src="https://storage.googleapis.com/media.urbit.org/site/understanding-urbit/intro/intro-5.jpg"/>
@@ -55,8 +55,8 @@
5555 {% set posts = get_section(path="understanding-urbit/_index.md") %}
5656 {% for directorypage in posts.pages | slice (end=1) %}
5757 <a class="bb-0" href="{{directorypage.permalink}}">
58− <nav class="previous mv5 absolute right-2 t-right">
59− <p data-flat="true" class="mb0 mt0">{{directorypage.title}}</p>
58+ <nav class="previous absolute right-2 t-right">
59+ <p data-flat="true" class="mt5 mb6">{{directorypage.title}}</p>
6060 </nav>
6161 </a>
6262 {% endfor %}
templates/understanding-urbit/post.html−2
@@ -50,10 +50,8 @@
5050 {% endif %}
5151
5252 <article class="mb4 full grid12">
53− <div class="measure-wide">
5453 {{ page.content | safe }}
5554
5655 {% include "partials/pagination.html" %}
57− </div>
5856 </article>
5957{% endblock content %}