on master help sign in
Merge branch 'master' of github.com:urbit/urbit.org
commit4e7d3059f9a090a7b73cd352c64c3be950711d89 authoré <edouard@urcad.es> dateWed 16 Oct 2019, 16:01 (7 years ago) parent330834c16f0e60
11 files changed+134−27
README.md+73 content/docs+1−1 content/meetups.md+15 content/using/install.md+5−5 sass/_main.scss+17 static/_redirects+8−7 static/scripts.js+2−2 templates/essays/post.html+7−6 templates/index.html+2−2 templates/page.html+2−2 templates/partials/footer.html+2−2
README.md+73
@@ -15,3 +15,76 @@ The website for the Urbit project.
1515## Deploy
1616
1717Commits to master are automatically deployed with Netlify.
18+
19+## Post Template and Settings
20+
21+If you're adding content to the site, add a `.md` file to the /content/ directory. Predictably, Updates go in /updates/, Blog posts into /blog/, and Media in /media/.
22+
23+Different templates have different optional configuration settings. All the options used on the site, used in a post template, looks like this:
24+
25+```
26++++
27+<!-- Title: Post title. Mandatory. -->
28+title = "Title for Post"
29+
30+<!-- Date: Used in Updates, Media, Blog posts only. -->
31+date = 2020-01-01
32+
33+<!-- Weight: Used when your post directories are being sorted in manual order, not by date. Understanding Urbit and the Docs use weight. -->
34+weight = 0
35+
36+<!-- Description: A snippet used in post directory pages. -->
37+description = "A post."
38+
39+<!-- Aliases are used when a post was at another location, and redirects that location to the current post location. If you're moving a page, create an alias. -->
40+aliases = ["/updates/2020.01.01"]
41+
42+<!-- template: Only really needed if you're creating a non-post page with sidebar navigation of its content, in which case you want "page_indiced.html". -->
43+template = "page_indiced.html"
44+
45+<!-- This [extra] is needed above any of the configuration options that follow. -->
46+[extra]
47+
48+<!-- Author: For updates, blog, media. -->
49+author = "Matilde Park"
50+
51+<!-- Ship: The author's ship. Used on post directory pages. -->
52+ship = "~haddef-sigwen"
53+
54+<!-- hidetitle: For non-post pages on the site, the title is automatically inserted as an <h1> at the top. If the title of the page is already displayed in the nav (this occurs in root content pages, like /governance, /privacy), then this just removes that <h1>. -->
55+hidetitle = "true"
56+
57+<!-- soundcloud: Used in /media to embed its link on the post directory page. -->
58+soundcloud = "https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/318017856&color=%23ff5500&auto_play=false&hide_related=false&show_comments=true&show_user=true&show_reposts=false&show_teaser=true&visual=true"
59+
60+<!-- youtube: Used in /media to embed its link on the post directory page. Uses just the ID. -->
61+youtube = "5ZAFEylHdiU"
62+
63+<!-- Pagination settings: Flatten pagination makes all the text regular body size. hideprevious removes the "previous" pagination nav entirely, and hidenext removes the "next" pagination nav entirely. hide_previous_title removes the "Previous Post:" title above the previous post's title, and hide_next_title removes the "Next Post:" title above the next post's title.
64+flatten_pagination = "true"
65+hide_next_title = "true"
66+hide_previous_title = "true"
67+hideprevious = "true"
68+hidenext = "true"
69+
70+<!-- classes: Blog posts can add any Indigo class to the template. For example, bg-red4 and yellow0 would make the background deep red and the text light yellow. -->
71+classes = "bg-red4 yellow0"
72++++
73+```
74+
75+An average blog post just looks like this:
76+
77+```
78++++
79+title = "~2019.10 Roadmap"
80+date = 2019-10-03
81+description = "Galen Wolfe-Pauly on the road ahead for the identity/OS/interface/community stack."
82+[extra]
83+author = "Galen Wolfe-Pauly"
84+ship = "~ravmel-ropdyl"
85++++
86+
87+The daily work of building a new OS from scratch is so engaging and exciting that we habitually forget to even take stock of what we’ve accomplished. We’re fixated on the prospect of moving the world on to Urbit, starting with ourselves.
88+
89+[...]
90+```
content/docs+1−1

Submodule changed.

