on master help sign in
Merge branch 'next-slim' of github.com:urbit/urbit.org into chore/lint
commit6fd41f290c7c357d609cb786e37b5a65dd967356 authorGavin Atkinson <gvnatknsn@protonmail.com> dateWed 9 Oct 2019, 10:57 (7 years ago) parentcaa3d1cb1f1d71
6 files changed+74−80
sass/_main.scss+14−14 templates/index.html+2−4 templates/partials/footer.html+8−9 templates/shortcodes/oversize.html+1−1 templates/understanding-urbit/list.html+48−52 templates/understanding-urbit/post.html+1
sass/_main.scss+14−14
@@ -8,31 +8,31 @@
88 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-extralight.woff");
99 font-weight: 200;
1010 }
11−
11+
1212 @font-face {
1313 font-family: "Source Code Pro";
1414 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-light.woff");
1515 font-weight: 300;
1616 }
17−
17+
1818 @font-face {
1919 font-family: "Source Code Pro";
2020 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-regular.woff");
2121 font-weight: 400;
2222 }
23−
23+
2424 @font-face {
2525 font-family: "Source Code Pro";
2626 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-medium.woff");
2727 font-weight: 500;
2828 }
29−
29+
3030 @font-face {
3131 font-family: "Source Code Pro";
3232 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-bold.woff");
3333 font-weight: 600;
3434 }
35−
35+
3636 @font-face {
3737 font-family: "Source Code Pro";
3838 src: url("https://storage.googleapis.com/media.urbit.org/fonts/scp-black.woff");
@@ -51,7 +51,7 @@ body {
5151
5252nav {
5353 font-size: 1rem;
54− line-height: 1.33;
54+ line-height: 1.33;
5555 // If you need to flush the nav to break
5656 // the body's margin, use this:
5757 &.full-left {
@@ -139,7 +139,7 @@ footer nav {
139139 }
140140}
141141
142−// essay template
142+// essay template
143143
144144body.essay {
145145 h1 {
@@ -337,11 +337,11 @@ input[type="search"] {
337337 }
338338 }
339339 }
340−
340+
341341 .search-results {
342342 max-height: 400px;
343343 ul {
344− position: relative;
344+ position: relative;
345345 }
346346 &__item a:hover {
347347 background: #F9F9F9;
@@ -358,7 +358,7 @@ input[type="search"] {
358358 .glossary-results__item {
359359 padding: 0 1rem 0 1rem;
360360 &:hover {
361− background-color: #F9F9F9;
361+ background-color: #F9F9F9;
362362 }
363363 }
364364
@@ -481,7 +481,7 @@ nav.docs:not(.mobile) {
481481}
482482nav.docs details {
483483 summary {
484− @extend .fw4, .black, .mt2;
484+ @extend .fw4, .black, .mt2;
485485 }
486486 & > summary::before {
487487 content: "› ";
@@ -505,10 +505,10 @@ nav.docs details {
505505
506506.video-container {
507507 position: relative;
508− padding-bottom: 56.25%;
508+ padding-bottom: 56.25vw;
509509 padding-top: 30px; height: 0; overflow: hidden;
510510}
511−
511+
512512.video-container iframe,
513513.video-container object,
514514.video-container embed {
@@ -532,4 +532,4 @@ hr {
532532
533533.scroll-smooth {
534534 scroll-behavior: smooth;
535−}
535+}
templates/index.html+2−4
@@ -16,13 +16,10 @@ style=" z-index: 2;">
1616Urbit is your last computer.
1717</h1>
1818
19−<section class="full w-100 video-container bg-black full-bleed relative" id="video" style="
20− width: 130%;
21− margin-left: -20%;
19+<section class="full video-container bg-black full-bleed relative" id="video" style="
2220">
2321 <iframe src="https://player.vimeo.com/video/365181756?background=1"
2422 class="w-100 ma0 h-100" frameborder="0" allow="autoplay;fullscreen" allowfullscreen="" style="
25− height: 130%; z-index: 1;
2623"></iframe>
2724</section>
2825
@@ -69,6 +66,7 @@ Urbit is your last computer.
6966 <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>.
7067 If you're more technical, feel free to skip ahead to the <a href="/understanding-urbit/technical-overview">technical overview.</a></p>
7168 <ul class="full c4-7-lg">
69+ <li class="mt2"><a class="b--black bb" href="/understanding-urbit/">Introduction</a></li>
7270 {% set posts = get_section(path="understanding-urbit/_index.md") %}
7371 {% for page in posts.pages %}
7472 <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 @@
11<footer class="full-bleed mt4 grid12 bg-black white full pb6">
22 <section class="full grid12 mb4">
33 <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">
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>
4+ <h3 class="mt0 mb0 pt0 pb0">Understanding Urbit</h3 class="mt0 mb0 pt0 pb0">
5+ <li class="mt2"><a href="/understanding-urbit">Introduction</a></li>
86 <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>
99 </nav>
1010 <nav class="c3-5-md c3-5-lg half-2 mt4">
1111 <h3 class="mt0 mb0 pt0 pb0">Using Urbit</h3 class="mt0 mb0 pt0 pb0">
@@ -19,7 +19,7 @@
1919 <li class="mt2"><a href="/essays">Essays</a></li>
2020 <li class="mt2"><a href="/updates">Updates</a></li>
2121 <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>
2323 </nav>
2424 <nav class="c7-9-md c7-9-lg half-2 mt4">
2525 <h3 class="mt0 mb0 pt0 pb0">Developers</h3 class="mt0 mb0 pt0 pb0">
@@ -34,7 +34,6 @@
3434 <li class="mt2"><a href="https://groups.google.com/a/urbit.org/forum/#!forum/dev">urbit-dev</a></li>
3535 <li class="mt2"><a href="/hoonschool">Hoon School ↗</a></li>
3636 <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>
3837 </nav>
3938 <nav class="c11-13-md c11-13-lg half-2 mt4">
4039 <h3 class="mt0 mb0 pt0 pb0">Install Urbit</h3 class="mt0 mb0 pt0 pb0">
@@ -49,9 +48,9 @@
4948 <li class="mt2"><a href="/privacy#scope">Privacy Policy</a></li>
5049
5150 <h2 class="mt4 mb3">Need Help?</h2>
52− <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>
54− <li class="mt2"><a href="https://github.com/urbit">github.com/urbit</a></li>
51+ <li class="mt2"><a href="mailto:support@urbit.org">support@urbit.org ↗</a></li>
52+ <li class="mt2"><a href="https://discord.gg/bkEX6EU">Discord</a></li>
53+ <li class="mt2"><a href="https://github.com/urbit">Github</a></li>
5554 </nav>
5655 </section>
5756</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">
22 <img src="{{url}}"/>
33</figure>
templates/understanding-urbit/list.html+48−52
@@ -2,13 +2,18 @@
22{% block title %} Understanding Urbit {% endblock title %}
33{% block content %}
44<!-- 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">
66 <a class="gray3" href="/">Urbit</a>
77 <span class="gray3"> / </span>
88 <a href="/understanding-urbit/">
99 Understanding Urbit
1010 </a>
1111 {% 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 %}
1217</nav>
1318<!-- content -->
1419<h1 class="mb4 full mt3 f2 fw3 c4-10-lg">Introduction</h1>
@@ -18,68 +23,59 @@
1823 <img src="../assets/intro/ship.svg" alt="A drawing of an Urbit ship." />
1924 </figure>
2025
21− <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>
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>
26+ <p class="mb0 lh-copy">This is a drawing of an Urbit.</p>
27+ <p class="mt0 lh-copy">It’s a new kind of computer.</p>
28+ </section>
3029
31− <section id="what-is-urbit" class=" c4-10-lg full mt6">
32− <p>So, what <em>is</em> an Urbit?</p>
30+ <section id="what-is-urbit" class=" c4-10-lg full">
3331
34− <figure class="mt6 tc lh-copy">
35− <img src="../assets/intro/social-software.svg" />
36− <figcaption class="measure home tl mt5">
37− 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.
39− </figcaption>
40− </figure>
32+ <figure class="mt6 tc lh-copy">
33+ <img src="../assets/intro/social-software.svg" />
34+ <figcaption class="measure home tl mt5">
35+ Your Urbit is a purpose built tool for your own social software, not MEGACORP social networking.
36+ On Urbit, you run (or build) your own software to connect and communicate with your friends and family.
37+ </figcaption>
38+ </figure>
4139
42− <figure class="tc mt6 lh-copy">
43− <img src="../assets/intro/rock.svg" />
44− <figcaption class="measure home tl mt5">
45− Your Urbit is a permanent, private archive.
46− Your Urbit can store all your data and digital assets safely, privately, forever.
47− </figcaption>
48− </figure>
40+ <figure class="tc mt6 lh-copy">
41+ <img src="../assets/intro/rock.svg" />
42+ <figcaption class="measure home tl mt5">
43+ Your Urbit is a permanent, private archive.
44+ Your Urbit can store all your data and digital assets safely, privately, forever.
45+ </figcaption>
46+ </figure>
4947
50− <figure class="tc mt6 lh-copy">
51− <img src="../assets/intro/yours-forever.svg" />
52− <figcaption class="measure home tl mt5">
53− 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.
55− </figcaption>
56− </figure>
57− <p class="mt6 mb6">Nothing quite like this has ever been done before. There’s nothing else like it.</p>
58− </section>
48+ <figure class="tc mt6 lh-copy">
49+ <img src="../assets/intro/yours-forever.svg" />
50+ <figcaption class="measure home tl mt5">
51+ You own your Urbit like you own Bitcoin.
52+ Each Urbit is a piece of a new network that’s owned and controlled by its users.
53+ </figcaption>
54+ </figure>
55+ <p class="mt6 mb6">Nothing quite like this has ever been done before. There’s nothing else like it.</p>
56+ </section>
5957
60− <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;"/>
62− <p class="lh-copy">Today, technology controls us. Every MEGACORP has the same incentive:
63− 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
65− 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>
67− <p class="lh-copy">Urbit is a large, ambitious project. But at the core it’s durable, simple and yours.</p>
58+ <section id="megacorp" class="c4-10-lg full">
59+ <img class="db" src="https://media.urbit.org/site/understanding-urbit/urbit-id/urbit-id-1.svg" style="margin: 2rem auto 4rem auto;"/>
60+ <p class="lh-copy">Today, technology controls us. Every MEGACORP has the same incentive:
61+ To keep us hooked on their platform.</p>
62+ <p class="lh-copy">We built Urbit so people can control their technology, shape their digital lives and freely build
63+ their digital communities.</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>
65+ <p class="lh-copy">Urbit is a large, ambitious project. But at the core it’s durable, simple and yours.</p>
66+ </section>
6867 </section>
69−</section>
70−
71−<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
68+ <article class="mt4 mb6 full c4-10-lg">
69+ <p class="mb5">Want to continue down this rabbit hole? If you’re new to Urbit
7370 and want to learn more, start from the beginning. If you’re technical, start
7471 with the technical overview.</p>
7572 <ul class="posts">
7673 {% set posts = get_section(path="understanding-urbit/_index.md") %}
7774 {% for page in posts.pages %}
78− <li class="mb4 ml0">
79− <a class="bn" href="{{ page.permalink }}">
80− <h2 class="f4 dib ml0 fw4 mt0 mb0 b--black bb lh-solid">{{ page.title }}</h2>
81− <p class="mt1 db">{{ page.description }}</p>
82− </a>
75+ <li class="mb4 ml0"><a class="bn" href="{{ page.permalink }}">
76+ <h2 class="f4 dib ml0 fw4 mt0 mb0 b--black bb lh-solid">{{ page.title }}</h2>
77+ <p class="mt1 db">{{ page.description }}</p>
78+ </a>
8379 </li>
8480 {% endfor %}
8581 </ul>
templates/understanding-urbit/post.html+1
@@ -24,6 +24,7 @@
2424 </a>
2525
2626 {% 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>
2728 {% set posts = get_section(path="understanding-urbit/_index.md") %}
2829 {% for directorypage in posts.pages %}
2930 {% if directorypage.title == page.title %}