git.iko.soy/urbit.org
on master help sign in
merge master
commit60ba94d6062a5c54a2c03f3919e73a7873fe72f1 authorMorgan Sutherland <morgan@morgansutherland.com> dateMon 1 Jul 2019, 18:26 (7 years ago) parent576cd082f95ae5
14 files changed+50−26
compare with master
unifiedsplit
README.md+2 sass/_main.scss+4−4 sass/_responsive.scss+7 templates/base.html+1−1 templates/doc.html+1−1 templates/index.html+1−1 templates/page.html+1−1 templates/partials/navigation.html+1−1 templates/partials/search-overlay.html+15 templates/posts/list.html+1−1 templates/posts/single.html+1−1 templates/primer.html+13−13 templates/sections/docs.html+1−1 templates/sections/docs/chapters.html+1−1
README.md+2
@@ -1,5 +1,7 @@
11# urbit.org
22
3+[![Netlify Status](https://api.netlify.com/api/v1/badges/71f99a93-7b2e-4e10-b74d-7cbbb2e6dacd/deploy-status)](https://app.netlify.com/sites/urbit-org/deploys)
4+
35The website for the Urbit project.
46
57## Build
sass/_main.scss+4−4
@@ -73,7 +73,6 @@ iframe {
7373
7474.content-nav-icon {
7575 position: fixed;
76− left: (4rem / 4);
7776 top: (24rem / 4);
7877 width: 10px;
7978 height: 10px;
@@ -201,7 +200,6 @@ iframe {
201200 supported by Chrome and Opera */
202201 &__navigation {
203202 display: none;
204− padding-top: (9rem / 4);
205203 }
206204 &__nav-icon {
207205 position: absolute;
@@ -234,14 +232,16 @@ iframe {
234232}
235233
236234.has-active-main-nav {
235+ overflow: hidden;
237236 .header {
238237 z-index: 4;
238+ background: #000;
239+ height: 100%;
239240 &__navigation {
240241 position: fixed;
241242 height: 100%;
242243 width: 100%;
243− background: #000;
244− overflow-y: hidden;
244+ overflow-y: scroll;
245245 display: block;
246246 }
247247 &__nav-icon {
sass/_responsive.scss+7
@@ -1,3 +1,8 @@
1+@media only screen and (max-width: 1080px) {
2+ .header, .main-wrapper {
3+ padding-left: 2%;
4+ }
5+}
16@media only screen and (max-width: 800px) {
27 .container--fixed, .content-nav {
38 margin: 0;
@@ -42,6 +47,7 @@
4247 .header {
4348 &__navigation {
4449 overflow-y: scroll;
50+ -webkit-overflow-scrolling: touch;
4551 }
4652 }
4753 }
@@ -57,6 +63,7 @@
5763 padding: 0 (4rem / 4);
5864 background: white;
5965 overflow-y: scroll;
66+ -webkit-overflow-scrolling: touch;
6067 }
6168 .content-nav {
6269 display: block;
templates/base.html+1−1
@@ -9,7 +9,7 @@
99 <meta name="author" content="{{ config.extra.author.name }}">
1010 <link rel="icon" type="image/png" href="/images/favicon.ico" />
1111 <link rel="alternative" type="application/rss+xml" title="Urbit RSS" href="/rss.xml" />
12− <title>{{ config.title }}</title>
12+ <title>{% block title %}{% endblock title %} - {{ config.title }}</title>
1313 <!-- stylesheets -->
1414 <link href="//cdn-images.mailchimp.com/embedcode/horizontal-slim-10_7.css" rel="stylesheet" type="text/css">
1515 <style type="text/css">
templates/doc.html+1−1
@@ -1,5 +1,5 @@
11{% extends "base.html" %}
2−
2+{% block title %} {{ page.title }} {% endblock title %}
33{% block content %}
44<!-- header -->
55{% include "partials/navigation.html" %}
templates/index.html+1−1
@@ -1,5 +1,5 @@
11{% extends "base.html" %}
2−
2+{% block title %} {{ section.title }} {% endblock title %}
33{% block content %}
44{% include "partials/top-alert.html" %}
55<div class="wrapper">
templates/page.html+1−1
@@ -1,5 +1,5 @@
11{% extends "base.html" %}
2−
2+{% block title %} {{ page.title }} {% endblock title %}
33{% block content %}
44<!-- header -->
55{% include "partials/navigation.html" %}
templates/partials/navigation.html+1−1
@@ -7,7 +7,7 @@
77 <div class="wrapper">
88 <div class="container">
99 <div class="nav-column">
10− <div class="nav-links mb24">
10+ <div class="nav-links mb24 mt9">
1111 <ul class="list">
1212 {% for item in config.extra.urbit_menu %}
1313 <li class="list__item">
templates/partials/search-overlay.htmlnew file+15
@@ -0,0 +1,15 @@
1+{% block content %}
2+<div id="search-overlay" class="search-overlay">
3+ <div class="wrapper">
4+ <div id="search-window" class="pop-up">
5+ <div class="search-bar">
6+ <input id="search" autocomplete="off" type="search" class="search-bar__input" placeholder="Go to...">
7+ </div>
8+ <div class="search-results">
9+ <div class="search-results__header mb2"></div>
10+ <ul class="list search-results__items"></ul>
11+ </div>
12+ </div>
13+ </div>
14+</div>
15+{% endblock content %}
templates/posts/list.html+1−1
@@ -1,5 +1,5 @@
11{% extends "base.html" %}
2−
2+{% block title %} Posts {% endblock title %}
33{% block content %}
44<!-- header -->
55{% include "partials/navigation.html" %}
templates/posts/single.html+1−1
@@ -1,5 +1,5 @@
11{% extends "base.html" %}
2−
2+{% block title %} {{ term.name }} {% endblock title %}
33{% block content %}
44<!-- header -->
55{% include "partials/navigation.html" %}
templates/primer.html+13−13
@@ -6,7 +6,7 @@
66 <meta name="viewport" content="width=device-width, initial-scale=1.0">
77 <meta name="description" content="{{ config.description }}">
88 <meta name="author" content="{{ config.extra.author.name }}">
9− <title>{{ config.title }}</title>
9+ <title>Primer - {{ config.title }}</title>
1010 <!-- stylesheets -->
1111 <link rel="stylesheet" href="{{ config.base_url }}/styles.css" >
1212 <link rel="stylesheet" href="{{ config.base_url }}/primer.css" >
@@ -105,15 +105,15 @@
105105 <div class="row mb-8">
106106 <div class="col-md-12">
107107 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-urbit-is-for">
108− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">1.</div>
109− <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>
108+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(1)</div>
109+ <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>
110110 </a>
111111 </div>
112112 </div>
113113 <div class="row mb-8">
114114 <div class="col-md-12">
115115 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-arvo-is">
116− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">2.</div>
116+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(2)</div>
117117 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Arvo: What Urbit is</div>
118118 </a>
119119 </div>
@@ -121,7 +121,7 @@
121121 <div class="row mb-8">
122122 <div class="col-md-12">
123123 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-azimuth-is">
124− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">3.</div>
124+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
125125 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth: What Urbit is</div>
126126 </a>
127127 </div>
@@ -129,7 +129,7 @@
129129 <div class="row mb-8">
130130 <div class="col-md-12">
131131 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#history">
132− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">4.</div>
132+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
133133 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">History</div>
134134 </a>
135135 </div>
@@ -137,7 +137,7 @@
137137 <div class="row mb-8">
138138 <div class="col-md-12">
139139 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#azimuth-distribution">
140− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">5.</div>
140+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(5)</div>
141141 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth distribution</div>
142142 </a>
143143 </div>
@@ -158,7 +158,7 @@
158158 <div class="row mb-4">
159159 <div class="col-md-10 col-md-offset-1">
160160 <a class="row h2 h-font white text-decoration-none" href="#what-urbit-is-for">
161− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">1.</div>
161+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(1)</div>
162162 <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>
163163 </a>
164164 </div>
@@ -166,7 +166,7 @@
166166 <div class="row mb-4">
167167 <div class="col-md-10 col-md-offset-1">
168168 <a class="row h2 h-font white text-decoration-none" href="#what-arvo-is">
169− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">2.</div>
169+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(2)</div>
170170 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Arvo: What Urbit is</div>
171171 </a>
172172 </div>
@@ -174,7 +174,7 @@
174174 <div class="row mb-4">
175175 <div class="col-md-10 col-md-offset-1">
176176 <a class="row h2 h-font white text-decoration-none" href="#what-azimuth-is">
177− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">3.</div>
177+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
178178 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth: What Urbit is</div>
179179 </a>
180180 </div>
@@ -182,7 +182,7 @@
182182 <div class="row mb-4">
183183 <div class="col-md-10 col-md-offset-1">
184184 <a class="row h2 h-font white text-decoration-none" href="#history">
185− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">4.</div>
185+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(4)</div>
186186 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">History</div>
187187 </a>
188188 </div>
@@ -190,7 +190,7 @@
190190 <div class="row mb-4">
191191 <div class="col-md-10 col-md-offset-1">
192192 <a class="row h2 h-font white text-decoration-none" href="#azimuth-distribution">
193− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">5.</div>
193+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(5)</div>
194194 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth distribution</div>
195195 </a>
196196 </div>
@@ -1022,7 +1022,7 @@
10221022 <div class="mb-6">
10231023 <h4 class="mb-1">Contact</h4>
10241024 <div class="text-mono text-400">~zod</div>
1025− <div><a class="text-mono" href="/cdn-cgi/l/email-protection#dca9aebeb5a89ca9aebeb5a8f2b3aebb"><span class="__cf_email__" data-cfemail="7e0d0b0e0e110c0a3e0b0c1c170a50110c19">[email&#160;protected]</span></a></div>
1025+ <div><a class="text-mono" href="mailto:support@urbit.org">support@urbit.org</a></div>
10261026 </div>
10271027 </div>
10281028 <div class="col-sm-10 col-md-3 col-sm-offset-1">
templates/sections/docs.html+1−1
@@ -1,5 +1,5 @@
11{% extends "base.html" %}
2−
2+{% block title %} {{ section.title }} {% endblock title %}
33{% block content %}
44<!-- header -->
55{% include "partials/navigation.html" %}
templates/sections/docs/chapters.html+1−1
@@ -1,5 +1,5 @@
11{% extends "base.html" %}
2−
2+{% block title %} {{ section.title }} {% endblock title %}
33{% block content %}
44<!-- header -->
55{% include "partials/navigation.html" %}