git.iko.soy/urbit.org
on master help sign in
Merge branch 'next-slim' of github.com:urbit/urbit.org into next-slim
commit909ac3df2647e5b991d00a63d91a4cccda552e30 authoré <edouard@urcad.es> dateMon 14 Oct 2019, 16:15 (7 years ago) parentc18af5916bd601
12 files changed+37−34
compare with master
unifiedsplit
content/docs+1−1 content/understanding-urbit/network-and-os.md+2−2 content/understanding-urbit/project-history.md+3−3 content/understanding-urbit/simple-durable-yours.md+2−2 content/understanding-urbit/technical-overview.md+2−2 content/understanding-urbit/urbit-id.md+3−3 sass/_main.scss+2−1 templates/essays/list.html+5−5 templates/essays/post.html+2−2 templates/media/list.html+5−5 templates/understanding-urbit/post.html+1−1 templates/updates/list.html+9−7
content/docs+1−1

Submodule changed.

content/understanding-urbit/network-and-os.md+2−2
@@ -18,7 +18,7 @@ The digital world feels like a theme park built to maximize ENGAGEMENT — but w
1818
1919While the world has drifted into a fever dream, we built Urbit.
2020
21−<img class="mv5 ba" src="https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-diagram.svg">
21+<img class="mv5 ba w-100" src="https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-diagram.svg">
2222
2323Your Urbit ID gets you a name, an address, and a crypto wallet — but what about when you want to connect with other people? That’s where Urbit OS comes in.
2424
@@ -26,7 +26,7 @@ Urbit OS is everything that you need to build and run your own social software a
2626
2727Since we’ve got a decentralized identity system to build on and everyone runs their own OS, your social software is actually owned and operated by the collective of Urbit ID owners. You can (and should) do whatever you want.
2828
29−<img class="mv5 ba" src="https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-diagram-apart.svg">
29+<img class="mv5 ba w-100" src="https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-diagram-apart.svg">
3030
3131We built Urbit OS from scratch. It’s a completely new computing stack. Without getting into the technical details (you can find those [here](@/understanding-urbit/technical-overview.md)), Urbit OS is built to do three things: be a compact and complete system (simple); run forever with no maintenance (durable); and be extensible by anyone (yours).
3232
content/understanding-urbit/project-history.md+3−3
@@ -25,14 +25,14 @@ Urbit OS is a solid alpha. We use it every day to coordinate and chat about the
2525
2626Urbit OS isn’t just an interface — it’s a complete system. You should also check out the [GitHub repository](https://github.com/urbit/urbit), our [open grants program](https://grants.urbit.org) and the [documentation](@/docs/_index.md). Building a system from scratch is a huge and enormously fun undertaking. There’s a lot going on, and we do all our development in public. Systems programmers, functional programming nerds, anyone who wants to tinker with their software will probably love playing with Urbit.
2727
28−<img class="mv5" src="https:///media.urbit.org/site/understanding-urbit/project-history/history-4.svg">
28+<img class="mv5 w-100" src="https:///media.urbit.org/site/understanding-urbit/project-history/history-4.svg">
2929
3030At the beginning, Urbit was just a few people with the right combination of imagination and discipline to try to rebuild computing. Now it's a community of thousands of address space holders, dozens of open source developers, at least two independent companies ([Tlon](https://tlon.io) — which works mostly on kernel development and interface design, and [urbit.live](https://urbit.live) — which is building services on the platform), and who knows how many fans.
3131
3232**History**
3333
34−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/project-history/project-history-05.svg">
34+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/project-history/project-history-05.svg">
3535
3636**Roadmap**
3737
38−<img class="mv5" src="https://media.urbit.org/site/understanding-urbit/project-history/project-history-06.svg">
38+<img class="mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/project-history/project-history-06.svg">
content/understanding-urbit/simple-durable-yours.md+2−2
@@ -13,7 +13,7 @@ We live in a world dense with computers. We wake up and look at them, we see the
1313But our computers are a mess.
1414
1515
16−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/simple-durable-yours/simple-durable-yours-notifications.svg">
16+<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/simple-durable-yours/simple-durable-yours-notifications.svg">
1717
1818
1919We spend all our time switching between services, juggling logins and different interfaces. And once we’re logged in, the services we use harvest our data, spy on us, and often shut down with little warning.
@@ -44,7 +44,7 @@ Your Urbit is designed to be durable: both to store your data across generations
4444
4545Finally, your Urbit belongs to you in every possible way. You own it with a private key, control it completely, and can inspect its source code. We want your Urbit to be your digital home. A home you don’t own is just a hotel room.
4646
47−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/simple-durable-yours/simple-durable-yours-evolution.svg">
47+<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/simple-durable-yours/simple-durable-yours-evolution.svg">
4848
4949Urbit began as a sketch, driven from a basic intuition that a better platform could be built. Today, Urbit is two components: Urbit ID, an identity system that’s already live on Ethereum; and Urbit OS, a decentralized network and OS stack that’s young but working well.
5050
content/understanding-urbit/technical-overview.md+2−2
@@ -12,11 +12,11 @@ hide_previous_title = "true"
1212
1313Owning a computer, especially a server, can feel like a job. Urbit, on the other hand, is engineered to be maintenance free. We figure that if people are actually going to use a new computing platform, it can’t feel like work. At all.
1414
15−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/technical-overview/technical-overview-server.svg">
15+<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/technical-overview/technical-overview-server.svg">
1616
1717So we built our whole stack, starting with the VM, to be as simple and compact as possible. Let’s take a look at what the system looks like from a technical perspective and get a feel for how it’s built.
1818
19−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/technical-overview/technical-overview-duo.svg">
19+<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/technical-overview/technical-overview-duo.svg">
2020
2121Under the hood, Urbit is two parts: an ID system and an OS. The ID system is live and deployed to Ethereum. The OS is a program that runs on top of any Unix machine with an internet connection.
2222
content/understanding-urbit/urbit-id.md+3−3
@@ -10,7 +10,7 @@ hide_previous_title = "true"
1010
1111Every time you post a comment, like something, send a message, or use any app or service, you need an account. (And, behind the scenes, a network address.) Neither of these things belongs to you. The way things are going, they never will. No matter what you’re up to with your phone or laptop, you’re dependent on MEGACORP.
1212
13−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-megacorp.svg">
13+<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-megacorp.svg">
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
@@ -37,7 +37,7 @@ For most people, an Urbit ID looks something like `~tinbel-picpel`. You own it w
3737
3838Your Urbit ID and passkey are all you need to log into Urbit OS and send and receive crypto payments. Together, they’re a simple keypair that are easily memorizable. We think it’s the perfect form factor for ordinary people to take control of their digital lives.
3939
40−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-address-space-2.svg">
40+<img class="b—black ba mv5 w-100" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-address-space-2.svg">
4141
4242We want everyone to own their own identity and wallet. One way to do this would be to build a MEGACORP or a State Department of Urbit. But we prefer decentralized, collectively owned systems. So that’s what we built. Let’s look briefly at how that system works.
4343
@@ -45,7 +45,7 @@ At a high level, there are three important things to understand about the overal
4545
4646First, there are only so many Urbit IDs, so they cost something. Since they cost something, people are less likely to use them to spam or abuse the network. And, when you meet a stranger with an Urbit ID you know they have some skin in the game.
4747
48−<img class="b—black ba mv5" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-address-space-1.svg">
48+<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
5050<!-- <table class="w-100 w-80-xl m0a f5 pt4 mono">
5151<tr><td>2<sup>8</sup> </td><td> <code>256</code> <span class="fr">galaxies</span></td></tr>
sass/_main.scss+2−1
@@ -191,6 +191,7 @@ body.essay {
191191 }
192192 article > *:not(figure):not(picture) {
193193 grid-area: auto / 4 / auto / 10;
194+ @extend .measure-wide;
194195 }
195196}
196197
@@ -244,7 +245,7 @@ h4 {
244245
245246 // author and ship styling
246247span[rel=author] {
247− @extend .fw6;
248+ @extend .fw4;
248249 margin-right: 5px;
249250}
250251
templates/essays/list.html+5−5
@@ -12,15 +12,15 @@
1212</nav>
1313<!-- content -->
1414<article class="mt4 mb4 c1-12 c4-12-lg">
15− <ul class="posts">
15+ <ul class="posts measure-wide">
1616 {% set posts = get_section(path="blog/_index.md") %}
1717 {% for page in posts.pages %}
1818 <li class="mb4">
19− <h2 class="f4 fw4 mt0 mb0"><a class="bb-0" href="{{ page.permalink }}">{{ page.title }}</a></h2>
19+ <h2 class="f5 fw6 mt0 mb1"><a class="bb-0" href="{{ page.permalink }}">{{ page.title }}</a></h2>
2020 <p class="mt0">{{ page.description }}</p>
21− <time class="mono f5">{{ page.date | date(format="~%Y.%-m.%-d") }}</time>
22− <span class="mono f5">
23− {% if page.extra.ship %}<address class="mono f5 ml2">{{ page.extra.ship }}</address> {% endif %}
21+ <time class="mono f7">{{ page.date | date(format="~%Y.%-m.%-d") }}</time>
22+ <span class="mono f7">
23+ {% if page.extra.ship %}<address class="mono f7 ml2">{{ page.extra.ship }}</address> {% endif %}
2424 </span>
2525 </li>
2626 {% endfor %}
templates/essays/post.html+2−2
@@ -28,7 +28,7 @@
2828
2929<h1 class="mb4 full mt4 c4-12-lg fw6">{{ page.title }}</h1>
3030{% if page.extra.author %}
31−<span class="dib full c4-12-lg" rel="author"> {{ page.extra.author }}
31+<span class="dib full c4-12-lg " rel="author"> {{ page.extra.author }}
3232 {% if page.extra.ship %}
3333 <address class="dib fw4 ml2 mono">{{ page.extra.ship }}</address>
3434{% endif %}
@@ -41,7 +41,7 @@
4141<span class="dib mono full c4-12-lg{% if page.date %} ml2{% endif %} gray2 f5">{{ page.reading_time }}m read</span>
4242{% endif %}
4343
44−<article class="mb4 full grid12">
44+<article class="mb4 full grid12 ">
4545 {{ page.content | safe }}
4646 {% include "partials/pagination.html" %}
4747</article>
templates/media/list.html+5−5
@@ -11,7 +11,7 @@
1111 {% include "partials/navigation-search.html" %}
1212</nav>
1313<!-- content -->
14−<article class="mt4 mb4 c1-12 c4-10-lg">
14+<article class="mt4 mb4 c1-12 c4-10-lg measure-wide">
1515 <ul class="posts">
1616 {% set posts = get_section(path="media/_index.md") %}
1717 {% for page in posts.pages %}
@@ -37,11 +37,11 @@
3737 src="{{page.extra.soundcloud}}">
3838 </iframe>
3939 {% endif %}
40− <h2 class="f4 fw4 mt0 mb0"><a class="bb-0" href="{{ page.permalink }}">{{ page.title }}</a></h2>
40+ <h2 class="f5 fw6 mt0 mb1"><a class="bb-0" href="{{ page.permalink }}">{{ page.title }}</a></h2>
4141 <p class="mt0">{{ page.description }}</p>
42− <span class="mono f5">{{ page.date | date(format="~%Y.%-m.%-d") }}</span>
43− <span class="mono f5">
44− {% if page.extra.ship %}<span class="mono f5 ml2">{{ page.extra.ship }}</span> {% endif %}
42+ <span class="mono f7">{{ page.date | date(format="~%Y.%-m.%-d") }}</span>
43+ <span class="mono f7">
44+ {% if page.extra.ship %}<span class="mono f7 ml2">{{ page.extra.ship }}</span> {% endif %}
4545 </span>
4646 </li>
4747 {% endfor %}
templates/understanding-urbit/post.html+1−1
@@ -50,7 +50,7 @@
5050 {% endif %}
5151
5252 <article class="mb4 full grid12">
53− <div class="measure">
53+ <div class="measure-wide">
5454 {{ page.content | safe }}
5555
5656 {% include "partials/pagination.html" %}
templates/updates/list.html+9−7
@@ -12,7 +12,7 @@
1212 {% include "partials/navigation-search.html" %}
1313</nav>
1414<!-- content -->
15−<main class="mt4 mb4 c1-12 c4-10-lg">
15+<main class="mt4 mb4 c1-12 c4-10-lg measure-wide">
1616
1717 {% set posts = get_section(path="updates/_index.md") %}
1818
@@ -38,14 +38,16 @@
3838 <ul class="posts">
3939 {% for page in posts.pages | slice (start=1) %}
4040 <li class="mb4 mt4">
41− <h2 class="f4 fw4">
41+ <!-- <h2 class="f5 fw6">
4242 <a class="bb0" href="{{ page.permalink }}">{{ page.title }}</a>
43− </h2>
44− <p class="mv2">{{ page.description }}</p>
45− <time class="mono f5">{{ page.date | date(format="~%Y.%-m.%-d") }}</time>
46− <span class="mono f5">
43+ </h2> -->
44+ <a class="bb0" href="{{ page.permalink }}">
45+ <p class="mv2">{{ page.description }}</p>
46+ </a>
47+ <time class="mono f7">{{ page.date | date(format="~%Y.%-m.%-d") }}</time>
48+ <span class="mono f7">
4749 {% if page.extra.ship %}
48− <address class="mono f5 ml2">{{ page.extra.ship }}</address>
50+ <address class="mono f7 ml2">{{ page.extra.ship }}</address>
4951 {% endif %}
5052 </span>
5153 </li>