git.iko.soy/urbit.org
on master help sign in
Merge branch 'master' of github.com:urbit/urbit.org
commite77edf612e2b7c0a5106dd579f52363ae641cb93 authorMorgan Sutherland <morgan@morgansutherland.com> dateTue 21 May 2019, 15:22 (7 years ago) parentadd6aeb82f054e
6 files changed+20−16
compare with master
unifiedsplit
config.toml+3 sass/_main.scss+1−1 templates/base.html+3−2 templates/page.html+1−1 templates/posts/single.html+2−2 templates/primer.html+10−10
config.toml+3
@@ -11,6 +11,9 @@ base_url = "https://urbit.org"
1111# Whether to automatically compile all Sass files in the sass directory
1212compile_sass = true
1313
14+# Whether to generate a RSS feed automatically
15+generate_rss = true
16+
1417# Whether to do syntax highlighting
1518# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola
1619highlight_code = true
sass/_main.scss+1−1
@@ -105,7 +105,7 @@ iframe {
105105
106106.content {
107107 position: relative;
108− z-index: 1;
108+ z-index: 3;
109109 margin-top: -16rem;
110110}
111111
templates/base.html+3−2
@@ -7,11 +7,12 @@
77 <meta name="viewport" content="width=device-width, initial-scale=1.0">
88 <meta name="description" content="{{ config.description }}">
99 <meta name="author" content="{{ config.extra.author.name }}">
10− <link rel="icon" type="image/png" href="../images/favicon.ico"/>
10+ <link rel="icon" type="image/png" href="../images/favicon.ico" />
11+ <link rel="alternative" type="application/rss+xml" title="Urbit RSS" href="/rss.xml" />
1112 <title>{{ config.title }}</title>
1213 <!-- stylesheets -->
1314 <link rel="stylesheet" href="{{ config.base_url }}/indigo.css">
14− <link rel="stylesheet" href="{{ config.base_url }}/styles.css">
15+ <link rel="stylesheet" href="{{ get_url(path="/styles.css", trailing_slash=true, cachebust=true) }}">
1516 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-47054188-1"></script>
1617 <script>
1718 window.dataLayer = window.dataLayer || [];
templates/page.html+1−1
@@ -39,7 +39,7 @@
3939 <div class="content posts__content pb40">
4040 <article class="article">
4141 <!-- header -->
42− <h4 class="mt2 mb16"><code>&#126;{% if page.date %}{{ page.date | date(format="%Y.%m.%d") }}{% endif %}</code></h4>
42+ <h4 class="mb16"><code>&#126;{% if page.date %}{{ page.date | date(format="%Y.%m.%d") }}{% endif %}</code></h4>
4343 <h1 class="mt8 mb8">{{ page.title }}</h1>
4444 <!-- body -->
4545 {{ page.content | safe }}
templates/posts/single.html+2−2
@@ -41,8 +41,8 @@
4141 <ul class="list">
4242 {% for page in term.pages %}
4343 <li class="list__item mb8">
44− <span class="h4 mt0 mb0 text-mono text-500 gray-light">&#126;{{ page.date | date(format="%Y.%m.%d") }}</span>
45− <span class="h4 mt0 mb0 h-font text-500 gray-light lowercase">{% if page.taxonomies.posts %}
44+ <span class="h4 mt0 mb0 mono">&#126;{{ page.date | date(format="%Y.%m.%d") }}</span>
45+ <span class="h4 mt0 mb0 h-font">{% if page.taxonomies.posts %}
4646 {% for post in page.taxonomies.posts %}<a href="{{ get_taxonomy_url(kind="posts", name=post) }}">{{ post }}</a> {% endfor %}
4747 {% endif %}</span>
4848 <a href="{{ page.permalink }}"><h2 class="mt1">{{ page.title }}</h2></a>
templates/primer.html+10−10
@@ -98,7 +98,7 @@
9898 <div class="row mb-8">
9999 <div class="col-md-12">
100100 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-urbit-is-for">
101− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(1)</div>
101+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">1.</div>
102102 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Aegean: What Urbit is For</div>
103103 </a>
104104 </div>
@@ -106,7 +106,7 @@
106106 <div class="row mb-8">
107107 <div class="col-md-12">
108108 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-arvo-is">
109− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(2)</div>
109+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">2.</div>
110110 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Arvo: What Urbit is</div>
111111 </a>
112112 </div>
@@ -114,7 +114,7 @@
114114 <div class="row mb-8">
115115 <div class="col-md-12">
116116 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-azimuth-is">
117− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
117+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">3.</div>
118118 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth: What Urbit is</div>
119119 </a>
120120 </div>
@@ -122,7 +122,7 @@
122122 <div class="row mb-8">
123123 <div class="col-md-12">
124124 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#history">
125− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(4)</div>
125+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">4.</div>
126126 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">History</div>
127127 </a>
128128 </div>
@@ -130,7 +130,7 @@
130130 <div class="row mb-8">
131131 <div class="col-md-12">
132132 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#azimuth-distribution">
133− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(5)</div>
133+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">5.</div>
134134 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth distribution</div>
135135 </a>
136136 </div>
@@ -152,7 +152,7 @@
152152 <div class="row mb-8">
153153 <div class="col-md-10 col-md-offset-1">
154154 <a class="row h2 h-font white text-decoration-none" href="#what-urbit-is-for">
155− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(1)</div>
155+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">1.</div>
156156 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Aegean: What Urbit is For</div>
157157 </a>
158158 </div>
@@ -160,7 +160,7 @@
160160 <div class="row mb-8">
161161 <div class="col-md-10 col-md-offset-1">
162162 <a class="row h2 h-font white text-decoration-none" href="#what-arvo-is">
163− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(2)</div>
163+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">2.</div>
164164 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Arvo: What Urbit is</div>
165165 </a>
166166 </div>
@@ -168,7 +168,7 @@
168168 <div class="row mb-8">
169169 <div class="col-md-10 col-md-offset-1">
170170 <a class="row h2 h-font white text-decoration-none" href="#what-azimuth-is">
171− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
171+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">3.</div>
172172 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth: What Urbit is</div>
173173 </a>
174174 </div>
@@ -176,7 +176,7 @@
176176 <div class="row mb-8">
177177 <div class="col-md-10 col-md-offset-1">
178178 <a class="row h2 h-font white text-decoration-none" href="#history">
179− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(4)</div>
179+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">4.</div>
180180 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">History</div>
181181 </a>
182182 </div>
@@ -184,7 +184,7 @@
184184 <div class="row mb-8">
185185 <div class="col-md-10 col-md-offset-1">
186186 <a class="row h2 h-font white text-decoration-none" href="#azimuth-distribution">
187− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(5)</div>
187+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">5.</div>
188188 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth distribution</div>
189189 </a>
190190 </div>