Skip to content

Commit bc2fe90

Browse files
author
Lauren McCarthy
committed
resolving merge conflicts
1 parent 72b5276 commit bc2fe90

File tree

7 files changed

+49
-34
lines changed

7 files changed

+49
-34
lines changed

‎dist/contributors-conference/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ <h2>Support</h2>
219219

220220
<p>This event was made possible by a grant from the <a href="http://arts.gov/" target="_blank">National Endowment for the Arts</a>,
221221
and generous support from the <a href="https://tisch.nyu.edu/itp" target="_blank">NYU Interactive Telecommunications Program</a>
222-
(ITP), <a href='http://foundation.processing.org' target=_blank>Processing Foundation</a>, <a href="http://theartificial.nl/" target="_blank">TheArtificial</a>, <a href="http://bocoup.com/" target="_blank">Bocoup</a>, <a href="http://tinysubversions.com/" target="_blank">Darius Kazemi</a>, the <a href="http://www.du.edu/ahss/edp/" target="_blank">Emergent Digital Practices | University of Denver</a><br><b>and</b></p>
222+
(ITP), <a href='http://foundation.processing.org' target=_blank>Processing Foundation</a>, <a href="http://theartificial.nl/" target="_blank">TheArtificial</a>, <a href="http://bocoup.com/" target="_blank">Bocoup</a>, <a href="http://tinysubversions.com/" target="_blank">Darius Kazemi</a>, and <a href="http://www.du.edu/ahss/edp/" target="_blank">Emergent Digital Practices | University of Denver</a><br><b>Thank you!</b></p>
223223

224224
<div style='width:100%; position: relative; text-align:center'><a class='nounderline' href='http://arts.gov/' target=_blank ><img style='width:38%; padding-bottom:20px' src='../assets/img/contributors-conference/nea.jpg'/></a></div>
225225
<a class='nounderline' href='http://studioforcreativeinquiry.org' target=_blank ><img style='width:18%' src='../assets/img/contributors-conference/studio.png'/>

‎dist/es/learn/index.html

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,19 @@ <h4>Usando un servidor local</h4>
186186
<p>Cómo configurar un servidor local en Mac OS X, Windows o Linux. </p>
187187
</div>
188188

189+
<div class="spacer"></div>
190+
191+
<div class="left-column">
192+
<a class="nounderline" href="p5-screen-reader.html">
193+
<div class="label">
194+
<img src="../../assets/img/learn/lib_placeholder.jpg">
195+
</a>
196+
<a class="nounderline" href="p5-screen-reader.html">
197+
<h4>p5 con un lector de pantalla </h4>
198+
</a>
199+
</div>
200+
<p>Configurando p5 para que pueda ser usado fácilmente con un lector de pantalla.</p>
201+
</div>
189202

190203
<div class="spacer"></div>
191204

@@ -322,10 +335,6 @@ <h4>Depurar </h4>
322335
<p>Guía de cómo depurar tu código para todo público.</p>
323336
</div>
324337

325-
326-
327-
328-
329338
<div class="right-column">
330339
<a class="nounderline" href="https://github.com/processing/p5.js/wiki/Optimizing-p5.js-Code-for-Performance">
331340
<div class="label">
@@ -335,6 +344,7 @@ <h4>Depurar </h4>
335344
</div>
336345
<p>Un tutorial de consejos y trucos para optimizar tu código para que corra más rápida y fluidamente.</p>
337346
</div>
347+
338348
<div class="spacer"></div>
339349

340350
<div class="left-column">
@@ -349,7 +359,6 @@ <h4>Unit testing y desarrollo según pruebas</h4>
349359
<p>Sálvate de la agonía al instalar. ¿Qué es unit testing y cómo usarlo? Por Andy Timmons.</p>
350360
</div>
351361

352-
353362
<div class="spacer"></div>
354363

355364
<h2 class="tutorial-title">Contribuir a la comunidad</h2>
@@ -367,7 +376,6 @@ <h4>Desarrollo</h4>
367376
<p>Introducción y panorámica general sobre cómo contribuir al desarrollo.</p>
368377
</div>
369378

370-
371379
<div class="right-column">
372380
<a class="nounderline" href="http://www.luisapereira.net/teaching/looking-inside-p5/">
373381
<div class="label">
@@ -403,9 +411,6 @@ <h4>Creating libraries </h4>
403411
<p>Creating p5.js addon libraries.</p>
404412
</div>
405413

