Skip to content

Commit db5645c

Browse files
author
Lauren McCarthy
committed
updating homepage sketch
1 parent 1d15765 commit db5645c

File tree

11 files changed

+86
-78
lines changed

11 files changed

+86
-78
lines changed

i18n-tracking.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ es:
7979
line 108: ' coordinate-system-simple-shapes-p2x1'
8080
line 120: ' coordinate-system-simple-shapes-p9x1'
8181
line 386: ' create-your-own4'
82+
line 44: ' sketch_info'
83+
line 45: ' sketch_info_link'
8284
zh-Hans:
8385
src/data/en.yml:
8486
line 329: ' coordinate-system-simple-shapes-p2x1'
@@ -87,3 +89,5 @@ zh-Hans:
8789
line 108: ' coordinate-system-simple-shapes-p2x1'
8890
line 120: ' coordinate-system-simple-shapes-p9x1'
8991
line 386: ' create-your-own4'
92+
line 44: ' sketch_info'
93+
line 45: ' sketch_info_link'

src/assets/p5_featured/Tai_PursuingRelief/index.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
<html>
33
<head>
44
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.7/p5.min.js"></script>
5-
<<<<<<< HEAD
6-
=======
75
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.7/addons/p5.dom.min.js"></script>
86
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.7/addons/p5.sound.min.js"></script>
9-
>>>>>>> 26af9e9805cff988c47787df67ac9cb5703cda43
107
<link rel="stylesheet" type="text/css" href="style.css">
118
</head>
129
<body>

src/assets/p5_featured/browning/p5.dom.min.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/assets/p5_featured/browning/p5.min.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/assets/p5_featured/browning/p5.sound.min.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/data/en.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ home:
3939
p3x1: "p5.js is a new interpretation, not an emulation or port, and it is in active development."
4040
p3x2: "Try it out now in the new p5.js Web Editor!"
4141
sketch_by: "by"
42-
sketch_info: "CC Fest! November 10 @ NYU ITP"
43-
sketch_info_link: "http://ccfest.rocks/"
42+
sketch_info: "Homepage sketch adapted from work by 9th grader Grace Obergfell"
43+
sketch_info_link: "Public school teachers interested in learning how to use p5.js in classroom can apply<br>to the Infosys Patherfinders Summer Professional Development by May 7"
4444

4545
copyright:
4646
copyright1: "The p5.js library is free software; you can redistribute it and/or modify it under the terms of the "

src/data/es.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ home:
3939
p3x1: "p5.js es una nueva interpretación, no una emulación o un puerto, y está en activo desarrollo."
4040
p3x2: "¡Prueba p5.js en nuestro nuevo editor web!"
4141
sketch_by: "por"
42-
sketch_info: "CC Fest, 10 de noviembre @ NYU ITP"
43-
sketch_info_link: "http://ccfest.rocks/"
42+
sketch_info: "Homepage sketch adapted from work by 9th grader Grace Obergfell"
43+
sketch_info_link: "Public school teachers interested in learning how to use p5.js in classroom can apply<br>to the Infosys Patherfinders Summer Professional Development by May 7"
4444

4545
copyright:
4646
copyright1: "La biblioteca p5.js es software libre; puedes redistribuirla y/o modificarla según los términos de la "

src/data/zh-Hans.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ home:
3939
p3x1: "p5.js 是个全新的诠释,而不是个仿拟环境或代码移植,同时它也正被持续要发中。"
4040
p3x2: "您可以在全新的 p5.js Web Editor 尝试使用!"
4141
sketch_by: "作者"
42-
sketch_info: "p5js.org 现已有中文版本"
43-
sketch_info_link: "https://medium.com/processing-foundation/p5-js-%E7%9A%84%E4%B8%AD%E6%96%87%E7%BF%BB%E8%AF%91-%E4%B8%BA%E6%94%AF%E6%8C%81%E6%9B%B4%E5%A4%9A%E7%A7%8D%E8%AF%AD%E8%A8%80%E7%BF%BB%E8%AF%91%E5%81%9A%E5%87%86%E5%A4%87-a0fa94da770f"
42+
sketch_info: "Homepage sketch adapted from work by 9th grader Grace Obergfell"
43+
sketch_info_link: "Public school teachers interested in learning how to use p5.js in classroom can apply<br>to the Infosys Patherfinders Summer Professional Development by May 7"
4444

4545
copyright:
4646
copyright1: "p5.js 编程库是个免费开源的软件;您可以在 Free Software Foundation 的"

src/templates/pages/index.hbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ slug: /
4545
{{> footer}}
4646
</div> <!-- end column-span -->
4747

48-
<!-- <div id="credits" tabindex='-1'>
49-
<a href='{{#i18n "sketch_info_link"}}{{/i18n}}' target="_blank">{{#i18n "sketch_info"}}{{/i18n}}</a>
50-
<br>
51-
<i>sunMan</i> {{#i18n "sketch_by"}}{{/i18n}} <a href="http://kayliang.com/" target="_blank">Kay Liang</a><br>
52-
</div> -->
48+
<div id="credits" tabindex='-1'>
49+
<a href='http://www.infosys.org/infosys-foundation-usa/pathfinders/' target="_blank">{{#i18n "sketch_info_link"}}{{/i18n}}</a>
50+
<br>
51+
{{#i18n "sketch_info"}}{{/i18n}}<br>
52+
</div>
5353

5454

5555
</div> <!-- end container -->
5656

5757
<object type="image/svg+xml" data="{{assets}}/img/thick-asterisk-alone.svg" id="asterisk-design-element">*</object>
58-
<!-- <iframe tabindex='-1' id='home-sketch-frame' src='{{assets}}/p5_featured/kay/'></iframe> -->
58+
<iframe tabindex='-1' id='home-sketch-frame' src='{{assets}}/p5_featured/Grace_Obergfell/'></iframe>
5959
</div> <!-- end home-page -->
6060

6161

src/templates/pages/reference/assets/js/reference.js

Lines changed: 65 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)