git.iko.soy/urbit.org
on master help sign in
Merge pull request #78 from urbit/zola-port

Code overflow scroll and docs updates

commite4e4e403316f461c519fbfa75cb74f5d89b3b019 authorMorgan Sutherland <msutherl@users.noreply.github.com> dateFri 10 May 2019, 12:09 (7 years ago) parente02fafaae6f95c
10 files changed+90−56
compare with master
unifiedsplit
content/docs+1−1 sass/_main.scss+10−10 sass/indigo.scss+65−31 templates/base.html+1−1 templates/doc.html+2−2 templates/page.html+2−2 templates/posts/list.html+4−4 templates/posts/single.html+2−2 templates/sections/docs.html+2−2 templates/sections/docs/chapters.html+1−1
content/docs+1−1

Submodule changed.

sass/_main.scss+10−10
@@ -353,26 +353,26 @@ h1, h2, h3, h4, h5, h6, .text-heading {
353353 font-family: 'Inter UI',-apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
354354}
355355
356−.text-600 {
357− font-weight: 600;
358−}
359−
360−p, .p {
361− margin: 0 0 4rem;
356+p, article li {
357+ font-size: 4rem;
358+ line-height: 8rem;
359+ font-weight: 400;
362360}
363361
364−.docs {
365− p {
366− margin-bottom: 4rem;
367− }
362+article {
368363 h1 {
369364 margin-bottom: 6rem;
370365 }
371366}
372367
368+p, .p {
369+ margin: 0 0 4rem;
370+}
371+
373372pre, code {
374373 background-color: #eee !important;
375374 color: #000 !important;
375+ overflow-y: scroll;
376376 span {
377377 color: #000 !important;
378378 }
sass/indigo.scss+65−31
@@ -184,7 +184,7 @@ template {
184184.H3,
185185.t4 {
186186 font-size: 6rem;
187− line-height: 12rem;
187+ line-height: 8rem;
188188 font-weight: 700;
189189}
190190.H4,
@@ -195,12 +195,18 @@ template {
195195}
196196.P,
197197.t6 {
198+ font-size: 5rem;
199+ line-height: 8rem;
200+ font-weight: 400;
201+}
202+.Ps,
203+.t7 {
198204 font-size: 4rem;
199205 line-height: 6rem;
200206 font-weight: 400;
201207}
202208.label,
203−.t7,
209+.t8,
204210.caption {
205211 font-size: 3rem;
206212 line-height: 6rem;
@@ -233,22 +239,22 @@ template {
233239 }
234240 .H1ns,
235241 .t2-ns {
236− font-size: 12rem;
237− line-height: 16rem;
242+ font-size: 8rem;
243+ line-height: 12rem;
238244 }
239245 .H2ns,
240246 .t3-ns {
241− font-size: 8rem;
242− line-height: 12rem;
247+ font-size: 6rem;
248+ line-height: 8rem;
243249 }
244250 .H3ns,
245251 .t4-ns {
246− font-size: 6rem;
247− line-height: 12rem;
252+ font-size: 5rem;
253+ line-height: 6rem;
248254 }
249255 .H4ns,
250256 .t5-ns {
251− font-size: 5rem;
257+ font-size: 4rem;
252258 line-height: 6rem;
253259 }
254260 .Pns,
@@ -290,22 +296,22 @@ template {
290296 }
291297 .H1md,
292298 .t2-md {
293− font-size: 12rem;
294− line-height: 16rem;
299+ font-size: 8rem;
300+ line-height: 12rem;
295301 }
296302 .H2md,
297303 .t3-md {
298− font-size: 8rem;
299− line-height: 12rem;
304+ font-size: 6rem;
305+ line-height: 8rem;
300306 }
301307 .H3md,
302308 .t4-md {
303− font-size: 6rem;
304− line-height: 12rem;
309+ font-size: 5rem;
310+ line-height: 6rem;
305311 }
306312 .H4md,
307313 .t5-md {
308− font-size: 5rem;
314+ font-size: 4rem;
309315 line-height: 6rem;
310316 }
311317 .Pmd,
@@ -347,22 +353,22 @@ template {
347353 }
348354 .H1lg,
349355 .t2-lg {
350− font-size: 12rem;
351− line-height: 16rem;
356+ font-size: 8rem;
357+ line-height: 12rem;
352358 }
353359 .H2lg,
354360 .t3-lg {
355− font-size: 8rem;
356− line-height: 12rem;
361+ font-size: 6rem;
362+ line-height: 8rem;
357363 }
358364 .H3lg,
359365 .t4-lg {
360− font-size: 6rem;
361− line-height: 12rem;
366+ font-size: 5rem;
367+ line-height: 6rem;
362368 }
363369 .H4lg,
364370 .t5-lg {
365− font-size: 5rem;
371+ font-size: 4rem;
366372 line-height: 6rem;
367373 }
368374 .Plg,
@@ -396,6 +402,34 @@ template {
396402 max-width: 136rem;
397403 }
398404}
405+.markdown[class=".H1"],
406+.markdown[class=".t2"] {
407+ padding: 12rem 0;
408+}
409+.markdown[class=".H2"],
410+.markdown[class=".t3"] {
411+ padding: 8rem 0;
412+}
413+.markdown[class=".H3"],
414+.markdown[class=".t4"] {
415+ padding: 6rem 0;
416+}
417+.markdown[class=".H4"],
418+.markdown[class=".t5"] {
419+ padding: 5rem 0;
420+}
421+.markdown[class=".P"],
422+.markdown[class=".t6"] {
423+ padding: 8rem 0;
424+}
425+.markdown[class=".H1"] + .markdown[class=".H2"],
426+.markdown[class=".t2"] + .markdown[class=".t3"],
427+.markdown[class=".H2"] + .markdown[class=".H3"],
428+.markdown[class=".t3"] + .markdown[class=".t4"],
429+.markdown[class=".H2"] + .markdown[class=".H3"],
430+.markdown[class=".t3"] + .markdown[class=".t4"] {
431+ padding-top: 0;
432+}
399433.r0 {
400434 border-radius: 0px;
401435}
@@ -1972,23 +2006,23 @@ template {
19722006.fs-normal {
19732007 font-style: normal;
19742008}
1975−.100,
2009+.text-100,
19762010.ultralight {
19772011 font-weight: 100;
19782012}
1979−.200,
2013+.text-200,
19802014.thin {
19812015 font-weight: 200;
19822016}
1983−.300,
2017+.text-300,
19842018.light {
19852019 font-weight: 300;
19862020}
1987−.400,
2021+.text-400,
19882022.regular {
19892023 font-weight: 400;
19902024}
1991−.500,
2025+.text-500,
19922026.medium {
19932027 font-weight: 500;
19942028}
@@ -1996,15 +2030,15 @@ template {
19962030.semibold {
19972031 font-weight: 600;
19982032}
1999−.700,
2033+.text-700,
20002034.bold {
20012035 font-weight: 700;
20022036}
2003−.800,
2037+.text-800,
20042038.extrabold {
20052039 font-weight: 800;
20062040}
2007−.900,
2041+.text-900,
20082042.black {
20092043 font-weight: 900;
20102044}
templates/base.html+1−1
@@ -20,7 +20,7 @@
2020 gtag('config', 'UA-47054188-1');
2121 </script>
2222 </head>
23− <body class="bg-white black">
23+ <body class="bg-white">
2424 <!-- content -->
2525 {% block content %}
2626 {% endblock content %}
templates/doc.html+2−2
@@ -12,14 +12,14 @@
1212 </div>
1313 <div class="container ml8">
1414 <div class="content-nav-spacer"></div>
15− <div class="content docs">
15+ <article class="content">
1616 <!-- header -->
1717 <h1>{{ page.title }}</h1>
1818 <!-- body -->
1919 <div class="pb80">
2020 {{ page.content | safe }}
2121 </div>
22− </div>
22+ </article>
2323 </div>
2424 </div>
2525</div>
templates/page.html+2−2
@@ -37,13 +37,13 @@
3737 <div class="container">
3838 <div class="content-nav-spacer"></div>
3939 <div class="content posts__content pb40">
40− <div class="article">
40+ <article class="article">
4141 <!-- header -->
4242 <h4 class="mt2 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 }}
46− </div>
46+ </article>
4747 </div>
4848 </div>
4949 </div>
templates/posts/list.html+4−4
@@ -28,14 +28,14 @@
2828 </div>
2929 <div class="container">
3030 <div class="content-nav-spacer"></div>
31− <div class="content posts__content">
31+ <article class="content posts__content">
3232 <h1 class="mb8">Posts</h1>
3333 <ul class="list">
3434 {% set posts = get_section(path="posts/_index.md") %}
3535 {% for page in posts.pages %}
3636 <li class="list__item mb8">
37− <span class="h4 mt0 mb0 text-mono text-500 gray-light">&#126;{{ page.date | date(format="%Y.%m.%d") }}</span>
38− <span class="h4 mt0 mb0 h-font text-500 gray-light lowercase">{% if page.taxonomies.posts %}
37+ <span class="h4 mt0 mb0 mono">&#126;{{ page.date | date(format="%Y.%m.%d") }}</span>
38+ <span class="h4 mt0 mb0 h-font">{% if page.taxonomies.posts %}
3939 {% for post in page.taxonomies.posts %}<a href="{{ get_taxonomy_url(kind="posts", name=post) }}">{{ post }}</a> {% endfor %}
4040 {% endif %}</span>
4141 <a href="{{ page.permalink }}"><h2 class="mt1">{{ page.title }}</h2></a>
@@ -43,7 +43,7 @@
4343 </li>
4444 {% endfor %}
4545 </ul>
46− </div>
46+ </article>
4747 </div>
4848 </div>
4949</div>
templates/posts/single.html+2−2
@@ -36,7 +36,7 @@
3636 </div>
3737 <div class="container">
3838 <div class="content-nav-spacer"></div>
39− <div class="content posts__content">
39+ <article class="content posts__content">
4040 <h1 class="mb8">{{ term.name }}</h1>
4141 <ul class="list">
4242 {% for page in term.pages %}
@@ -50,7 +50,7 @@
5050 </li>
5151 {% endfor %}
5252 </ul>
53− </div>
53+ </article>
5454 </div>
5555 </div>
5656</div>
templates/sections/docs.html+2−2
@@ -12,14 +12,14 @@
1212 </div>
1313 <div class="container ml8">
1414 <div class="content-nav-spacer"></div>
15− <div class="content docs">
15+ <article class="content">
1616 <!-- header -->
1717 <h1>{{ section.title }}</h1>
1818 <!-- body -->
1919 <div class="pb80">
2020 {{ section.content | safe }}
2121 </div>
22− </div>
22+ </article>
2323 </div>
2424 </div>
2525</div>
templates/sections/docs/chapters.html+1−1
@@ -12,7 +12,7 @@
1212 </div>
1313 <div class="container ml8">
1414 <div class="content-nav-spacer"></div>
15− <div class="content mb16 docs">
15+ <article class="content mb16">
1616 <!-- header -->
1717 <h1 class="8mb">{{ section.title }}</h1>
1818 <!-- body -->