content/meetups.mdnew file+15
@@ -0,0 +1,15 @@
1++++
2+title = "Meetups"
3++++
4+
5+Turns out that getting Urbit fans together in one room is pretty fun. Here's an incomplete list of community-led Urbit IRL groups. These events are generally informal and very approachable – feel free to dive in.
6+
7+If you'd like to list your Urbit meetup or event on this page, send an email to [support@urbit.org](mailto:support@urbit.org).
8+
9+
10+Location | Contact information
11+:------------ | :-------------
12+San Francisco, CA | [Meetup.com](https://www.meetup.com/urbit-sf/)
13+New York, NY | [Meetup.com](https://www.meetup.com/Urbit-New-York/)
14+Austin, TX | TBA
15+Seattle, WA | TBA
content/using/install.md+5−5
@@ -41,8 +41,8 @@ Urbit: a personal server operating function
4141We provide static binaries for macOS. You can grab the latest stable release as follows:
4242
4343```sh
44−curl -O https://bootstrap.urbit.org/urbit-darwin-v0.8.2.tgz
45−tar xzf urbit-darwin-v0.8.2.tgz
44+curl -O https://bootstrap.urbit.org/urbit-darwin-v0.9.0.tgz
45+tar xzf urbit-darwin-v0.9.0.tgz
4646./urbit
4747```
4848
@@ -51,8 +51,8 @@ tar xzf urbit-darwin-v0.8.2.tgz
5151We also provide static binaries for 64-bit Linux distributions (Ubuntu, Debian, Fedora, Arch, etc.). You can get the latest stable release similarly:
5252
5353```sh
54−curl -O https://bootstrap.urbit.org/urbit-linux64-v0.8.2.tgz
55−tar xzf urbit-linux64-v0.8.2.tgz
54+curl -O https://bootstrap.urbit.org/urbit-linux64-v0.9.0.tgz
55+tar xzf urbit-linux64-v0.9.0.tgz
5656./urbit
5757```
5858
@@ -73,4 +73,4 @@ If you're running Urbit in the cloud on a small instance, you may need to additi
7373
7474Urbit wants to map 2GB of memory when it boots up. It won’t necessarily use all this memory, it just wants to see it. On a normal modern PC or Mac, or on a large cloud virtual machine, this is not an issue. On some small cloud virtual machines (Amazon or Digital Ocean) the default memory configuration is smaller than this, and you need to manually configure a swapfile.
7575
76−Digital Ocean has a post on adding swap [here](https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04). For Amazon there’s a StackOverflow thread [here](https://stackoverflow.com/questions/17173972/how-do-you-add-swap-to-an-ec2-instance).
76+Digital Ocean has a post on adding swap [here](https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04). For Amazon there’s a StackOverflow thread [here](https://stackoverflow.com/questions/17173972/how-do-you-add-swap-to-an-ec2-instance).
sass/_main.scss+17
@@ -380,6 +380,9 @@ input[type="search"] {
380380 &:hover {
381381 background-color: #F9F9F9;
382382 }
383+ h3 {
384+ padding: 0;
385+ }
383386 }
384387
385388 #search-reset {
@@ -415,6 +418,15 @@ h1 code, h2 code, h3 code, h4 code {
415418 background-color: transparent;
416419 font-weight: 600;
417420}
421+
422+ // tables
423+table {
424+ @extend .w-100;
425+ border-spacing: 0;
426+}
427+th {
428+ @extend .fw6;
429+}
418430 // hoon school
419431iframe#apply {
420432 width: 100%;
@@ -581,3 +593,8 @@ hr {
581593.wk-appearance-none {
582594 -webkit-appearance: none;
583595}
596+
597+// hide webkit scrollbars on windows, etc
598+::-webkit-scrollbar {
599+ display: none;
600+}
static/_redirects+8−7
@@ -1,9 +1,10 @@
11/docs/introduction /docs
2−/docs/getting-started /install
2+/docs/getting-started /using/install
33/docs/getting-started/azimuth /understanding-urbit/urbit-id
4−/landscape /contributing
5−/docs/getting-started/using-a-star /contributing#galaxies-and-stars
6−/docs/bridge /azimuth/glossary#bridge
7−/docs/pki /docs/azimuth/
8−/docs/arvo/internals/ /docs/arvo/
9−/primer /understanding-urbit/
4+/landscape /using/develop
5+/docs/getting-started/using-a-star /using/operations/stars-and-galaxies/
6+/docs/bridge /using/operations/using-bridge/
7+/docs/pki /docs/concepts/azimuth/
8+/docs/arvo/internals/ /docs/concepts/arvo/
9+/primer /understanding-urbit/
10+/install /using/install
static/scripts.js+2−2
@@ -277,9 +277,9 @@ function initSearch() {
277277 if (rune.symbol === term) {
278278 glossaryResults.style.display="block";
279279 glossaryResultsItem.innerHTML = `
280− <h3 class="black"><code class="red3 mr1">${rune.symbol}</code> ${rune.name}</h3>
280+ <a href="${rune.link}"><h3 class="black"><code class="red3 mr1">${rune.symbol}</code> ${rune.name}</h3>
281281 <p class="black">${rune.desc}</p>
282− <a href="${rune.link}" class="db tr black fw5" style="font-family: 'Inter UI', sans-serif;">Read more in Documentation -></a>
282+ <span class="db tr black fw5" style="font-family: 'Inter UI', sans-serif;">Read more in Documentation -></span></a>
283283 `
284284 }
285285 }
templates/essays/post.html+7−6
@@ -25,23 +25,24 @@
2525
2626 {% include "partials/navigation-search.html" %}
2727</nav>
28−
29−<h1 class="mb4 full mt4 c4-12-lg fw6">{{ page.title }}</h1>
28+<section class="full c4-12-lg">
29+<h1 class="mb2 mt4 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" rel="author"> {{ page.extra.author }}
3232 {% if page.extra.ship %}
3333 <address class="dib fw4 ml2 mono">{{ page.extra.ship }}</address>
3434{% endif %}
3535</span>
3636{% if page.date %}
37− <time class="mono full c4-12-lg db mv2 gray0 f5">{{page.date | date(format="~%Y.%-m.%-d") }}</time>
37+ <time class="mono db mv2 gray0 f5">{{page.date | date(format="~%Y.%-m.%-d") }}</time>
3838{% endif %}
3939{% endif %}
4040{% if page.extra.readtime %}
41−<span class="dib mono full c4-12-lg{% if page.date %} ml2{% endif %} gray2 f5">{{ page.reading_time }}m read</span>
41+<span class="dib mono {% if page.date %} ml2{% endif %} gray2 f5">{{ page.reading_time }}m read</span>
4242{% endif %}
43+</section>
4344
44−<article class="mb4 full grid12 ">
45+<article class="mb4 full grid12">
4546 {{ page.content | safe }}
4647 {% include "partials/pagination.html" %}
4748</article>
templates/index.html+2−2
@@ -17,7 +17,7 @@
1717 autoplay
1818 muted
1919 loop
20− poster="https://media.urbit.org/site/sea30-poster.png">
20+ poster="https://media.urbit.org/site/sea30-poster.jpg">
2121 </video>
2222
2323 <div class="grid12" style="height: 100%; width:100%;">
@@ -106,7 +106,7 @@
106106 <a class="b--black bb" href="https://github.com/urbit/urbit">GitHub</a>
107107 </li>
108108 <li class="mt2">
109− Ask questions in our <a class="b--black bb" href="https://discord.gg/bkEX6EU">Discord</a>
109+ Ask questions in our <a class="b--black bb" href="https://discord.gg/Mae2bk7">Discord</a>
110110 </li>
111111 </ul>
112112 <p class="lh-copy">
templates/page.html+2−2
@@ -11,7 +11,7 @@
1111
1212<!-- header -->
1313<!-- content -->
14−{% set lowercasetitle = page.title | lower %}
14+{%- set lowercasetitle = page.title | lower | split(pat=" ") | join(sep="") -%}
1515{% if section or lowercasetitle == page.components[0] %}
1616<nav class="mt4 pb4 fixed-xl full fourth-1-md fourth-1-lg page-indiced mb3 mb0-m mb0-l mb0-xl">
1717 <a class="gray3" href="/">Urbit</a>
@@ -21,7 +21,7 @@
2121 </a>
2222
2323 {% include "partials/navigation-search.html" %}
24−
24+</nav>
2525{% else %}
2626<nav class="mt4 fixed-xl full fourth-1-md fourth-1-lg page-indiced mb3 mb0-m mb0-l mb0-xl">
2727 <a class="gray3" href="/">Urbit</a>
templates/partials/footer.html+2−2
@@ -26,7 +26,7 @@
2626 <h3 class="mt0 mb3 pt0 pb0">Community</h3>
2727 <li class="mt2 f6"><a href="https://groups.google.com/a/urbit.org/forum/#!forum/dev">urbit-dev</a></li>
2828 <li class="mt2 f6"><a href="/hoonschool">Hoon School</a></li>
29− <li class="mt2 f6"><a href="https://www.meetup.com/urbit-sf/">Meetups</a></li>
29+ <li class="mt2 f6"><a href="/meetups">Meetups</a></li>
3030 <li class="mt2 f6"><a href="/governance">Governance</a></li>
3131 </nav>
3232 </section>
@@ -45,7 +45,7 @@
4545 <nav class="c10-13-md c7-9-lg half-1 mt4 mb5">
4646 <h2 class="mb3">Need help?</h2>
4747 <li class="mt2 f6"><a href="mailto:support@urbit.org">support@urbit.org </a></li>
48− <li class="mt2 f6"><a href="https://discord.gg/bkEX6EU">Discord</a></li>
48+ <li class="mt2 f6"><a href="https://discord.gg/Mae2bk7">Discord</a></li>
4949 <li class="mt2 f6"><a href="https://github.com/urbit">Github</a></li>
5050 </nav>
5151 </section>