Skip to content

Commit b400749

Browse files
authored
Merge pull request #1 from coderdojo-linz/master
Merge changes to be even
2 parents 8f736bb + 1774882 commit b400749

File tree

94 files changed

+1918
-553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1918
-553
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,6 @@ ModelManifest.xml
203203
/trainingsanleitungen/minecraft-plugins/05_welcome-Listener/Welcome/nbproject/private/
204204
/trainingsanleitungen/minecraft-plugins/05_welcome-Listener/Welcome/dist/
205205
/scratch-extensions/
206+
207+
# Visual Studio Code
208+
/.vs

.jekyll-metadata

225 KB
Binary file not shown.

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ github_username: CoderDojo-Linz
1010

1111
# Build settings
1212
markdown: kramdown
13+
highlighter: rouge
1314

1415
exclude: ["bin", "bower_components", "jekyll", "node_modules", "obj", "styles/sass/*.*", "typings", "coderdojo-linz.*", "*.json", "app.*", "Gulpfile.js"]

_includes/head.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<meta name="description" content="{% if page.excerpt %}{{ page.description | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}" />
66
<link rel="stylesheet" href="/styles/dependencies.css" />
77
<link rel="stylesheet" href="/styles/styles.css" />
8+
<link rel="stylesheet" href="/styles/codehighlight.css" />
89
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
910
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
1011
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script>

anmeldung.md

Lines changed: 1 addition & 1 deletion

infos/uebungsbeispiele.md

Lines changed: 42 additions & 6 deletions

mailtemplates/registration.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ <h1 style="margin: 0 0 10px 0; font-family: sans-serif; font-size: 24px; line-he
216216
</p>
217217
<p>
218218
Das CoderDojo findet üblicherweise im <a href="https://www.linz.at/wissensturm/anreise.asp" target="_blank">Wissensturm</a> in der Kärtnerstraße 26, 4020 Linz statt.
219-
Ausnahmen davon sind soweit jetzt schon bekannt der 15. Dezember 2017 und der 18. Mai 2018.
219+
Ab und zu sind wir aber auch bei Firmen zu Gast.
220220
Unter <a href="https://coderdojo-linz.github.io/termine.html" target="_blank">Termine</a> findest du die aktuellen Termine mit jeweiligem Verstaltungsort.
221221
Bitte überprüfe einige Tage vor der Veranstaltung, ob der Veranstaltungsort geändert wurde.
222222
</p>

mentoren/gratzl-samuel.md

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

mentoren/images/samuel-gratzl.jpg

-13.6 KB
Binary file not shown.

startLocalServer.bat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@echo off
2+
3+
set MYDIR=%~dp0
4+
5+
rem lines below are only needed for "Docker toolbox for windows"
6+
set MYDIR=%MYDIR:C:\=/c/%
7+
set MYDIR=%MYDIR:\=/%
8+
set MYDIR=%MYDIR:~0,-1%
9+
echo %MYDIR%
10+
11+
12+
docker run -it -p 4000:4000 -v "%MYDIR%":/root/project cibuilds/jekyll jekyll serve --host "0.0.0.0"

styles/codehighlight.css

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
Syntax Highlighting
3+
taken from https://github.com/richleland/pygments-css/blob/master/vs.css
4+
*/
5+
.highlight .hll { background-color: #ffffcc }
6+
.highlight .c { color: #008000 } /* Comment */
7+
.highlight .err { border: 1px solid #FF0000 } /* Error */
8+
.highlight .k { color: #0000ff } /* Keyword */
9+
.highlight .cm { color: #008000 } /* Comment.Multiline */
10+
.highlight .cp { color: #0000ff } /* Comment.Preproc */
11+
.highlight .c1 { color: #008000 } /* Comment.Single */
12+
.highlight .cs { color: #008000 } /* Comment.Special */
13+
.highlight .ge { font-style: italic } /* Generic.Emph */
14+
.highlight .gh { font-weight: bold } /* Generic.Heading */
15+
.highlight .gp { font-weight: bold } /* Generic.Prompt */
16+
.highlight .gs { font-weight: bold } /* Generic.Strong */
17+
.highlight .gu { font-weight: bold } /* Generic.Subheading */
18+
.highlight .kc { color: #0000ff } /* Keyword.Constant */
19+
.highlight .kd { color: #0000ff } /* Keyword.Declaration */
20+
.highlight .kn { color: #0000ff } /* Keyword.Namespace */
21+
.highlight .kp { color: #0000ff } /* Keyword.Pseudo */
22+
.highlight .kr { color: #0000ff } /* Keyword.Reserved */
23+
.highlight .kt { color: #2b91af } /* Keyword.Type */
24+
.highlight .s { color: #a31515 } /* Literal.String */
25+
.highlight .nc { color: #2b91af } /* Name.Class */
26+
.highlight .ow { color: #0000ff } /* Operator.Word */
27+
.highlight .sb { color: #a31515 } /* Literal.String.Backtick */
28+
.highlight .sc { color: #a31515 } /* Literal.String.Char */
29+
.highlight .sd { color: #a31515 } /* Literal.String.Doc */
30+
.highlight .s2 { color: #a31515 } /* Literal.String.Double */
31+
.highlight .se { color: #a31515 } /* Literal.String.Escape */
32+
.highlight .sh { color: #a31515 } /* Literal.String.Heredoc */
33+
.highlight .si { color: #a31515 } /* Literal.String.Interpol */
34+
.highlight .sx { color: #a31515 } /* Literal.String.Other */
35+
.highlight .sr { color: #a31515 } /* Literal.String.Regex */
36+
.highlight .s1 { color: #a31515 } /* Literal.String.Single */
37+
.highlight .ss { color: #a31515 } /* Literal.String.Symbol */
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
704 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1.15 MB
Binary file not shown.
Binary file not shown.
922 KB
Binary file not shown.
915 KB
Binary file not shown.
Binary file not shown.
249 KB
Binary file not shown.
721 KB
Binary file not shown.
1.04 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
899 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
92.5 KB
Binary file not shown.
1.02 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 47 additions & 0 deletions
3.32 KB

0 commit comments

Comments
 (0)