Merge pull request #78 from github/adding-southgate

Matthew McCullough · Matthew McCullough · commit ca0eab4b0c4e · 2014-04-14T20:59:13.000-06:00
Adding southgate
diff --git a/slides/README.md b/slides/README.md
@@ -24,7 +24,7 @@ A chapter consists of a `_posts/<yourchapter>` and markdown files consisting of
 
 ### Notes
 
-Speaker notes, only shown on the "split" screen displayed by presseing the S key, are included on slides in an HTML wrapped element with `class="notes"`.
+Speaker notes, only shown on the "split" screen displayed by pressing the S key, are included on slides in an HTML wrapped element with `class="notes"`.
 
 	{% include hydeslides/notes-open.html %}
 	  Oh hey, these are some notes. They'll be hidden in your presentation, but you can see them if you open the speaker notes window (hit 's' on your keyboard).
diff --git a/slides/_posts/bumpers/trainers/alex-southgate/0001-01-01-alex-southgate.md b/slides/_posts/bumpers/trainers/alex-southgate/0001-01-01-alex-southgate.md
@@ -0,0 +1,13 @@
+---
+chapter: 'Trainer'
+cover: false
+layout: slide
+tags: ['trainers/alex-southgate']
+---
+
+<img class="headshot" src="assets/headshots/alex-southgate.jpg" alt="Alex Southgate">
+
+<div><i class="icon-github-alt"> </i> <a
+href="http://github.com/southgate">github.com/southgate</a></div>
+<div><i class="icon-twitter"> </i> <a
+href="http://twitter.com/fromagie">@fromagie</a></div>
diff --git a/slides/assets/headshots/alex-southgate.jpg b/slides/assets/headshots/alex-southgate.jpg
diff --git a/slides/dependencies/themes/github/css/overrides.scss b/slides/dependencies/themes/github/css/overrides.scss
@@ -18,7 +18,10 @@ html, body, .reveal{
 img{
 	height: auto !important;
 	width: 100% !important;
+}
 
+img.headshot {
+  max-width: 50%;
 }
 
 .reveal .roll span:after{
diff --git a/slides/dependencies/themes/github/css/theme.css b/slides/dependencies/themes/github/css/theme.css
@@ -27,6 +27,9 @@ img {
   height: auto !important;
   width: 100% !important; }
 
+img.headshot {
+  max-width: 50%; }
+
 .reveal .roll span:after {
   content: none; }
 
diff --git a/slides/github-intermediate-advanced.md b/slides/github-intermediate-advanced.md
@@ -0,0 +1,44 @@
+---
+layout: slide
+deck_type: revealjs
+theme: github
+title: GitHub Intermediate/Advanced Course Slides
+description: A slide deck to the GitHub Intermediate/Advanced class.
+chapters: [
+  'preroll',
+  'trainers/matt-graham',
+  'trainers/alex-southgate',
+  'intro',
+  'github/intro',
+  'github/forking',
+  'github/pull-request',
+  'diff',
+  'log',
+  'rm-mv',
+  'ignore',
+  'branch',
+  'checkout',
+  'merge',
+  'rebase',
+  'reset',
+  'gui',
+  'reflog',
+  'advanced/bisect',
+  'advanced/bundle',
+  'advanced/cherry-pick',
+  'advanced/collaboration',
+  'advanced/customizing',
+  'advanced/filter-branch',
+  'advanced/gitattributes',
+  'advanced/github-way',
+  'advanced/hot-tips',
+  'advanced/index',
+  'advanced/internals',
+  'advanced/notes',
+  'advanced/refspec',
+  'advanced/remote',
+  'advanced/rerere',
+  'advanced/searching',
+  'advanced/submodule',
+  'goodbye']
+---

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@ html, body, .reveal{`
`18`	`18`	`img{`
`19`	`19`	`height: auto !important;`
`20`	`20`	`width: 100% !important;`
	`21`	`+}`
`21`	`22`
	`23`	`+img.headshot {`
	`24`	`+ max-width: 50%;`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`.reveal .roll span:after{`