4 files changed, 392 insertions, 420 deletions

diff --git a/js/slides.js b/js/slides.js
index 3f2366b..66aaa51 100644
--- a/js/slides.js
+++ b/js/slides.js
@@ -128,7 +128,10 @@ SlideDeck.prototype.onBodyKeyDown_ = function(e) {
       break;
 
     case 78: // N
-      document.body.classList.toggle('with-notes');
+      // If this slide contains notes, toggle them.
+      if (this.slides_[this.curSlide_].querySelector('.note')) {
+        document.body.classList.toggle('with-notes');
+      }
       break;
 
     case 27: // ESC
@@ -276,6 +279,11 @@ SlideDeck.prototype.buildNextItem_ = function() {
  */
 SlideDeck.prototype.prevSlide = function(opt_dontPush) {
   if (this.curSlide_ > 0) {
+    // Toggle off speaker notes and/or highlighted code if they're showing.
+    var bodyClassList = document.body.classList;
+    bodyClassList.remove('with-notes');
+    bodyClassList.remove('highlight-code');
+
     this.prevSlide_ = this.curSlide_;
     this.curSlide_--;
 
@@ -293,6 +301,11 @@ SlideDeck.prototype.nextSlide = function(opt_dontPush) {
   }
 
   if (this.curSlide_ < this.slides_.length - 1) {
+    // Toggle off speaker notes and/or highlighted code if they're showing.
+    var bodyClassList = document.body.classList;
+    bodyClassList.remove('with-notes');
+    bodyClassList.remove('highlight-code');
+
     this.prevSlide_ = this.curSlide_;
     this.curSlide_++;
 
diff --git a/template.html b/template.html
index 21af68e..7a83433 100644
--- a/template.html
+++ b/template.html
@@ -151,13 +151,13 @@ function helloWorld(world) {
 
   <slide>
     <aside class="note">
-      <section>Speaker notes can go here!</section>
+      <section>Speaker notes go here!</section>
     </aside>
     <hgroup>
       <h2>Slide with Speaker Notes</h2>
     </hgroup>
     <article>
-      Press 'n' to show speaker notes on a slide.
+      Press 'n' to show speaker notes on slides that define them.
     </article>
   </slide>
 
@@ -333,9 +333,7 @@ function helloWorld(world) {
       <p>Important contact information goes here.</p>
     </article>
     <p class="auto-fadein" data-config-contact>
-      <!--Insert contact info<br>
-      Insert contact info<br>
-      Insert contact info-->
+      <!-- populated from config -->
     </p>
   </slide>
 
diff --git a/theme/css/default.css b/theme/css/default.css
index d82a3c2..262e2a2 100644
--- a/theme/css/default.css
+++ b/theme/css/default.css
@@ -1,4 +1,4 @@
-/* line 17, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 17, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
@@ -20,45 +20,45 @@ time, mark, audio, video {
   vertical-align: baseline;
 }
 
-/* line 20, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 20, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 body {
   line-height: 1;
 }
 
-/* line 22, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 22, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 ol, ul {
   list-style: none;
 }
 
-/* line 24, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 24, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
 
-/* line 26, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 26, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 caption, th, td {
   text-align: left;
   font-weight: normal;
   vertical-align: middle;
 }
 
-/* line 28, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 28, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 q, blockquote {
   quotes: none;
 }
-/* line 101, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 101, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 q:before, q:after, blockquote:before, blockquote:after {
   content: "";
   content: none;
 }
 
-/* line 30, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 30, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 a img {
   border: none;
 }
 
-/* line 114, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.11.7/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
+/* line 114, ../../../../../../Library/Ruby/Gems/1.8/gems/compass-0.12.1/frameworks/compass/stylesheets/compass/reset/_utilities.scss */
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
   display: block;
 }
@@ -86,8 +86,9 @@ body {
   -moz-font-smoothing: antialiased;
   -ms-font-smoothing: antialiased;
   -o-font-smoothing: antialiased;
-  -moz-transition: opacity 800ms ease-in;
   -webkit-transition: opacity 800ms ease-in;
+  -moz-transition: opacity 800ms ease-in;
+  -ms-transition: opacity 800ms ease-in;
   -o-transition: opacity 800ms ease-in;
   transition: opacity 800ms ease-in;
 }
@@ -104,10 +105,10 @@ slides {
   position: absolute;
   left: 0;
   top: 0;
-  -moz-transform: translate3d(0, 0, 0);
   -webkit-transform: translate3d(0, 0, 0);
-  -o-transform: translate3d(0, 0, 0);
+  -moz-transform: translate3d(0, 0, 0);
   -ms-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
   transform: translate3d(0, 0, 0);
   -webkit-perspective: 1000;
   perspective: 1000;
@@ -122,9 +123,8 @@ slides > slide {
   overflow: hidden;
   left: 50%;
   top: 50%;
-  -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
-  -ms-box-sizing: border-box;
+  -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 
@@ -174,11 +174,10 @@ article.fill iframe {
   height: 100%;
   border: 0;
   margin: 0;
-  -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
-  -o-border-radius: 10px;
+  -moz-border-radius: 10px;
   -ms-border-radius: 10px;
-  -khtml-border-radius: 10px;
+  -o-border-radius: 10px;
   border-radius: 10px;
   z-index: -1;
 }
@@ -186,8 +185,8 @@ article.fill iframe {
 /* line 145, ../sass/_base.scss */
 slide.fill {
   background-repeat: no-repeat;
-  -moz-background-size: cover;
   -webkit-background-size: cover;
+  -moz-background-size: cover;
   -o-background-size: cover;
   background-size: cover;
 }
@@ -226,9 +225,8 @@ slide.fill img {
   border: solid transparent;
   min-height: 28px;
   padding: 100px 0 0;
-  -moz-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(0, 0, 0, 0.07);