on master help sign in
Merge branch 'next-slim' of github.com:urbit/urbit.org into chore/lint
6fd41f2Gavin Atkinson
sass/_main.scss+14−14
@@ -8,31 +8,31 @@
8 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-extralight.woff");
8 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-extralight.woff");
9 font-weight: 200;
9 font-weight: 200;
10 }
10 }
11−
11+
12 @font-face {
12 @font-face {
13 font-family: "Source Code Pro";
13 font-family: "Source Code Pro";
14 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-light.woff");
14 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-light.woff");
15 font-weight: 300;
15 font-weight: 300;
16 }
16 }
17−
17+
18 @font-face {
18 @font-face {
19 font-family: "Source Code Pro";
19 font-family: "Source Code Pro";
20 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-regular.woff");
20 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-regular.woff");
21 font-weight: 400;
21 font-weight: 400;
22 }
22 }
23−
23+
24 @font-face {
24 @font-face {
25 font-family: "Source Code Pro";
25 font-family: "Source Code Pro";
26 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-medium.woff");
26 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-medium.woff");
27 font-weight: 500;
27 font-weight: 500;
28 }
28 }
29−
29+
30 @font-face {
30 @font-face {
31 font-family: "Source Code Pro";
31 font-family: "Source Code Pro";
32 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-bold.woff");
32 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-bold.woff");
33 font-weight: 600;
33 font-weight: 600;
34 }
34 }
35−
35+
36 @font-face {
36 @font-face {
37 font-family: "Source Code Pro";
37 font-family: "Source Code Pro";
38 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-black.woff");
38 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-black.woff");
@@ -51,7 +51,7 @@ body {
51
51
52nav {
52nav {
53 font-size: 1rem;
53 font-size: 1rem;
54− line-height: 1.33;
54+ line-height: 1.33;
55 // If you need to flush the nav to break
55 // If you need to flush the nav to break
56 // the body's margin, use this:
56 // the body's margin, use this:
57 &.full-left {
57 &.full-left {
@@ -139,7 +139,7 @@ footer nav {
139 }
139 }
140}
140}
141
141
142−// essay template
142+// essay template
143
143
144body.essay {
144body.essay {
145 h1 {
145 h1 {
@@ -337,11 +337,11 @@ input[type="search"] {
337 }
337 }
338 }
338 }
339 }
339 }
340−
340+
341 .search-results {
341 .search-results {
342 max-height: 400px;
342 max-height: 400px;
343 ul {
343 ul {
344− position: relative;
344+ position: relative;
345 }
345 }
346 &__item a:hover {
346 &__item a:hover {
347 background: #F9F9F9;
347 background: #F9F9F9;
@@ -358,7 +358,7 @@ input[type="search"] {
358 .glossary-results__item {
358 .glossary-results__item {
359 padding: 0 1rem 0 1rem;
359 padding: 0 1rem 0 1rem;
360 &:hover {
360 &:hover {
361− background-color: #F9F9F9;
361+ background-color: #F9F9F9;
362 }
362 }
363 }
363 }
364
364
@@ -481,7 +481,7 @@ nav.docs:not(.mobile) {
481}
481}
482nav.docs details {
482nav.docs details {
483 summary {
483 summary {
484− @extend .fw4, .black, .mt2;
484+ @extend .fw4, .black, .mt2;
485 }
485 }
486 & > summary::before {
486 & > summary::before {
487 content: "› ";
487 content: "› ";
@@ -505,10 +505,10 @@ nav.docs details {
505
505
506.video-container {
506.video-container {
507 position: relative;
507 position: relative;
508− padding-bottom: 56.25%;
508+ padding-bottom: 56.25vw;
509 padding-top: 30px; height: 0; overflow: hidden;
509 padding-top: 30px; height: 0; overflow: hidden;
510}
510}
511−
511+
512.video-container iframe,
512.video-container iframe,
513.video-container object,
513.video-container object,
514.video-container embed {
514.video-container embed {
@@ -532,4 +532,4 @@ hr {
532
532
533.scroll-smooth {
533.scroll-smooth {
534 scroll-behavior: smooth;
534 scroll-behavior: smooth;
535−}
535+}
templates/index.html+2−4
@@ -16,13 +16,10 @@ style=" z-index: 2;">
16Urbit is your last computer.
16Urbit is your last computer.
17</h1>
17</h1>
18
18
19−<section class="full w-100 video-container bg-black full-bleed relative" id="video" style="
19+<section class="full video-container bg-black full-bleed relative" id="video" style="
20− width: 130%;
21− margin-left: -20%;
22">
20">
23 <iframe src="https://player.vimeo.com/video/365181756?background=1"
21 <iframe src="https://player.vimeo.com/video/365181756?background=1"
24 class="w-100 ma0 h-100" frameborder="0" allow="autoplay;fullscreen" allowfullscreen="" style="
22 class="w-100 ma0 h-100" frameborder="0" allow="autoplay;fullscreen" allowfullscreen="" style="
25− height: 130%; z-index: 1;
26"></iframe>
23"></iframe>
27</section>
24</section>
28
25
@@ -69,6 +66,7 @@ Urbit is your last computer.
69 <p class="lh-copy mt1">For a quick explanation of what Urbit is and how Urbit works, see the <a href="/understanding-urbit">introduction</a>.
66 <p class="lh-copy mt1">For a quick explanation of what Urbit is and how Urbit works, see the <a href="/understanding-urbit">introduction</a>.
70 If you're more technical, feel free to skip ahead to the <a href="/understanding-urbit/technical-overview">technical overview.</a></p>
67 If you're more technical, feel free to skip ahead to the <a href="/understanding-urbit/technical-overview">technical overview.</a></p>
71 <ul class="full c4-7-lg">
68 <ul class="full c4-7-lg">
69+ <li class="mt2"><a class="b--black bb" href="/understanding-urbit/">Introduction</a></li>
72 {% set posts = get_section(path="understanding-urbit/_index.md") %}
70 {% set posts = get_section(path="understanding-urbit/_index.md") %}
73 {% for page in posts.pages %}
71 {% for page in posts.pages %}
74 <li class="mt2"><a class="b--black bb" href="{{ page.permalink }}">{{ page.title }}</a></li>
72 <li class="mt2"><a class="b--black bb" href="{{ page.permalink }}">{{ page.title }}</a></li>
templates/partials/footer.html+8−9
@@ -1,11 +1,11 @@
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="c1-3-md c1-3-lg half-1 mt4">
3 <nav class="c1-3-md c1-3-lg half-1 mt4">
4− <h3 class="mt0 mb0 pt0 pb0">What is Urbit?</h3 class="mt0 mb0 pt0 pb0">
4+ <h3 class="mt0 mb0 pt0 pb0">Understanding Urbit</h3 class="mt0 mb0 pt0 pb0">
5− <li class="mt2"><a href="/understanding-urbit">Understanding Urbit</a></li>
6− <li class="mt2"><a href="/understanding-urbit/project-history">Project History</a></li>
7− <li class="mt2"><a href="/understanding-urbit/technical-overview">Technical Overview</a></li>
5+ <li class="mt2"><a href="/understanding-urbit">Introduction</a></li>
8 <li class="mt2"><a href="/understanding-urbit/urbit-id">Urbit ID</a></li>
6 <li class="mt2"><a href="/understanding-urbit/urbit-id">Urbit ID</a></li>
7+ <li class="mt2"><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>
9 </nav>
9 </nav>
10 <nav class="c3-5-md c3-5-lg half-2 mt4">
10 <nav class="c3-5-md c3-5-lg half-2 mt4">
11 <h3 class="mt0 mb0 pt0 pb0">Using Urbit</h3 class="mt0 mb0 pt0 pb0">
11 <h3 class="mt0 mb0 pt0 pb0">Using Urbit</h3 class="mt0 mb0 pt0 pb0">
@@ -19,7 +19,7 @@
19 <li class="mt2"><a href="/essays">Essays</a></li>
19 <li class="mt2"><a href="/essays">Essays</a></li>
20 <li class="mt2"><a href="/updates">Updates</a></li>
20 <li class="mt2"><a href="/updates">Updates</a></li>
21 <li class="mt2"><a href="/media">Media</a></li>
21 <li class="mt2"><a href="/media">Media</a></li>
22− <li class="mt2"><a href="/faq">FAQ and Concerns</a></li>
22+ <li class="mt2"><a href="/faq">FAQ</a></li>
23 </nav>
23 </nav>
24 <nav class="c7-9-md c7-9-lg half-2 mt4">
24 <nav class="c7-9-md c7-9-lg half-2 mt4">
25 <h3 class="mt0 mb0 pt0 pb0">Developers</h3 class="mt0 mb0 pt0 pb0">
25 <h3 class="mt0 mb0 pt0 pb0">Developers</h3 class="mt0 mb0 pt0 pb0">
@@ -34,7 +34,6 @@
34 <li class="mt2"><a href="https://groups.google.com/a/urbit.org/forum/#!forum/dev">urbit-dev</a></li>
34 <li class="mt2"><a href="https://groups.google.com/a/urbit.org/forum/#!forum/dev">urbit-dev</a></li>
35 <li class="mt2"><a href="/hoonschool">Hoon School ↗</a></li>
35 <li class="mt2"><a href="/hoonschool">Hoon School ↗</a></li>
36 <li class="mt2"><a href="https://www.meetup.com/urbit-sf/">Meetups</a></li>
36 <li class="mt2"><a href="https://www.meetup.com/urbit-sf/">Meetups</a></li>
37− <li class="mt2"><a href="https://www.threadless.com/discover/s/urbit">Merch</a></li>
38 </nav>
37 </nav>
39 <nav class="c11-13-md c11-13-lg half-2 mt4">
38 <nav class="c11-13-md c11-13-lg half-2 mt4">
40 <h3 class="mt0 mb0 pt0 pb0">Install Urbit</h3 class="mt0 mb0 pt0 pb0">
39 <h3 class="mt0 mb0 pt0 pb0">Install Urbit</h3 class="mt0 mb0 pt0 pb0">
@@ -49,9 +48,9 @@
49 <li class="mt2"><a href="/privacy#scope">Privacy Policy</a></li>
48 <li class="mt2"><a href="/privacy#scope">Privacy Policy</a></li>
50
49
51 <h2 class="mt4 mb3">Need Help?</h2>
50 <h2 class="mt4 mb3">Need Help?</h2>
52− <li class="mt2"><a href="mailto:support@urbit.org">support@urbit.org↗</a></li>
51+ <li class="mt2"><a href="mailto:support@urbit.org">support@urbit.org ↗</a></li>
53− <li class="mt2"><a href="https://twitter.com/urbit">twitter.com/urbit</a></li>
52+ <li class="mt2"><a href="https://discord.gg/bkEX6EU">Discord</a></li>
54− <li class="mt2"><a href="https://github.com/urbit">github.com/urbit</a></li>
53+ <li class="mt2"><a href="https://github.com/urbit">Github</a></li>
55 </nav>
54 </nav>
56 </section>
55 </section>
57</footer>
56</footer>
templates/shortcodes/oversize.html+1−1
@@ -1,3 +1,3 @@
1−<figure class="full mt4 mb4 c3-11-lg">
1+<figure class="c1-12 mt4 mb4 c3-11-lg">
2 <img src="{{url}}"/>
2 <img src="{{url}}"/>
3</figure>
3</figure>
templates/understanding-urbit/list.html+48−52
@@ -2,13 +2,18 @@
2{% block title %} Understanding Urbit {% endblock title %}
2{% block title %} Understanding Urbit {% endblock title %}
3{% block content %}
3{% block content %}
4<!-- header -->
4<!-- header -->
5−<nav class="mt4 full fourth-1-lg mb3 mb0-m mb0-l mb0-xl">
5+<nav class="mt4 full fourth-1-lg mb3 mb0-m mb0-l mb0-xl absolute-xl">
6 <a class="gray3" href="/">Urbit</a>
6 <a class="gray3" href="/">Urbit</a>
7 <span class="gray3"> / </span>
7 <span class="gray3"> / </span>
8 <a href="/understanding-urbit/">
8 <a href="/understanding-urbit/">
9 Understanding Urbit
9 Understanding Urbit
10 </a>
10 </a>
11 {% include "partials/navigation-search.html" %}
11 {% include "partials/navigation-search.html" %}
12+ <li class="dn mw5-xl mw5-l db-xl page-indiced mv2"><a class="fw6 f6" href="/understanding-urbit/">Introduction</a></li>
13+ {% set posts = get_section(path="understanding-urbit/_index.md") %}
14+ {% for directorypage in posts.pages %}
15+ <li class="dn mw5-xl mw5-l db-xl page-indiced mv2"><a class="f6" href="{{directorypage.permalink}}">{{directorypage.title}}</a></li>
16+ {% endfor %}
12</nav>
17</nav>
13<!-- content -->
18<!-- content -->
14<h1 class="mb4 full mt3 f2 fw3 c4-10-lg">Introduction</h1>
19<h1 class="mb4 full mt3 f2 fw3 c4-10-lg">Introduction</h1>
@@ -18,68 +23,59 @@
18 <img src="../assets/intro/ship.svg" alt="A drawing of an Urbit ship." />
23 <img src="../assets/intro/ship.svg" alt="A drawing of an Urbit ship." />
19 </figure>
24 </figure>
20
25
21− <p class="mb0 lh-copy">This is a drawing of an Urbit.</p>
26+ <p class="mb0 lh-copy">This is a drawing of an Urbit.</p>
22− <p class="mt0 lh-copy">It’s a new kind of computer.</p>
27+ <p class="mt0 lh-copy">It’s a new kind of computer.</p>
23− <p class="mt6 lh-copy">This image is representative of three key (yet familiar) aspects to this new kind of computer:</p>
24− <ul class="list">
25− <li class="mt4 ml0">The <img src="../assets/intro/apps.svg" /> apps you use every day,</li>
26− <li class="mt4 ml0">the <img src="../assets/intro/arvo.svg" /> OS that makes sure everything runs smoothly,</li>
27− <li class="mt4 ml0">and your <img src="../assets/intro/id.svg" /> identity at the center of it all.</li>
28− </ul>
29− </section>
28+ </section>
30
29
31− <section id="what-is-urbit" class=" c4-10-lg full mt6">
30+ <section id="what-is-urbit" class=" c4-10-lg full">
32− <p>So, what <em>is</em> an Urbit?</p>
33
31
34− <figure class="mt6 tc lh-copy">
32+ <figure class="mt6 tc lh-copy">
35− <img src="../assets/intro/social-software.svg" />
33+ <img src="../assets/intro/social-software.svg" />
36− <figcaption class="measure home tl mt5">
34+ <figcaption class="measure home tl mt5">
37− Your Urbit is a purpose built tool for your own social software, not MEGACORP social networking.
35+ Your Urbit is a purpose built tool for your own social software, not MEGACORP social networking.
38− On Urbit, you run (or build) your own software to connect and communicate with your friends and family.
36+ On Urbit, you run (or build) your own software to connect and communicate with your friends and family.
39− </figcaption>
37+ </figcaption>
40− </figure>
38+ </figure>
41
39
42− <figure class="tc mt6 lh-copy">
40+ <figure class="tc mt6 lh-copy">
43− <img src="../assets/intro/rock.svg" />
41+ <img src="../assets/intro/rock.svg" />
44− <figcaption class="measure home tl mt5">
42+ <figcaption class="measure home tl mt5">
45− Your Urbit is a permanent, private archive.
43+ Your Urbit is a permanent, private archive.
46− Your Urbit can store all your data and digital assets safely, privately, forever.
44+ Your Urbit can store all your data and digital assets safely, privately, forever.
47− </figcaption>
45+ </figcaption>
48− </figure>
46+ </figure>
49
47
50− <figure class="tc mt6 lh-copy">
48+ <figure class="tc mt6 lh-copy">
51− <img src="../assets/intro/yours-forever.svg" />
49+ <img src="../assets/intro/yours-forever.svg" />
52− <figcaption class="measure home tl mt5">
50+ <figcaption class="measure home tl mt5">
53− You own your Urbit like you own Bitcoin.
51+ You own your Urbit like you own Bitcoin.
54− Each Urbit is a piece of a new network that’s owned and controlled by its users.
52+ Each Urbit is a piece of a new network that’s owned and controlled by its users.
55− </figcaption>
53+ </figcaption>
56− </figure>
54+ </figure>
57− <p class="mt6 mb6">Nothing quite like this has ever been done before. There’s nothing else like it.</p>
55+ <p class="mt6 mb6">Nothing quite like this has ever been done before. There’s nothing else like it.</p>
58− </section>
56+ </section>
59
57
60− <section id="megacorp" class="c4-10-lg full">
58+ <section id="megacorp" class="c4-10-lg full">
61− <img class="db" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-1.svg" style="margin: 2rem auto 4rem auto;"/>
59+ <img class="db" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-1.svg" style="margin: 2rem auto 4rem auto;"/>
62− <p class="lh-copy">Today, technology controls us. Every MEGACORP has the same incentive:
60+ <p class="lh-copy">Today, technology controls us. Every MEGACORP has the same incentive:
63− To keep us hooked on their platform.</p>
61+ To keep us hooked on their platform.</p>
64− <p class="lh-copy">We built Urbit so people can control their technology, shape their digital lives and freely build
62+ <p class="lh-copy">We built Urbit so people can control their technology, shape their digital lives and freely build
65− their digital communities.</p>
63+ their digital communities.</p>
66− <p class="lh-copy">We want to replace the internet with a foundation for computing that we can all rely on far into the future.</p>
64+ <p class="lh-copy">We want to replace the internet with a foundation for computing that we can all rely on far into the future.</p>
67− <p class="lh-copy">Urbit is a large, ambitious project. But at the core it’s durable, simple and yours.</p>
65+ <p class="lh-copy">Urbit is a large, ambitious project. But at the core it’s durable, simple and yours.</p>
66+ </section>
68 </section>
67 </section>
69−</section>
70−
71−<article class="mt4 mb6 full c4-10-lg">
68+ <article class="mt4 mb6 full c4-10-lg">
72− <p class="mb5">Want to continue down this rabbit hole? If you’re new to Urbit
69+ <p class="mb5">Want to continue down this rabbit hole? If you’re new to Urbit
73 and want to learn more, start from the beginning. If you’re technical, start
70 and want to learn more, start from the beginning. If you’re technical, start
74 with the technical overview.</p>
71 with the technical overview.</p>
75 <ul class="posts">
72 <ul class="posts">
76 {% set posts = get_section(path="understanding-urbit/_index.md") %}
73 {% set posts = get_section(path="understanding-urbit/_index.md") %}
77 {% for page in posts.pages %}
74 {% for page in posts.pages %}
78− <li class="mb4 ml0">
79− <a class="bn" href="{{ page.permalink }}">
75+ <li class="mb4 ml0"><a class="bn" href="{{ page.permalink }}">
80− <h2 class="f4 dib ml0 fw4 mt0 mb0 b--black bb lh-solid">{{ page.title }}</h2>
76+ <h2 class="f4 dib ml0 fw4 mt0 mb0 b--black bb lh-solid">{{ page.title }}</h2>
81− <p class="mt1 db">{{ page.description }}</p>
77+ <p class="mt1 db">{{ page.description }}</p>
82− </a>
78+ </a>
83 </li>
79 </li>
84 {% endfor %}
80 {% endfor %}
85 </ul>
81 </ul>
templates/understanding-urbit/post.html+1
@@ -24,6 +24,7 @@
24 </a>
24 </a>
25
25
26 {% include "partials/navigation-search.html" %}
26 {% include "partials/navigation-search.html" %}
27+ <li class="dn mw5-xl mw5-l db-xl page-indiced mv2"><a class="f6" href="/understanding-urbit/">Introduction</a></li>
27 {% set posts = get_section(path="understanding-urbit/_index.md") %}
28 {% set posts = get_section(path="understanding-urbit/_index.md") %}
28 {% for directorypage in posts.pages %}
29 {% for directorypage in posts.pages %}
29 {% if directorypage.title == page.title %}
30 {% if directorypage.title == page.title %}