git.iko.soy/urbit.org
on master help sign in
Merge branch 'urbit.org2' of github.com:urbit/urbit.org into urbit.org2
a28cef3Matilde Park
content/understanding-urbit/urbit-id.md+1−1
compare with master
unifiedsplit
@@ -37,7 +37,7 @@ You can also call stars ‘infrastructure nodes’ and galaxies ‘governance no
37
37
38And that's it. It's a simple system. What's important is why it is the way it is. Let's take a look at that.
38And that's it. It's a simple system. What's important is why it is the way it is. Let's take a look at that.
39
39
40−![](https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-address-space-1.svg")
40+![](https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-address-space-1.svg)
41
41
42At a high level, there are three important things to understand about the overall Urbit ID system design.
42At a high level, there are three important things to understand about the overall Urbit ID system design.
43
43
content/understanding-urbit/urbit-os.md+1−1
@@ -39,7 +39,7 @@ The entire Urbit OS stack, from programming language to applications, is upgrade
39
39
40Since Nock is a protocol for computing itself, any two nodes on the Urbit network can easily share data, communicate and connect their software. 20th century systems could never do this without a MEGACORP acting as the intermediary.
40Since Nock is a protocol for computing itself, any two nodes on the Urbit network can easily share data, communicate and connect their software. 20th century systems could never do this without a MEGACORP acting as the intermediary.
41
41
42−![](https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-diagram-apart.svg")
42+![](https://media.urbit.org/site/understanding-urbit/network-os/urbit-os-diagram-apart.svg)
43
43
44On top of this tiny VM we built a self-hosting, purely functional programming language, a kernel written in that language and a set of kernel modules that serve all the needs of personal computing. Specifically: a filesystem, build system, application sandbox, secret storage, web server, terminal driver and a networking protocol.
44On top of this tiny VM we built a self-hosting, purely functional programming language, a kernel written in that language and a set of kernel modules that serve all the needs of personal computing. Specifically: a filesystem, build system, application sandbox, secret storage, web server, terminal driver and a networking protocol.
45
45
pages/events.js+2−4
@@ -91,9 +91,7 @@ export default function Events({ pastEvents, comingSoon, search }) {
91 {comingSoon.length > 0 ? (
91 {comingSoon.length > 0 ? (
92 <>
92 <>
93 <div className="mb-8 table">
93 <div className="mb-8 table">
94− <span className="bg-green text-white badge-lg">
95− Coming Soon
94+ <h3 class="text-gray">Coming Soon</h3>
96− </span>
97 </div>
95 </div>
98 {comingSoon.map((post) => {
96 {comingSoon.map((post) => {
99 return <EventCard event={post} />;
97 return <EventCard event={post} />;
@@ -101,7 +99,7 @@ export default function Events({ pastEvents, comingSoon, search }) {
101 </>
99 </>
102 ) : null}
100 ) : null}
103 <div className="mb-8 table">
101 <div className="mb-8 table">
104− <span className="bg-wall text-gray badge-lg">Past Events</span>
102+ <h3 class="text-gray">Past Events</h3>
105 </div>
103 </div>
106 {pastEvents.map((post) => {
104 {pastEvents.map((post) => {
107 return <EventCard event={post} />;
105 return <EventCard event={post} />;