Skip to content

Commit bcb2cbe

Browse files
author
jordanmccullough
committed
Merge remote-tracking branch 'origin/master' into slide-chapter-summaries
Conflicts: _stylesheets/curriculum.scss
2 parents 3f95ca8 + b86312b commit bcb2cbe

30 files changed

+1187
-1223
lines changed

‎_buildscripts/theme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
for STYLES in page home workbook
22
do
3-
echo "- Generating $STYLES"
4-
sass --style compressed _stylesheets/$STYLES.scss _stylesheets/$STYLES.css
3+
echo "- Generating $STYLES"
4+
sass --style compressed _stylesheets/$STYLES.scss _stylesheets/$STYLES.css
55
done
66
echo "Completed SASS compiling and CSS compression!"

‎_includes/hydeslides/impressjs/slidedeck

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
<div id="impress">
22

3-
{% assign xPos = 0 %}
4-
{% assign coverRotate = 90 %}
3+
{% assign xPos = 0 %}
4+
{% assign coverRotate = 90 %}
55

6-
{% for ch in page.chapters %}
6+
{% for ch in page.chapters %}
77

8-
{% assign yPos = 0 %}
9-
{% assign zIndex = 0 %}
8+
{% assign yPos = 0 %}
9+
{% assign zIndex = 0 %}
1010

11-
{% for section in site.tags[ch] reversed %}
12-
13-
{% if forloop.first %}
14-
{% if section.cover == false %}{% else %}
15-
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-scale="2" data-rotate="{{ coverRotate }}" id="{{ section.chapter | downcase | replace:" ","-" }}">
16-
<h1 class="cover-title">{{ section.chapter }}</h1>
17-
</div>
18-
{% capture yPos %}
19-
{{ yPos | plus: 4000 }}
20-
{% endcapture %}
11+
{% for section in site.tags[ch] reversed %}
12+
13+
{% if forloop.first %}
14+
{% if section.cover == false %}{% else %}
15+
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-scale="2" data-rotate="{{ coverRotate }}" id="{{ section.chapter | downcase | replace:" ","-" }}">
16+
<h1 class="cover-title">{{ section.chapter }}</h1>
17+
</div>
18+
{% capture yPos %}
19+
{{ yPos | plus: 4000 }}
20+
{% endcapture %}
2121

22-
{% endif %}
22+
{% endif %}
2323

24-
{% endif %}
24+
{% endif %}
2525

26-
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-z="{{ zIndex }}" id="{{ section.title | downcase | replace:" ","-" }}">
27-
<h1 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.chapter }}</h1>
28-
<h2 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.title }}</h2>
29-
<div class="clear-all"></div>
30-
{{ section.content }}
31-
</div>
26+
<div class="slide step" data-x="{{ xPos }}" data-y="{{ yPos }}" data-z="{{ zIndex }}" id="{{ section.title | downcase | replace:" ","-" }}">
27+
<h1 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.chapter }}</h1>
28+
<h2 {% if section.heading == false %}class="hidden"{% endif %}>{{ section.title }}</h2>
29+
<div class="clear-all"></div>
30+
{{ section.content }}
31+
</div>
3232

33-
{% capture zIndex %}
34-
{{ zIndex | plus: -300}}
35-
{% endcapture %}
33+
{% capture zIndex %}
34+
{{ zIndex | plus: -300}}
35+
{% endcapture %}
3636

37-
{% capture yPos %}
38-
{{ yPos | plus: 1000 }}
39-
{% endcapture %}
37+
{% capture yPos %}
38+
{{ yPos | plus: 1000 }}
39+
{% endcapture %}
4040

41-
{% endfor %}
41+
{% endfor %}
4242

43-
{% capture xPos %}
44-
{{ xPos | plus: 2000 }}
45-
{% endcapture %}
43+
{% capture xPos %}
44+
{{ xPos | plus: 2000 }}
45+
{% endcapture %}
4646

47-
{% endfor %}
47+
{% endfor %}
4848
</div>

