Merge branch 'master' of git://github.com/retronym/talks

Conflicts:
	scala-2.10/css/scala-2.10.css
	scala-2.10/slides.md

.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+.sass-cache

scala-2.10/css/keydown.css

@@ -0,0 +1,240 @@
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,700,800);
+/* Reset deck.core.css */
+.keydown.deck-container h1 {
+  font-weight: normal;
+  text-align: left;
+  padding-top: 0; }
+
+/* Reset deck.core.css */
+.csstransforms .deck-container .slide h1 {
+  padding: 0;
+  left: auto;
+  right: auto;
+  top: auto;
+  position: relative;
+  -webkit-transform: none;
+  -moz-transform: none;
+  -ms-transform: none;
+  -o-transform: none;
+  transform: none; }
+.csstransforms .deck-container .slide h2 {
+  border: none; }
+
+html {
+  font-size: 20px; }
+
+body {
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  background-color: #d7d7d7; }
+
+.keydown.deck-container {
+  display: -webkit-box;
+  display: -moz-box;
+  display: -ms-box;
+  display: box;
+  -webkit-box-orient: vertical;
+  -moz-box-orient: vertical;
+  -ms-box-orient: vertical;
+  box-orient: vertical;
+  -webkit-box-align: center;
+  -moz-box-align: center;
+  -ms-box-align: center;
+  box-align: center;
+  -webkit-box-pack: center;
+  -moz-box-pack: center;
+  -ms-box-pack: center;
+  box-pack: center; }
+  .keydown.deck-container h1 {
+    font-family: "Open Sans", "Helvetica Neue", sans-serif;
+    font-size: 4.5rem;
+    font-weight: 800;
+    color: black;
+    text-align: none; }
+  .keydown.deck-container h2, .keydown.deck-container h3, .keydown.deck-container h4, .keydown.deck-container h5, .keydown.deck-container p, .keydown.deck-container li {
+    font-family: "Open Sans", "Helvetica Neue", sans-serif;
+    font-weight: normal; }
+  .keydown.deck-container h2 {
+    font-size: 3.75rem; }
+  .keydown.deck-container h3 {
+    font-size: 3rem; }
+  .keydown.deck-container h4 {
+    font-size: 2.25rem; }
+  .keydown.deck-container p, .keydown.deck-container li {
+    font-size: 2rem; }
+  .keydown.deck-container .deck-status {
+    font-size: .75rem; }
+  .keydown.deck-container .slide {
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-box;
+    display: box;
+    -webkit-box-orient: vertical;
+    -moz-box-orient: vertical;
+    -ms-box-orient: vertical;
+    box-orient: vertical;
+    -webkit-box-align: center;
+    -moz-box-align: center;
+    -ms-box-align: center;
+    box-align: center;
+    -webkit-box-pack: center;
+    -moz-box-pack: center;
+    -ms-box-pack: center;
+    box-pack: center;
+    background-color: white; }
+    .keydown.deck-container .slide.full-background {
+      -webkit-background-size: cover;
+      -moz-background-size: cover;
+      -o-background-size: cover;
+      background-size: cover;
+      display: -webkit-box;
+      display: -moz-box;
+      display: -ms-box;
+      display: box;
+      -webkit-box-orient: vertical;
+      -moz-box-orient: vertical;
+      -ms-box-orient: vertical;
+      box-orient: vertical;
+      -webkit-box-align: start;
+      -moz-box-align: start;
+      -ms-box-align: start;
+      box-align: start;
+      -webkit-box-pack: start;
+      -moz-box-pack: start;
+      -ms-box-pack: start;
+      box-pack: start; }
+      .keydown.deck-container .slide.full-background h1 {
+        display: inline;
+        position: absolute;
+        background-color: rgba(0, 0, 0, 0.7);
+        font-weight: normal;
+        font-size: 3.5rem;
+        padding: 1rem;
+        color: #eee; }
+      .keydown.deck-container .slide.full-background.bottom-left h1 {
+        left: 0;
+        bottom: 20%; }
+      .keydown.deck-container .slide.full-background.top-left h1 {
+        left: 0;
+        top: 20%; }
+      .keydown.deck-container .slide.full-background.bottom-right h1 {
+        right: 0;
+        bottom: 20%; }
+      .keydown.deck-container .slide.full-background.top-right h1 {
+        right: 0;
+        top: 20%; }
+    .keydown.deck-container .slide.left {
+      display: -webkit-box;
+      display: -moz-box;
+      display: -ms-box;
+      display: box;
+      -webkit-box-orient: vertical;
+      -moz-box-orient: vertical;
+      -ms-box-orient: vertical;
+      box-orient: vertical;
+      -webkit-box-align: start;
+      -moz-box-align: start;
+      -ms-box-align: start;
+      box-align: start;
+      -webkit-box-pack: start;
+      -moz-box-pack: start;
+      -ms-box-pack: start;
+      box-pack: start; }
+      .keydown.deck-container .slide.left .spacer.top {
+        -webkit-box-flex: 1;
+        -moz-box-flex: 1;
+        -ms-box-flex: 1;
+        box-flex: 1; }
+      .keydown.deck-container .slide.left .spacer.bottom {
+        -webkit-box-flex: 5;
+        -moz-box-flex: 5;
+        -ms-box-flex: 5;
+        box-flex: 5; }
+      .keydown.deck-container .slide.left .content {
+        display: -webkit-box;
+        display: -moz-box;
+        display: -ms-box;
+        display: box;
+        -webkit-box-orient: vertical;
+        -moz-box-orient: vertical;
+        -ms-box-orient: vertical;
+        box-orient: vertical;
+        -webkit-box-align: start;
+        -moz-box-align: start;
+        -ms-box-align: start;
+        box-align: start;
+        -webkit-box-pack: start;
+        -moz-box-pack: start;
+        -ms-box-pack: start;
+        box-pack: start; }
+        .keydown.deck-container .slide.left .content > * {
+          display: -webkit-box;
+          display: -moz-box;
+          display: -ms-box;
+          display: box;
+          -webkit-box-orient: vertical;
+          -moz-box-orient: vertical;
+          -ms-box-orient: vertical;
+          box-orient: vertical;
+          -webkit-box-align: start;
+          -moz-box-align: start;
+          -ms-box-align: start;
+          box-align: start;
+          -webkit-box-pack: start;
+          -moz-box-pack: start;
+          -ms-box-pack: start;
+          box-pack: start; }
+    .keydown.deck-container .slide .content {
+      display: -webkit-box;
+      display: -moz-box;
+      display: -ms-box;
+      display: box;
+      -webkit-box-orient: vertical;
+      -moz-box-orient: vertical;
+      -ms-box-orient: vertical;
+      box-orient: vertical;
+      -webkit-box-align: center;
+      -moz-box-align: center;
+      -ms-box-align: center;
+      box-align: center;
+      -webkit-box-pack: center;
+      -moz-box-pack: center;
+      -ms-box-pack: center;
+      box-pack: center; }
+      .keydown.deck-container .slide .content > * {
+        display: -webkit-box;
+        display: -moz-box;
+        display: -ms-box;
+        display: box;
+        -webkit-box-orient: vertical;
+        -moz-box-orient: vertical;
+        -ms-box-orient: vertical;
+        box-orient: vertical;
+        -webkit-box-align: center;
+        -moz-box-align: center;
+        -ms-box-align: center;
+        box-align: center;
+        -webkit-box-pack: center;
+        -moz-box-pack: center;
+        -ms-box-pack: center;
+        box-pack: center; }
+      .keydown.deck-container .slide .content .CodeMirror {
+        font-size: 1rem; }
+    .keydown.deck-container .slide .attribution {
+      -webkit-background-size: contain;
+      -moz-background-size: contain;
+      -o-background-size: contain;
+      background-size: contain;
+      position: absolute;
+      bottom: 0;
+      font-size: 1.25rem;
+      font-family: "Open Sans", "Helvetica Neue", sans-serif; }
+      .keydown.deck-container .slide .attribution.flickr {
+        background: url(../images/flickr.png) left top no-repeat;
+        padding-left: 60px; }
+      .keydown.deck-container .slide .attribution.cc {
+        background: url(../images/cc.large.png) left top no-repeat;
+        padding-left: 36px; }
+      .keydown.deck-container .slide .attribution a {
+        color: #c7c7c7; }

scala-2.10/css/scala-2.10.css

@@ -25,6 +25,72 @@
   background-color: #000 !important;
 }
 
+@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,900,400italic,600italic,700italic,900italic);
+
+.keydown.deck-container .slide.top .spacer.top {
+    -webkit-box-flex: 0;
+    -moz-box-flex: 0;
+    -ms-box-flex: 0;
+    box-flex: 0;
+}
+
+.keydown.deck-container {
+  background-color: white;
+}
+.keydown.deck-container .slide {
+  background-color: white;
+}
+
+.csstransforms .deck-container .slide h1 {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+.keydown.deck-container h1 {
+  font-family: 'Source Sans Pro', sans-serif;
+  color: white;
+  font-weight: 400;
+  background-color: #7bdcf5;
+  padding-bottom: 200px;
+  margin-left: -1000px;
+  border-left: 1000px solid #7bdcf5;
+  margin-right: -10000px;
+  border-right: 10000px solid #7bdcf5;
+}
+
+.deck-container .slide .CodeMirror {
+  min-width: 1000px;
+}
+
+.keydown.deck-container h2 {
+  color: #ee6768;
+}
+
+.cm-s-default span.cm-comment {
+  color: yellow;
+  font-style: italic;
+}
+
+.deck-container .slide .CodeMirror pre {
+  font-size: 1.5em;
+}
+.deck-container .slide .CodeMirror {
+    line-height: 1.5em;
+    font-family: monospace;
+}
+
+.deck-container .slide .deck-codemirror-result {
+  width: 1000px;
+  padding: 0px;
+  padding-left: 10px;
+  border: 0px;
+  font-size: 1.5em;
+}
+
+.deck-container .slide .deck-codemirror-result pre {
+  font-size: 1.5rem;
+}
+
 .slide.intro {
   width: 100%;
   background-size: contain;
@@ -44,12 +110,12 @@
 
 .slide.intro h4 {
   color: white;
-  background-color: rgba(0, 0, 0, 0.7);
   color: #aaa;
   position: absolute;
   bottom: 5px;
   left: 50%;
-  margin-left:-22rem;
+  margin-left:-20rem;
+  margin-right:-20rem;
 }
 
 .slide.intro h4 a {