Skip to content

Commit 8cf05f2

Browse files
authored
Merge pull request #14 from mcpt/config-fixed
Merge formatting changes
2 parents 0a4d6bc + c7fe2a7 commit 8cf05f2

15 files changed

Lines changed: 1753 additions & 89 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ resources/
55
node_modules/
66
package-lock.json
77
package.json
8+
9+
.hugo_build.lock

LICENSE.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
The learning content/tutorials/lessons are licensed under a [Creative Commons Attribution-ShareAlike 4.0 International License](LICENSES/Content).
2+
3+
The code for this site is licensed under the [GNU Affero General Public License v3.0](LICENSES/Code).
4+
5+
The [Hugo Relearn theme](https://github.com/McShelby/hugo-theme-relearn) is used under its [MIT License](LICENSES/RelearnTheme).

LICENSES/Code

Lines changed: 661 additions & 0 deletions
Large diffs are not rendered by default.

LICENSES/Content

Lines changed: 423 additions & 0 deletions
Large diffs are not rendered by default.

LICENSES/RelearnTheme

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2021 Sören Weber
4+
Copyright (c) 2017 Valere JEANTET
5+
Copyright (c) 2016 MATHIEU CORNIC
6+
Copyright (c) 2014 Grav
7+
8+
Permission is hereby granted, free of charge, to any person obtaining a copy of
9+
this software and associated documentation files (the "Software"), to deal in
10+
the Software without restriction, including without limitation the rights to
11+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
12+
the Software, and to permit persons to whom the Software is furnished to do so,
13+
subject to the following conditions:
14+
15+
The above copyright notice and this permission notice shall be included in all
16+
copies or substantial portions of the Software.
17+
18+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
20+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
21+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
22+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
23+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ home = ["HTML", "RSS", "JSON"]
1010
[params]
1111
themeVariant = "mcpt"
1212
custom_js_urls = ['/js/p5.min.js']
13-
custom_css = ['/css/p5js.css']
13+
custom_css = ['/css/p5js.css', '/css/sidebar.css']
1414

1515
[markup.goldmark.renderer]
1616
unsafe = true

content/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ title = "Home"
66
---
77
The Learning Branch is here to help you through the ICS curriculum while also expanding your world of coding knowledge in an interactive, informative, and (most importantly) fun way!
88

9-
{{% notice info "Next Event: Game Series - Part I" %}}
10-
Join us **today** (Thursday 11th) at **4:15pm** for our **Game Dev** series, as you’ll build your very own tower defense game! Get ready for an hour of interactive learning suited for all skill levels, preparing you for our keynote Game Jam during the Winter Break!
9+
{{% notice info "Next Event: Game Series - Part II" %}}
10+
Join us on **Thursday, December 2nd** at **4:15pm** for our **Game Dev** series, as you’ll build your very own tower defense game! Get ready for an hour of interactive learning suited for all skill levels, preparing you for our keynote Game Jam during the Winter Break!
1111
{{% /notice %}}
1212

1313
### Jump To:

content/game-dev/leaderboard.md

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,12 @@ weight = 1
55
+++
66
---
77

8+
<link href="/css/leaderboard.css" rel="stylesheet">
9+
810
{{% notice info %}}
911
Participate to earn **GAME DEV POINTS**, which will award you with a *surprise* during the [Game Jam](/game-jam)!
1012

1113
Each participation will be worth **200** points, with winners of the *special challenges* earning an extra **100** points per challenge.
1214
{{% /notice %}}
1315

14-
<table>
15-
<thead>
16-
<tr>
17-
<th>Rank</th>
18-
<th>Name</th>
19-
<th>Part I</th>
20-
<th>Part II</th>
21-
<th>Part III</th>
22-
<th>Total Points</th>
23-
</tr>
24-
</thead>
25-
<tbody><td>1</td><td>MuteMini</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+100</sub> </td><td> </td><td> </td><td><b>300</b></td></tbody>
26-
<tbody><td>1</td><td>MarsFlat</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+100</sub> </td><td> </td><td> </td><td><b>300</b></td></tbody>
27-
<tbody><td>1</td><td>Luka Jovanovic</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+100</sub> </td><td> </td><td> </td><td><b>300</b></td></tbody>
28-
<tbody><td>1</td><td>BattleMage_</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+100</sub> </td><td> </td><td> </td><td><b>300</b></td></tbody>
29-
<tbody><td>1</td><td>AZron</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+100</sub> </td><td> </td><td> </td><td><b>300</b></td></tbody>
30-
<tbody><td>1</td><td>Chelsea Wong</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+100</sub> </td><td> </td><td> </td><td><b>300</b></td></tbody>
31-
<tbody><td>7</td><td>Michael C</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+90</sub> </td><td> </td><td> </td><td><b>290</b></td></tbody>
32-
<tbody><td>7</td><td>Ryan Atlas</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+90</sub> </td><td> </td><td> </td><td><b>290</b></td></tbody>
33-
<tbody><td>9</td><td>RedWiz</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+60</sub> </td><td> </td><td> </td><td><b>260</b></td></tbody>
34-
<tbody><td>9</td><td>Maplefin</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+60</sub> </td><td> </td><td> </td><td><b>260</b></td></tbody>
35-
<tbody><td>9</td><td>alexa</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+60</sub> </td><td> </td><td> </td><td><b>260</b></td></tbody>
36-
<tbody><td>12</td><td>Lost_Cactus</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+50</sub> </td><td> </td><td> </td><td><b>250</b></td></tbody>
37-
<tbody><td>13</td><td>lukas142434</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+20</sub> </td><td> </td><td> </td><td><b>220</b></td></tbody>
38-
<tbody><td>13</td><td>C.W.</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+20</sub> </td><td> </td><td> </td><td><b>220</b></td></tbody>
39-
<tbody><td>15</td><td>Minh</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+10</sub> </td><td> </td><td> </td><td><b>210</b></td></tbody>
40-
<tbody><td>15</td><td>Felix</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+10</sub> </td><td> </td><td> </td><td><b>210</b></td></tbody>
41-
<tbody><td>15</td><td>Sarah Zhao</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+10</sub> </td><td> </td><td> </td><td><b>210</b></td></tbody>
42-
<tbody><td>15</td><td>Galit T.</td><td style="color:green; background:#72f795"> <b>200</b> <sub>+10</sub> </td><td> </td><td> </td><td><b>210</b></td></tbody>
43-
<tbody><td>19</td><td>Ella R</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
44-
<tbody><td>19</td><td>Paul Lee</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
45-
<tbody><td>19</td><td>Leo Liu</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
46-
<tbody><td>19</td><td>roma</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
47-
<tbody><td>19</td><td>Aidan Wang</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
48-
<tbody><td>19</td><td>Ivy Zhuang</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
49-
<tbody><td>19</td><td>Formoon28</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
50-
<tbody><td>19</td><td>ryan gill</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
51-
<tbody><td>19</td><td>Arjun</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
52-
<tbody><td>19</td><td>Anthony Zanchetta</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
53-
<tbody><td>19</td><td>deggy</td><td style="color:green;"> <b>200</b> </td><td> </td><td> </td><td><b>200</b></td></tbody>
54-
<tbody style="color:#800000; background:#ff9898"><td>30</td><td>Ronald You</td><td> <b>-9999</b> </td><td> </td><td> </td><td><b>-9999</b></td></tbody>
55-
56-
</table>
57-
16+
{{< users-table >}}

0 commit comments

Comments
 (0)