406-
407-
408-
409414
<div class="spacer"></div>
410415

411416
</section>

‎dist/learn/index.html

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,19 @@ <h4>Using a local server</h4>
186186
<p>How to set up a local server on Mac OSX, Windows, or Linux. </p>
187187
</div>
188188

189+
<div class="spacer"></div>
190+
191+
<div class="left-column">
192+
<a class="nounderline" href="p5-screen-reader.html">
193+
<div class="label">
194+
<img src="../assets/img/learn/lib_placeholder.jpg">
195+
</a>
196+
<a class="nounderline" href="p5-screen-reader.html">
197+
<h4>p5 with a screen reader </h4>
198+
</a>
199+
</div>
200+
<p>Setting up p5 so that it can be used easily with a screen reader.</p>
201+
</div>
189202

190203
<div class="spacer"></div>
191204

@@ -322,10 +335,6 @@ <h4>Debugging </h4>
322335
<p>Field guide to debugging for everyone.</p>
323336
</div>
324337

325-
326-
327-
328-
329338
<div class="right-column">
330339
<a class="nounderline" href="https://github.com/processing/p5.js/wiki/Optimizing-p5.js-Code-for-Performance">
331340
<div class="label">
@@ -335,6 +344,7 @@ <h4>Debugging </h4>
335344
</div>
336345
<p>A tutorial of tips and tricks for optimizing your code to make it run faster and smoother.</p>
337346
</div>
347+
338348
<div class="spacer"></div>
339349

340350
<div class="left-column">
@@ -349,7 +359,6 @@ <h4>Unit testing and test driven development</h4>
349359
<p>Save yourself from agony on install day. What is unit testing and how to use it? By Andy Timmons.</p>
350360
</div>
351361

352-
353362
<div class="spacer"></div>
354363

355364
<h2 class="tutorial-title">Contributing to the community</h2>
@@ -367,7 +376,6 @@ <h4>Development</h4>
367376
<p>Getting started and overview for contributing to development.</p>
368377
</div>
369378

370-
371379
<div class="right-column">
372380
<a class="nounderline" href="http://www.luisapereira.net/teaching/looking-inside-p5/">
373381
<div class="label">
@@ -403,9 +411,6 @@ <h4>Creating libraries </h4>
403411
<p>Creating p5.js addon libraries.</p>
404412
</div>
405413

406-
407-
408-
409414
<div class="spacer"></div>
410415

411416
</section>

‎dist/offline-reference/p5-reference.zip

0 Bytes
Binary file not shown.

‎dist/zh-Hans/contributors-conference/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ <h2>支持</h2>
220220

221221
<p>这项活动资金来自于 <a href="http://arts.gov/" target="_blank">National Endowment for the Arts</a>,
222222
所提供的资助及来自以下赞助者的慷慨支持： <a href="https://tisch.nyu.edu/itp" target="_blank">NYU Interactive Telecommunications Program</a>
223-
(ITP), <a href='http://foundation.processing.org' target=_blank>Processing Foundation</a>, <a href="http://theartificial.nl/" target="_blank">TheArtificial</a>, <a href="http://bocoup.com/" target="_blank">Bocoup</a>, <a href="http://tinysubversions.com/" target="_blank">Darius Kazemi</a>, <a href="http://www.du.edu/ahss/edp/" target="_blank">Emergent Digital Practices | University of Denver</a><br><b>及</b></p>
223+
(ITP), <a href='http://foundation.processing.org' target=_blank>Processing Foundation</a>, <a href="http://theartificial.nl/" target="_blank">TheArtificial</a>, <a href="http://bocoup.com/" target="_blank">Bocoup</a>, <a href="http://tinysubversions.com/" target="_blank">Darius Kazemi</a>, 及 <a href="http://www.du.edu/ahss/edp/" target="_blank">Emergent Digital Practices | University of Denver</a><br><b>谢谢！</b></p>
224224

225225
<div style='width:100%; position: relative; text-align:center'><a class='nounderline' href='http://arts.gov/' target=_blank ><img style='width:38%; padding-bottom:20px' src='../../assets/img/contributors-conference/nea.jpg'/></a></div>
226226
<a class='nounderline' href='http://studioforcreativeinquiry.org' target=_blank ><img style='width:18%' src='../../assets/img/contributors-conference/studio.png'/>