‎_includes/hydeslides/revealjs/head

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<!-- If the query includes 'print-pdf', use the PDF print sheet -->
1111
<script>
12-
document.write( '<link rel="stylesheet" href="dependencies/revealjs/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
12+
document.write( '<link rel="stylesheet" href="dependencies/revealjs/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
1313
</script>
1414

1515
<!--[if lt IE 9]>
@@ -21,7 +21,7 @@
2121

2222
<!--GitHub Style-->
2323
{% if page.theme %}
24-
{% assign theme = page.theme %}
24+
{% assign theme = page.theme %}
2525
{% else %}
26-
{% assign theme = "original" %}
26+
{% assign theme = "original" %}
2727
{% endif %}

‎_includes/hydeslides/revealjs/scripts

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -2,102 +2,102 @@
22
<script src="dependencies/revealjs/lib/js/head.min.js"></script>
33
<script src="dependencies/revealjs/js/reveal.js"></script>
44
<script>
5-
// Full list of configuration options available here:
6-
// https://github.com/hakimel/reveal.js#configuration
7-
Reveal.initialize({
8-
controls: false,
9-
progress: true,
10-
history: true,
11-
center: true,
12-
13-
theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
14-
transition: Reveal.getQueryHash().transition || 'none', // default/cube/page/concave/zoom/linear/none
15-
backgroundTransition: 'none',
16-
17-
// Optional libraries used to extend on reveal.js
18-
dependencies: [
19-
{ src: 'dependencies/revealjs/lib/js/classList.js', condition: function() { return !document.body.classList; } },
20-
{ src: 'dependencies/revealjs/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
21-
{ src: 'dependencies/revealjs/plugin/zoom-js/zoom.js', condition: function() { return !!document.body.classList; } }
22-
]
23-
});
24-
25-
// SnapSVG
26-
// Run once at startup to inject all SVGs
27-
loadAllSvg();
28-
29-
function loadAllSvg(){
30-
var els = document.getElementsByTagName("svg");
31-
32-
for(var elCount = 0; elCount < els.length; elCount++){
33-
injectSvg(els[elCount]);
34-
}
35-
}
36-
37-
function injectSvg(canvasTarget){
38-
if(canvasTarget){
39-
Snap.load(
40-
canvasTarget.getAttribute("data-path"),
41-
function (frag) {
42-
sCanvas = Snap("#" + canvasTarget.getAttribute("id"));
43-
fCanvas = Snap();
44-
sCanvas.clear();
45-
46-
//Determine if grouped build-steps present
47-
var buildStepBase = frag.select("#base");
48-
buildStepGroups = frag.selectAll("[id^=step-]"),
49-
buildStepCount = buildStepGroups.length,
50-
buildStep = 0;
51-
52-
//Setup the container canvas boundary sizing
53-
setCanvasBBox(frag, canvasTarget);
54-
55-
// Show the first build step when available
56-
// Otherwise just show entire graphic
57-
if(buildStepCount > 0){
58-
// Include the non-fragment base layout/visuals
59-
fCanvas.append(buildStepBase);
60-
// fCanvas.append(buildStepGroups[buildStep]);
61-
62-
for(; buildStep < buildStepCount; buildStep++){
63-
64-
// Supports fragment in-out transitions by
65-
// wrapping in a group and applying a second
66-
// fragment class
67-
if(buildStepGroups[buildStep].node.id.match(/in-out/)){
68-
var tG = fCanvas.g(buildStepGroups[buildStep]);
69-
buildStepGroups[buildStep].attr("class", "fragment fade-out");
70-
tG.attr("class", "fragment");
71-
fCanvas.append(tG);
72-
}
73-
else{
74-
buildStepGroups[buildStep].attr("class", "fragment");
75-
fCanvas.append(buildStepGroups[buildStep]);
76-
}
77-
}
78-
} else{
79-
//No "steps" to build out, ensure boundary guide
80-
//is not rendered
81-
frag.select("#boundary").remove();
82-
fCanvas.append(frag);
83-
}
84-
85-
sCanvas.append(fCanvas);
86-
}
87-
);
88-
}
89-
}
90-
91-
function setCanvasBBox(canvas, target){
5+
// Full list of configuration options available here:
6+
// https://github.com/hakimel/reveal.js#configuration
7+
Reveal.initialize({
8+
controls: false,
9+
progress: true,
10+
history: true,
11+
center: true,
12+
13+
theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
14+
transition: Reveal.getQueryHash().transition || 'none', // default/cube/page/concave/zoom/linear/none
15+
backgroundTransition: 'none',
16+
17+
// Optional libraries used to extend on reveal.js
18+
dependencies: [
19+
{ src: 'dependencies/revealjs/lib/js/classList.js', condition: function() { return !document.body.classList; } },
20+
{ src: 'dependencies/revealjs/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
21+
{ src: 'dependencies/revealjs/plugin/zoom-js/zoom.js', condition: function() { return !!document.body.classList; } }
22+
]
23+
});
24+
25+
// SnapSVG
26+
// Run once at startup to inject all SVGs
27+
loadAllSvg();
28+
29+
function loadAllSvg(){
30+
var els = document.getElementsByTagName("svg");
31+
32+
for(var elCount = 0; elCount < els.length; elCount++){
33+
injectSvg(els[elCount]);
34+
}
35+
}
36+
37+
function injectSvg(canvasTarget){
38+
if(canvasTarget){
39+
Snap.load(
40+
canvasTarget.getAttribute("data-path"),
41+
function (frag) {
42+
sCanvas = Snap("#" + canvasTarget.getAttribute("id"));
43+
fCanvas = Snap();
44+
sCanvas.clear();
45+
46+
//Determine if grouped build-steps present
47+
var buildStepBase = frag.select("#base");
48+
buildStepGroups = frag.selectAll("[id^=step-]"),
49+
buildStepCount = buildStepGroups.length,
50+
buildStep = 0;
51+
52+
//Setup the container canvas boundary sizing
53+
setCanvasBBox(frag, canvasTarget);
54+
55+
// Show the first build step when available
56+
// Otherwise just show entire graphic
57+
if(buildStepCount > 0){
58+
// Include the non-fragment base layout/visuals
59+
fCanvas.append(buildStepBase);
60+
// fCanvas.append(buildStepGroups[buildStep]);
61+
62+
for(; buildStep < buildStepCount; buildStep++){
63+
64+
// Supports fragment in-out transitions by
65+
// wrapping in a group and applying a second
66+
// fragment class
67+
if(buildStepGroups[buildStep].node.id.match(/in-out/)){
68+
var tG = fCanvas.g(buildStepGroups[buildStep]);
69+
buildStepGroups[buildStep].attr("class", "fragment fade-out");
70+
tG.attr("class", "fragment");
71+
fCanvas.append(tG);
72+
}
73+
else{
74+
buildStepGroups[buildStep].attr("class", "fragment");
75+
fCanvas.append(buildStepGroups[buildStep]);
76+
}
77+
}
78+
} else{
79+
//No "steps" to build out, ensure boundary guide
80+
//is not rendered
81+
frag.select("#boundary").remove();
82+
fCanvas.append(frag);
83+
}
84+
85+
sCanvas.append(fCanvas);
86+
}
87+
);
88+
}
89+
}
90+
91+
function setCanvasBBox(canvas, target){
9292
var boundary,
93-
maxWidth,
94-
maxHeight;
93+
maxWidth,
94+
maxHeight;
9595

9696
boundary = canvas.select("#boundary").select(":first-child").getBBox();
97-
maxWidth = Math.ceil(boundary.width);
98-
maxHeight = Math.ceil(boundary.height);
97+
maxWidth = Math.ceil(boundary.width);
98+
maxHeight = Math.ceil(boundary.height);
9999

100-
target.setAttribute("height", (((maxHeight/maxWidth)*100)+"%"));
100+
target.setAttribute("height", (((maxHeight/maxWidth)*100)+"%"));
101101
target.setAttribute("viewBox", "0 0 " + maxWidth + " " + maxHeight);
102102
return canvas;
103103
}

‎_includes/hydeslides/revealjs/slidedeck

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
<div class="reveal" id="reveal">
2-
<div class="slides">
3-
{% include hydeslides/revealjs/slide-open-chapter %}
4-
<h1 contenteditable>{% if page.deck_title %}{{page.deck_title}}{% else %}Welcome{% endif %}</h1>
5-
<div class="pseudoLink" contenteditable>https://training.github.com/kit</div>
6-
{% include hydeslides/revealjs/slide-close %}
2+
<div class="slides">
3+
{% include hydeslides/revealjs/slide-open-chapter %}
4+
<h1 contenteditable>{% if page.deck_title %}{{page.deck_title}}{% else %}Welcome{% endif %}</h1>
5+
<div class="pseudoLink" contenteditable>https://training.github.com/kit</div>
6+
{% include hydeslides/revealjs/slide-close %}
77

8-
{% for ch in page.chapters %}
9-
<!--Capture the chapter index value-->
10-
{% assign chapterIndex = forloop.index0 %}
8+
{% for ch in page.chapters %}
9+
<!--Capture the chapter index value-->
10+
{% assign chapterIndex = forloop.index0 %}
1111

12-
<!--Nest all chapter's content. Chapters traverse left-right; Sections slide up-down-->
13-
<section>
14-
{% for section in site.tags[ch] reversed %}
15-
<!--Capture the slide index value-->
16-
{% assign slideIndex = forloop.index0 %}
12+
<!--Nest all chapter's content. Chapters traverse left-right; Sections slide up-down-->
13+
<section>
14+
{% for section in site.tags[ch] reversed %}
15+
<!--Capture the slide index value-->
16+
{% assign slideIndex = forloop.index0 %}
1717

18-
<!--Chapter Auto-Injection-->
19-
{% if forloop.first %}
20-
{% if section.cover != false %}
21-
{% include hydeslides/revealjs/slide-open-chapter %}
22-
<h2>{{ section.chapter }}</h2>
23-
{% include hydeslides/revealjs/slide-close %}
24-
{% endif %}
25-
{% endif %}
18+
<!--Chapter Auto-Injection-->
19+
{% if forloop.first %}
20+
{% if section.cover != false %}
21+
{% include hydeslides/revealjs/slide-open-chapter %}
22+
<h2>{{ section.chapter }}</h2>
23+
{% include hydeslides/revealjs/slide-close %}
24+
{% endif %}
25+
{% endif %}
2626

27-
{% include hydeslides/revealjs/slide-open %}
28-
{% include hydeslides/revealjs/title %}
29-
{% include hydeslides/revealjs/svg %}
30-
{{ section.content }}
31-
{% include hydeslides/revealjs/slide-close %}
32-
{% endfor %}
33-
</section>
34-
{% endfor %}
35-
</div>
27+
{% include hydeslides/revealjs/slide-open %}
28+
{% include hydeslides/revealjs/title %}
29+
{% include hydeslides/revealjs/svg %}
30+
{{ section.content }}
31+
{% include hydeslides/revealjs/slide-close %}
32+
{% endfor %}
33+
</section>
34+
{% endfor %}
35+
</div>
3636
</div>

0 commit comments

Comments
 (0)