Skip to content

Commit b0b2a32

Browse files
author
Matt Graham
committed
updated agenda
1 parent 82ac1ec commit b0b2a32

File tree

2 files changed

+79
-12
lines changed

2 files changed

+79
-12
lines changed

_layouts/trainer.html

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
3+
---
4+
5+
<!DOCTYPE html>
6+
<html>
7+
<head lang"en-US" dir="ltr">
8+
<meta charset="utf-8" />
9+
<title>{{ page.title }}</title>
10+
<!--Style-->
11+
<link rel="stylesheet" href="dependencies/themes/{{ page.theme }}/css/theme.css">
12+
{% include analytics.html %}
13+
14+
15+
{% if page.deck_type == "revealjs" %}
16+
{% include hydeslides/revealjs/head %}
17+
</head>
18+
<body>
19+
{% include hydeslides/revealjs/slidedeck %}
20+
{% include hydeslides/revealjs/scripts %}
21+
</body>
22+
{% endif %}
23+
24+
{% if page.deck_type == "revealjs-diagrams-only" %}
25+
{% include hydeslides/revealjs/head %}
26+
</head>
27+
<body>
28+
{% include hydeslides/revealjs/slidedeck-diagrams %}
29+
{% include hydeslides/revealjs/scripts %}
30+
</body>
31+
{% endif %}
32+
33+
{% if page.deck_type == "impressjs" %}
34+
<meta name="viewport" content="width=1024" />
35+
<link rel="stylesheet" href="dependencies/themes/core/css/core-impressjs.css">
36+
</head>
37+
38+
<body class="impress-not-supported">
39+
<div class="fallback-message">
40+
<p>Your browser <b>doesn't support the features required</b> by impress.js, so you are presented with a simplified version of this presentation.</p>
41+
<p>For the best experience please use the latest <b>Chrome</b>, <b>Safari</b> or <b>Firefox</b> browser.</p>
42+
</div>
43+
44+
{% include hydeslides/impressjs/slidedeck %}
45+
46+
<div class="hint">
47+
<p>Use a spacebar or arrow keys to navigate</p>
48+
</div>
49+
<script>
50+
if ("ontouchstart" in document.documentElement) {
51+
document.querySelector(".hint").innerHTML = "<p>Tap on the left or right to navigate</p>";
52+
}
53+
</script>
54+
55+
<script src="dependencies/impressjs/js/impress.js"></script>
56+
<script>impress().init();</script>
57+
58+
<script src="dependencies/plugins/launcher/launcher.js"></script>
59+
</body>
60+
{% endif %}
61+
62+
63+
</html>

slides/github-intermediate-advanced.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ chapters: [
1010
'trainers/alex-southgate',
1111
'intro',
1212
'github/intro',
13+
'setup',
14+
'config',
15+
'init',
16+
'commit',
17+
'network',
1318
'github/forking',
1419
'github/pull-request',
1520
'diff',
@@ -21,24 +26,23 @@ chapters: [
2126
'merge',
2227
'rebase',
2328
'reset',
24-
'gui',
2529
'reflog',
26-
'advanced/bisect',
27-
'advanced/bundle',
30+
'gui',
31+
'advanced/github-way',
32+
'advanced/bisecta
2833
'advanced/cherry-pick',
2934
'advanced/collaboration',
30-
'advanced/customizing',
31-
'advanced/filter-branch',
32-
'advanced/gitattributes',
33-
'advanced/github-way',
34-
'advanced/hot-tips',
35-
'advanced/index',
36-
'advanced/internals',
37-
'advanced/notes',
38-
'advanced/refspec',
3935
'advanced/remote',
4036
'advanced/rerere',
37+
'advanced/hot-tips',
38+
'advanced/refspec',
4139
'advanced/searching',
4240
'advanced/submodule',
41+
#'advanced/filter-branch',
42+
#'advanced/gitattributes',
43+
#'advanced/customizing',
44+
#'advanced/bundle',
45+
#'advanced/internals',
46+
#'advanced/notes',
4347
'goodbye']
4448
---

0 commit comments

Comments
 (0)