‎dist/zh-Hans/examples/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ <h3 name='dom' class='anchor'>DOM</h3>
13941394
</p>
13951395

13961396

1397-
<h3 name='drawing' class='anchor'></h3>
1397+
<h3 name='drawing' class='anchor'>Drawing</h3>
13981398
<p>
13991399

14001400
<a class='js-lang example-link' href="drawing-continous-lines.html"
@@ -1433,7 +1433,7 @@ <h3 name='drawing' class='anchor'></h3>
14331433
</p>
14341434

14351435

1436-
<h3 name='transform' class='anchor'></h3>
1436+
<h3 name='transform' class='anchor'>Transform</h3>
14371437
<p>
14381438

14391439
<a class='js-lang example-link' href="transform-translate.html"
@@ -1483,7 +1483,7 @@ <h3 name='transform' class='anchor'></h3>
14831483
</p>
14841484

14851485

1486-
<h3 name='typography' class='anchor'></h3>
1486+
<h3 name='typography' class='anchor'>Typography</h3>
14871487
<p>
14881488

14891489
<a class='js-lang example-link' href="typography-letters.html"

‎dist/zh-Hans/learn/index.html

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,19 @@ <h4>本地伺服器</h4>
187187
<p>如何在 Mac OSX、Windows 或 Linux 上设置本地伺服器。 </p>
188188
</div>
189189

190+
<div class="spacer"></div>
191+
192+
<div class="left-column">
193+
<a class="nounderline" href="p5-screen-reader.html">
194+
<div class="label">
195+
<img src="../../assets/img/learn/lib_placeholder.jpg">
196+
</a>
197+
<a class="nounderline" href="p5-screen-reader.html">
198+
<h4>p5 with a screen reader </h4>
199+
</a>
200+
</div>
201+
<p>Setting up p5 so that it can be used easily with a screen reader.</p>
202+
</div>
190203

191204
<div class="spacer"></div>
192205

@@ -283,10 +296,10 @@ <h4>曲线</h4>
283296
<img src="../../assets/img/learn/lib_placeholder.jpg">
284297
</a>
285298
<a class="nounderline" href="interactivity.html">
286-
<h4>交互性</h4>
299+
<h4>互动性</h4>
287300
</a>
288301
</div>
289-
<p>鼠标与键盘的交互简介。</p>
302+
<p>鼠标与键盘的互动简介。</p>
290303
</div>
291304

292305
<div class="spacer"></div>
@@ -323,10 +336,6 @@ <h4>调试 </h4>
323336
<p>调试程序的简介。</p>
324337
</div>
325338

326-
327-
328-
329-
330339
<div class="right-column">
331340
<a class="nounderline" href="https://github.com/processing/p5.js/wiki/Optimizing-p5.js-Code-for-Performance">
332341
<div class="label">
@@ -336,6 +345,7 @@ <h4>调试 </h4>
336345
</div>
337346
<p>此教程包含技巧及窍门以进一步优化您的程式，使它执行得更快更顺畅。</p>
338347
</div>
348+
339349
<div class="spacer"></div>
340350

341351
<div class="left-column">
@@ -350,7 +360,6 @@ <h4>单元测试及测试驱动开发</h4>
350360
<p>避免安装时不必要的烦恼。什么是单元测试？如何使用单元测试？作者 Andy Timmons。</p>
351361
</div>
352362

353-
354363
<div class="spacer"></div>
355364

356365
<h2 class="tutorial-title">回馈社群</h2>
@@ -368,7 +377,6 @@ <h4>开发</h4>
368377
<p>开发设置简介及一览。</p>
369378
</div>
370379

371-
372380
<div class="right-column">
373381
<a class="nounderline" href="http://www.luisapereira.net/teaching/looking-inside-p5/">
374382
<div class="label">
@@ -404,9 +412,6 @@ <h4>Creating libraries </h4>
404412
<p>Creating p5.js addon libraries.</p>
405413
</div>
406414

407-
408-
409-
410415
<div class="spacer"></div>
411416

412417
</section>

0 commit comments

Comments
 (0)