From 8ff948a7535d987b51936076faaf154aba646f6f Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 1 Mar 2012 17:41:07 -0500
Subject: [PATCH 1/5] Highlight speed after clicked

--HG--
branch : kf-highlight-speed
---
 sass/courseware/_video.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss
index cc176b71b1..b1cf792caf 100644
--- a/sass/courseware/_video.scss
+++ b/sass/courseware/_video.scss
@@ -165,6 +165,10 @@ section.course-content {
               li {
                 cursor: pointer;
                 @include inline-block();
+
+                &.active {
+                  font-weight: bold;
+                }
               }
             }
           }

From 94313ef63a2c3ae278e8630f612468f5888c34a4 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 5 Mar 2012 14:10:41 -0500
Subject: [PATCH 2/5] Added some more styles for highlighting the current speed

--HG--
branch : kf-highlight-speed
---
 video.html    |  2 +-
 video_init.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/video.html b/video.html
index 3337ea45e3..e1548eade0 100644
--- a/video.html
+++ b/video.html
@@ -21,7 +21,7 @@
           <li><a id="video_control" class="pause">Pause</a></li>
 
           <li>
-            <div id="vidtime">0:00/0:00</div>
+            <div id="vidtime">0:00 / 0:00</div>
           </li>
         </ul>
 
diff --git a/video_init.js b/video_init.js
index 897f4cfd85..e6fdd947c5 100644
--- a/video_init.js
+++ b/video_init.js
@@ -33,15 +33,15 @@ ajax_video=good;
 loadNewVideo(streams["1.0"], ${ position });
 
 function add_speed(key, stream) {
-    var id = 'speed_' + stream;
+  var id = 'speed_' + stream;
 
-    $("#video_speeds").append(' <li id="'+id+'">'+key+'x</li>');
+  $("#video_speeds").append(' <li id="'+id+'">'+key+'x</li>');
 
-    $("#"+id).click(function(){
-      change_video_speed(key, stream);
-      $(this).siblings().removeClass("active");
-      $(this).addClass("active");
-    });
+  $("#"+id).click(function(){
+    change_video_speed(key, stream);
+    $(this).siblings().removeClass("active");
+    $(this).addClass("active");
+  });
 }
 
 var l=[]

From de61484ab3e4549fe95e62a68e19cf2a3cd83dab Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 5 Mar 2012 14:28:50 -0500
Subject: [PATCH 3/5] Added smaller type for textbook

--HG--
branch : kf-highlight-speed
---
 sass/_textbook.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sass/_textbook.scss b/sass/_textbook.scss
index f0e43cd523..d1747e9e3b 100644
--- a/sass/_textbook.scss
+++ b/sass/_textbook.scss
@@ -7,6 +7,7 @@ div.book-wrapper {
     @extend .tran;
 
     ul#booknav {
+      font-size: 12px;
 
       a {
         color: #000;

From b29ea7d3e266252b7283a4d96fa549dc693000b9 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 5 Mar 2012 14:58:31 -0500
Subject: [PATCH 4/5] Added styles for tutorials

--HG--
branch : kf-highlight-speed
---
 sass/courseware/_courseware.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss
index 52525a5a88..ec06c7e5a1 100644
--- a/sass/courseware/_courseware.scss
+++ b/sass/courseware/_courseware.scss
@@ -166,6 +166,13 @@ div.course-wrapper {
         }
       }
     }
+
+    section.tutorials {
+      ul {
+        list-style: disc outside none;
+        margin-left: lh();
+      }
+    }
   }
 
   &.closed {

From 9d1a2a5c3fc9e0a23a432934b2694635649ff351 Mon Sep 17 00:00:00 2001
From: Ernie Park <eipark@mit.edu>
Date: Mon, 5 Mar 2012 15:53:07 -0500
Subject: [PATCH 5/5] add active class to 1.0 speed video when page first
 loaded.

--HG--
branch : kf-highlight-speed
---
 video_init.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/video_init.js b/video_init.js
index e6fdd947c5..63b7f055f4 100644
--- a/video_init.js
+++ b/video_init.js
@@ -35,7 +35,13 @@ loadNewVideo(streams["1.0"], ${ position });
 function add_speed(key, stream) {
   var id = 'speed_' + stream;
 
-  $("#video_speeds").append(' <li id="'+id+'">'+key+'x</li>');
+  //TODO: this should be smarter and know which video is first selected when we have 
+  // video speed as an option/parameter per user that is saved
+  if (key == 1.0) {
+    $("#video_speeds").append(' <li class=active id="'+id+'">'+key+'x</li>');
+  } else {
+    $("#video_speeds").append(' <li id="'+id+'">'+key+'x</li>');
+  }
 
   $("#"+id).click(function(){
     change_video_speed(key, stream);