From cc64762653e1958e8fd68cf4b99e3b1ef093d22a Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Wed, 25 Jan 2012 15:00:58 -0500
Subject: [PATCH 01/12] Clean up on marketing styles

---
 index.html       |  2 +-
 sass/_base.scss  |  4 ++++
 sass/_index.scss | 17 +++++++++++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 634b101d5d..923d401888 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
   <div class="anouncement-wrapper">
   <nav>
     <h1><a href="/t/mitx_global.html">MITx</a></h1>
-    <a class="" rel="leanModal" href="#login">Log In</a>
+    <a class="login" rel="leanModal" href="#login">Log In</a>
   </nav>
 
     <section class="course">
diff --git a/sass/_base.scss b/sass/_base.scss
index db8b718fb7..4ceba8b593 100644
--- a/sass/_base.scss
+++ b/sass/_base.scss
@@ -1,3 +1,7 @@
+:focus {
+  outline-color: #ccc;
+}
+
 h1 {
   font-size:1.6em;
   margin:20px 0 10px 0;
diff --git a/sass/_index.scss b/sass/_index.scss
index 7703412cb4..e5886548e5 100644
--- a/sass/_index.scss
+++ b/sass/_index.scss
@@ -103,6 +103,10 @@ body {
   color: #444;
   font: $body-font-size $body-font-family;
 
+  :focus {
+    outline-color: #ccc;
+  }
+
   h1 {
     font: 800 24px $header-font-family;
   }
@@ -188,16 +192,20 @@ header.announcement {
       @include border-radius(0 0 3px 3px);
       background: #333;
       background: rgba(#000, .7);
-      padding: lh(.5);
+      padding: lh(.5) lh();
 
       h1 {
         @include inline-block();
-        margin-right: lh();
+        margin-right: lh(.5);
 
         a {
           font: italic 800 18px $header-font-family;
           color: #fff;
           text-decoration: none;
+
+          &:hover, &:focus {
+            color: $mit-red;
+          }
         }
       }
 
@@ -206,9 +214,10 @@ header.announcement {
         color: #fff;
         font-size: 12px;
         font-style: normal;
+        font-family: $header-font-family;
 
-        &:hover {
-          color: rgba(#fff, .6);
+        &:hover, &:focus {
+          color: $mit-red;
         }
       }
     }

From 042e1fdf8c93dc62440d217e014748c4a0c8352a Mon Sep 17 00:00:00 2001
From: Ernie Park <eipark@mit.edu>
Date: Thu, 26 Jan 2012 11:27:42 -0500
Subject: [PATCH 02/12] remove fancybox references for css/js

---
 main.html      | 3 ---
 marketing.html | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/main.html b/main.html
index b90bdd6b61..0711f7e274 100644
--- a/main.html
+++ b/main.html
@@ -21,9 +21,6 @@
   <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
 
-  <!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
-  <script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
-  <link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">
   <script type="text/x-mathjax-config">
     MathJax.Hub.Config({
       tex2jax: {inlineMath: [["\\(","\\)"]],
diff --git a/marketing.html b/marketing.html
index e6991e0dff..3ce8aef68d 100644
--- a/marketing.html
+++ b/marketing.html
@@ -9,9 +9,6 @@
   <script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
   <script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
 
-  <!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
-  <script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
-  <link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">
   <script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
   <script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
   <script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>

From dd6c6e540f92c9eb6439021c41ae40ea4e934a9e Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Thu, 26 Jan 2012 12:51:49 -0500
Subject: [PATCH 03/12] Added styling for alternating wiki history rows.

---
 sass/_wiki.scss         | 8 +++++++-
 simplewiki_history.html | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sass/_wiki.scss b/sass/_wiki.scss
index b26fe2c6ad..aed8d34ef3 100644
--- a/sass/_wiki.scss
+++ b/sass/_wiki.scss
@@ -129,5 +129,11 @@ div.wiki-wrapper {
     p {
       line-height: 1.6em;
     }
+    
+    #wiki_history_table {
+      tr.dark {
+        background-color: $light-gray;
+      }
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/simplewiki_history.html b/simplewiki_history.html
index c5c873ed3b..efeeb95430 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -60,10 +60,10 @@ ${ wiki_article.title }
             <tr>
                 <td colspan="4">
                     %if wiki_prev_page:
-                        <a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_prev_page])}">trans "Previous page"</a>
+                        <a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_prev_page])}">Previous page</a>
                     %endif
                     %if wiki_next_page:
-                        <a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_next_page])}">"Next page"</a>
+                        <a href="${reverse("wiki_history", args=[wiki_article.get_url(), wiki_next_page])}">Next page</a>
                     %endif
                 </td>
             </tr>

From 5188826e1a8652525f896f72ba63b992019af7c0 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 26 Jan 2012 12:59:26 -0500
Subject: [PATCH 04/12] fix more minor things with the layout

---
 main.html          | 2 +-
 marketing.html     | 4 ++++
 sass/_profile.scss | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/main.html b/main.html
index 5e8fcc6136..c1d5f90a9d 100644
--- a/main.html
+++ b/main.html
@@ -18,7 +18,7 @@
   <script type="text/javascript" src="/static/js/cktsim.js"></script>
 
   <!--[if lt IE 9]>
-  <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+  <script src="/static/js/html5shiv.js"></script>
   <![endif]-->
 
   <!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
diff --git a/marketing.html b/marketing.html
index 4c75eb55d3..585da9d057 100644
--- a/marketing.html
+++ b/marketing.html
@@ -18,6 +18,10 @@
   <script type="text/javascript" src="/static/js/video_player.js"></script>
   <!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
 
+  <!--[if lt IE 9]>
+  <script src="/static/js/html5shiv.js"></script>
+  <![endif]-->
+
 	<script type="text/javascript">
 		$(function(){
 			$("a[rel*=leanModal]").leanModal();
diff --git a/sass/_profile.scss b/sass/_profile.scss
index 9a384a1cbd..9cab2dbce6 100644
--- a/sass/_profile.scss
+++ b/sass/_profile.scss
@@ -1,5 +1,5 @@
 div.profile-wrapper {
-  display: table;
+  @extend .table-wrapper;
 
   section.user-info {
     @include box-sizing(border-box);

From 2ba88b53c70258409a626f3cebd49149bbbf01f6 Mon Sep 17 00:00:00 2001
From: Ernie Park <eipark@mit.edu>
Date: Thu, 26 Jan 2012 13:19:22 -0500
Subject: [PATCH 05/12] update marketing template blocks, smarter and takes in
 just a class for header, fixes bug with no picture for mitx_global page

---
 index.html       | 9 ++-------
 marketing.html   | 2 +-
 mitx_global.html | 2 ++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 09c3787347..23b04637b5 100644
--- a/index.html
+++ b/index.html
@@ -1,10 +1,6 @@
 <%inherit file="marketing.html" /> 
 
-<%block name="header">
-<header class="announcement course">
-  <div class="anouncement-wrapper">
-    ${parent.header_nav()}
-
+<%block name="header_text">
     <section class="course">
       <section>
         <h1>Circuits &amp; Electronics</h1>
@@ -13,9 +9,8 @@
       </section>
       <p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002x Circuits and Electronics&rdquo; is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide  from February 21, 2012 through June&nbsp;10,&nbsp;2012.</p>
     </section>
-  </div>
-</header>
 </%block>
+<%block name="header_class">course</%block>
 
 <section class="index-content">
   <section class="about-course">
diff --git a/marketing.html b/marketing.html
index 3ce8aef68d..8074098d0a 100644
--- a/marketing.html
+++ b/marketing.html
@@ -27,7 +27,7 @@
 
 <body>
   <%block name="header">
-  <header class="announcement">
+  <header class="announcement <%block name="header_class"/>">
     <div class="anouncement-wrapper">
     <%block name="header_nav">
     <nav>
diff --git a/mitx_global.html b/mitx_global.html
index 1fccdae61b..896492669a 100644
--- a/mitx_global.html
+++ b/mitx_global.html
@@ -1,5 +1,7 @@
 <%inherit file="marketing.html" />
 
+<%block name="header_class">home</%block>
+
 <section class="index-content">
   <section class="about">
     <h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1>

From 57d129a3cfdbcb34d9dbf5de7e8d0dc6805b2464 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 26 Jan 2012 14:16:27 -0500
Subject: [PATCH 06/12] Start to fix video layout

--HG--
branch : kf-video-layout
---
 sass/_courseware.scss | 87 ++-----------------------------------------
 sass/application.scss |  2 +-
 video.html            | 14 +++----
 3 files changed, 12 insertions(+), 91 deletions(-)

diff --git a/sass/_courseware.scss b/sass/_courseware.scss
index d2ab6d65b7..4ff4bc2012 100644
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -1,6 +1,10 @@
 div.course-wrapper {
   @extend .table-wrapper;
 
+  ul, ol {
+    list-style: none;
+  }
+
   div#accordion {
     @extend .sidebar;
 
@@ -112,88 +116,5 @@ div.course-wrapper {
         padding: 0 10px;
       }
     }
-
-    div.video-wrapper {
-      float: left;
-      width: 640px;
-      min-height: 620px;
-
-      iframe#html5_player {
-        border: none;
-        display: none;
-        height: 390px;
-        width:  640px;
-      }
-
-      section {
-        ul {
-          display: inline-block;
-
-          li {
-            margin-top: 5px;
-            display: inline-block;
-            cursor: pointer;
-            border: 0;
-            padding: 0;
-
-            div {
-              &:empty {
-                display: none;
-              }
-            }
-          }
-        }
-
-        div#slider {
-          margin: -14px 0 10px 60px;
-        }
-
-        div#vidtime {
-          float: left;
-        }
-
-        div#video_speeds {
-          float: right;
-          cursor: pointer;
-
-          span {
-            &:hover {
-              color: $mit-red;
-            }
-          }
-        }
-      }
-    }
-
-    ol.subtitles {
-      width: 220px;
-      margin-left: 20px;
-      float: left;
-
-      li {
-        margin-bottom: 0px;
-        cursor: pointer;
-        border: 0;
-        padding: 0;
-        color: #666;
-
-        &.current {
-          background-color: #f3f3f3;
-          color: #333;
-        }
-
-        &:hover {
-          color: $mit-red;
-        }
-				
-				div {
-					margin-bottom: 8px;
-				}
-
-				div:empty {
-					margin-bottom: 0px;
-				}
-      }
-    }
   }
 }
diff --git a/sass/application.scss b/sass/application.scss
index f274acbfb8..359197d16a 100644
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -8,7 +8,7 @@
 @import "leanmodal";
 
 // pages
-@import "courseware";
+@import "courseware", "courseware-video";
 @import "textbook";
 @import "profile";
 @import "wiki-create", "wiki";
diff --git a/video.html b/video.html
index bdbd6e80a5..089dfb74c2 100644
--- a/video.html
+++ b/video.html
@@ -1,12 +1,14 @@
 
 <div class="video-wrapper">
-  <div id="ytapiplayer">
+  <div class="video-player">
+    <div id="ytapiplayer">
+    </div>
+    
+    <!-- TODO(Ernie/Kyle) move styles to css -->
+    <iframe id="html5_player" type="text/html" frameborder="0">
+    </iframe>
   </div>
   
-  <!-- TODO(Ernie/Kyle) move styles to css -->
-  <iframe id="html5_player" type="text/html" frameborder="0">
-  </iframe>
-  
   <section class="video-controls">
     <ul>
       <li><span class="ui-icon ui-icon-play" onclick="play();"></span></li>
@@ -19,8 +21,6 @@
   </section>
 </div>
 
-
-
 <ol class="subtitles">
   <li id=stt_n5><div id=std_n7 onclick="title_seek(-7);"></div></li>
   <li id=stt_n4><div id=std_n6 onclick="title_seek(-6);"></div></li>

From 7cfc50fae8c9b8c7aefa6da7002e4dcd8b3da939 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 26 Jan 2012 14:16:51 -0500
Subject: [PATCH 07/12] Video scss refactor

--HG--
branch : kf-video-layout
---
 sass/_courseware-video.scss | 105 ++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 sass/_courseware-video.scss

diff --git a/sass/_courseware-video.scss b/sass/_courseware-video.scss
new file mode 100644
index 0000000000..10504ff39c
--- /dev/null
+++ b/sass/_courseware-video.scss
@@ -0,0 +1,105 @@
+section.course-content {
+
+  div.video-wrapper {
+    float: left;
+    width: flex-grid(6, 9);
+
+    margin-right: flex-gutter(9);
+
+    div.video-player {
+      position: relative;
+      padding-bottom: 56.25%;
+      padding-top: 30px;
+      height: 0;
+      overflow: hidden;
+
+      object {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+
+      iframe#html5_player {
+        border: none;
+        display: none;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    section {
+      ul {
+        display: inline-block;
+
+        li {
+          margin-top: 5px;
+          display: inline-block;
+          cursor: pointer;
+          border: 0;
+          padding: 0;
+
+          div {
+            &:empty {
+              display: none;
+            }
+          }
+        }
+      }
+
+      div#slider {
+        margin: -14px 0 10px 60px;
+      }
+
+      div#vidtime {
+        float: left;
+      }
+
+      div#video_speeds {
+        float: right;
+        cursor: pointer;
+
+        span {
+          &:hover {
+            color: $mit-red;
+          }
+        }
+      }
+    }
+  }
+
+  ol.subtitles {
+    float: left;
+    width: flex-grid(3, 9);
+
+    li {
+      margin-bottom: 0px;
+      cursor: pointer;
+      border: 0;
+      padding: 0;
+      color: #666;
+
+      &.current {
+        background-color: #f3f3f3;
+        color: #333;
+      }
+
+      &:hover {
+        color: $mit-red;
+      }
+
+      div {
+        margin-bottom: 8px;
+      }
+
+      div:empty {
+        margin-bottom: 0px;
+      }
+    }
+  }
+
+}

From a6ca113a3712f834eda1b47d84ddbfc93953686d Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Thu, 26 Jan 2012 14:28:57 -0500
Subject: [PATCH 08/12] Fixed bad link on help.html

---
 help.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/help.html b/help.html
index abf7efd38c..a45d7add3c 100644
--- a/help.html
+++ b/help.html
@@ -5,7 +5,7 @@
 <section class="help main-content">
   <h1>Help</h1>
 
-  <p> If you need help, first try <a href="discussion/questions/">asking a question in the forums</a> and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.</p>
+  <p> If you need help, first try <a href="/discussion">asking a question in the forums</a> and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.</p>
 
   <p> If you can't solve your problems with self-help, we have several e-mail addresses set up:</p>
 

From f2a748e4a664777830afed6a487250a775d72b46 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 26 Jan 2012 14:54:00 -0500
Subject: [PATCH 09/12] Added some style for video sequence made topbar extend
 better

--HG--
branch : kf-video-layout
---
 sass/_base-extends.scss |  9 ++++++++-
 sass/_courseware.scss   | 24 +++++++++++++++++++++---
 sass/_textbook.scss     | 12 ++++++++++--
 sass/_wiki.scss         |  9 +++++----
 seq_module.html         |  4 ++--
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/sass/_base-extends.scss b/sass/_base-extends.scss
index 51ef608531..1ed3c8b530 100644
--- a/sass/_base-extends.scss
+++ b/sass/_base-extends.scss
@@ -109,11 +109,18 @@
   @extend .clearfix;
 
   a {
-    text-transform: uppercase;
+    @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
+    background: darken(#F6EFD4, 5%);
+    border-left: 1px solid darken(#f6efd4, 20%);
     color: darken(#F6EFD4, 80%);
+    padding: lh(.75);
+    text-transform: uppercase;
+    display: block;
 
     &:hover {
       color: darken(#F6EFD4, 60%);
+      text-decoration: none;
+      background: none;
     }
   }
 }
diff --git a/sass/_courseware.scss b/sass/_courseware.scss
index 4ff4bc2012..f139ab9a21 100644
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -106,14 +106,32 @@ div.course-wrapper {
 
     ol.sequence-nav {
       margin-bottom: $body-line-height;
+      @extend .topbar;
 
       li {
         border: none;
         cursor: pointer;
         display: table-cell;
-        min-width: 30px;
-        min-height: 30px;
-        padding: 0 10px;
+        padding: lh(.75);
+        float: left;
+
+        &.prev, &.next {
+          @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
+          background: darken(#F6EFD4, 5%);
+          border-left: 1px solid darken(#f6efd4, 20%);
+          color: darken(#F6EFD4, 80%);
+          float: right;
+          letter-spacing: 1px;
+          padding: lh(.75);
+          text-transform: uppercase;
+
+          &:hover {
+            text-decoration: none;
+            color: darken(#F6EFD4, 60%);
+            text-decoration: none;
+            background: none;
+          }
+        }
       }
     }
   }
diff --git a/sass/_textbook.scss b/sass/_textbook.scss
index 6e22791f2c..b0fbdcd372 100644
--- a/sass/_textbook.scss
+++ b/sass/_textbook.scss
@@ -18,17 +18,25 @@ div.book-wrapper {
 
     nav {
       @extend .topbar;
+      @extend .clearfix;
 
       ul {
         @extend .clearfix;
-        li {
-          padding: 15px;
 
+        li {
           &.last {
             float: left;
+            display: block;
+
+            a {
+              @include box-shadow(inset -1px 0 0 lighten(#f6efd4, 5%));
+              border-right: 1px solid darken(#f6efd4, 20%);
+              border-left: 0;
+            }
           }
 
           &.next {
+            display: block;
             float: right;
           }
         }
diff --git a/sass/_wiki.scss b/sass/_wiki.scss
index aed8d34ef3..0cf50a54b6 100644
--- a/sass/_wiki.scss
+++ b/sass/_wiki.scss
@@ -8,8 +8,8 @@ div.wiki-wrapper {
 
     input[type="button"] {
       @extend h3;
-      color: lighten($text-color, 10%);
       @include transition();
+      color: lighten($text-color, 10%);
       font-size: $body-font-size;
       margin: 0  !important;
       padding: 7px 7px 7px 30px;
@@ -77,7 +77,7 @@ div.wiki-wrapper {
 
   section.wiki-body {
     @extend .content;
-    
+
     header {
       @extend .topbar;
 
@@ -91,6 +91,7 @@ div.wiki-wrapper {
 
       ul {
         float: right;
+        list-style: none;
 
         li {
           float: left;
@@ -108,7 +109,7 @@ div.wiki-wrapper {
             font-size: 12px;
             text-transform: uppercase;
             letter-spacing: 1px;
-            padding: 15px;
+            padding: lh(.75);
             margin: 0;
 
             &:hover {
@@ -136,4 +137,4 @@ div.wiki-wrapper {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/seq_module.html b/seq_module.html
index c2891af8f9..6608344e2f 100644
--- a/seq_module.html
+++ b/seq_module.html
@@ -4,8 +4,8 @@
   <li class="seq_inactive" id="tt_${ t }">&nbsp;</li>
   % endfor
 
-  <li id="${ id }prev">Previous</li>
-  <li id="${ id }next">Next</li>
+  <li id="${ id }next" class="next">Next</li>
+  <li id="${ id }prev" class="prev">Previous</li>
 </ol>
 
 

From 7e86b8384be5e319f04536899d5d6c751ccf0a2d Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 26 Jan 2012 17:33:20 -0500
Subject: [PATCH 10/12] Added more sequence styles

--HG--
branch : kf-video-layout
---
 sass/_courseware.scss | 55 +++++++++++++++++++++++++++++++++++++++++++
 seq_module.js         |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/sass/_courseware.scss b/sass/_courseware.scss
index f139ab9a21..36bef4b789 100644
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -115,6 +115,61 @@ div.course-wrapper {
         padding: lh(.75);
         float: left;
 
+        //problem
+        &.seq_problem_inactive {
+          width: 14px;
+          background: url('/static/images/problem-icon.png') 13px 13px no-repeat;
+        }
+
+        &.seq_problem_visited {
+          width: 14px;
+          background: shade(#F6EFD4, 4%) url('/static/images/problem-icon.png') -57px 13px no-repeat;
+        }
+
+        &.seq_problem_active {
+          width: 14px;
+          background: #FFFBEB url('/static/images/problem-icon.png') -22px 13px no-repeat;
+          border-right: 1px solid #D8CFA8;
+          border-left: 1px solid #D8CFA8;
+        }
+
+        //video
+        &.seq_video_inactive {
+          width: 14px;
+          background: url('/static/images/video-icon.png') 13px 15px no-repeat;
+        }
+
+        &.seq_video_visited {
+          width: 14px;
+          background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -64px 15px no-repeat;
+        }
+
+        &.seq_video_active {
+          width: 14px;
+          background: #FFFBEB url('/static/images/video-icon.png') -25px 15px no-repeat;
+          border-right: 1px solid #D8CFA8;
+          border-left: 1px solid #D8CFA8;
+        }
+
+
+        //vertical
+        &.seq_vertical_inactive {
+          width: 14px;
+          background: url('/static/images/vertical-icon.png') 13px 15px no-repeat;
+        }
+
+        &.seq_vertical_visited {
+          width: 14px;
+          background: shade(#F6EFD4, 4%) url('/static/images/vertical-icon.png') -82px 15px no-repeat;
+        }
+
+        &.seq_vertical_active {
+          width: 14px;
+          background: #FFFBEB url('/static/images/vertical-icon.png') -35px 15px no-repeat;
+          border-right: 1px solid #D8CFA8;
+          border-left: 1px solid #D8CFA8;
+        }
+
         &.prev, &.next {
           @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
           background: darken(#F6EFD4, 5%);
diff --git a/seq_module.js b/seq_module.js
index a636045587..57b73543c6 100644
--- a/seq_module.js
+++ b/seq_module.js
@@ -44,7 +44,7 @@ function ${ id }goto(i) {
     ${ id }loc=i;
     //$('#tt_'+i).attr("style", "background-color:red");
     $('#tt_'+i).removeClass();
-    $('#tt_'+i).addClass("seq_active");
+    $('#tt_'+i).addClass("seq_"+${ id }types[${ id }loc]+"_active");
 
     MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
 }

From e59f3ed206a46775c13810082eb6d20740cd3ebf Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 26 Jan 2012 17:52:13 -0500
Subject: [PATCH 11/12] More styles for sequence

--HG--
branch : kf-video-layout
---
 sass/_courseware.scss | 48 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/sass/_courseware.scss b/sass/_courseware.scss
index 36bef4b789..b79bc89e5d 100644
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -119,55 +119,87 @@ div.course-wrapper {
         &.seq_problem_inactive {
           width: 14px;
           background: url('/static/images/problem-icon.png') 13px 13px no-repeat;
+          @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%));
+
+          &:hover {
+            background-color: lighten(#F6EFD4, 3%);
+          }
         }
 
         &.seq_problem_visited {
           width: 14px;
           background: shade(#F6EFD4, 4%) url('/static/images/problem-icon.png') -57px 13px no-repeat;
+          &:hover {
+            background-color: #F6EFD4;
+          }
         }
 
         &.seq_problem_active {
           width: 14px;
           background: #FFFBEB url('/static/images/problem-icon.png') -22px 13px no-repeat;
-          border-right: 1px solid #D8CFA8;
-          border-left: 1px solid #D8CFA8;
+          @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%));
+
+          &:hover {
+            background-color: #F6EFD4;
+          }
         }
 
         //video
         &.seq_video_inactive {
           width: 14px;
           background: url('/static/images/video-icon.png') 13px 15px no-repeat;
+          @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%));
+
+          &:hover {
+            background-color: lighten(#F6EFD4, 3%);
+          }
         }
 
         &.seq_video_visited {
           width: 14px;
           background: shade(#F6EFD4, 4%) url('/static/images/video-icon.png') -64px 15px no-repeat;
+          &:hover {
+            background-color: #F6EFD4;
+          }
         }
 
         &.seq_video_active {
           width: 14px;
           background: #FFFBEB url('/static/images/video-icon.png') -25px 15px no-repeat;
-          border-right: 1px solid #D8CFA8;
-          border-left: 1px solid #D8CFA8;
+          @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%),inset 1px 0 0 darken(#F6EFD4, 20%));
+          &:hover {
+            background-color: #F6EFD4;
+          }
         }
 
 
         //vertical
         &.seq_vertical_inactive {
           width: 14px;
-          background: url('/static/images/vertical-icon.png') 13px 15px no-repeat;
+          background: url('/static/images/vertical-icon.png') -82px 15px no-repeat;
+          @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 10%));
+
+          &:hover {
+            background-color: lighten(#F6EFD4, 3%);
+          }
         }
 
         &.seq_vertical_visited {
           width: 14px;
-          background: shade(#F6EFD4, 4%) url('/static/images/vertical-icon.png') -82px 15px no-repeat;
+          background: shade(#F6EFD4, 4%) url('/static/images/vertical-icon.png') 13px 15px no-repeat;
+          &:hover {
+            background-color: #F6EFD4;
+          }
         }
 
         &.seq_vertical_active {
           width: 14px;
           background: #FFFBEB url('/static/images/vertical-icon.png') -35px 15px no-repeat;
-          border-right: 1px solid #D8CFA8;
-          border-left: 1px solid #D8CFA8;
+          @include box-shadow(inset -1px 0 0 darken(#F6EFD4, 20%), inset 1px 0 0 darken(#F6EFD4, 20%));
+
+          &:hover {
+            background-color: #F6EFD4;
+          }
         }
 
         &.prev, &.next {

From 1a04693e63d730c797cb3bb8dc38c4d992677af5 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 26 Jan 2012 21:51:18 -0500
Subject: [PATCH 12/12] Added wiki basic html and search styles

---
 .hgignore                  |   1 +
 index.html                 |   6 +-
 navigation.html            |   2 +-
 sass/_courseware.scss      |  29 +++----
 sass/_index.scss           |  15 +++-
 sass/_wiki-basic-html.scss | 151 +++++++++++++++++++++++++++++++++++++
 sass/_wiki-create.scss     |   8 +-
 sass/_wiki.scss            |  37 +++++----
 sass/application.scss      |   2 +-
 simplewiki_base.html       |  27 +++----
 10 files changed, 220 insertions(+), 58 deletions(-)
 create mode 100644 sass/_wiki-basic-html.scss

diff --git a/.hgignore b/.hgignore
index 70b2a84d7d..c93aa7128d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,3 +4,4 @@ syntax: glob
 *.scssc
 *.swp
 *.orig
+*.DS_Store
diff --git a/index.html b/index.html
index 23b04637b5..8d73c3ad00 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <section class="course">
       <section>
         <h1>Circuits &amp; Electronics</h1>
-        <h2>6.002</h2>
+        <h2>6.002x</h2>
         <a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002 Circuits <span>&amp;</span> Electronics</a>
       </section>
       <p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002x Circuits and Electronics&rdquo; is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide  from February 21, 2012 through June&nbsp;10,&nbsp;2012.</p>
@@ -16,7 +16,7 @@
   <section class="about-course">
 
     <section class="about-info">
-      <h1>About 6.002</h1>
+      <h1>About 6.002x</h1>
 
       <p>6.002x is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.</p>
 
@@ -26,7 +26,7 @@
     </section>
 
     <section class="on-mitx">
-      <h1>6.002 on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
+      <h1>6.002x on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
 
       <p>Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.</p>
 
diff --git a/navigation.html b/navigation.html
index 2d2054f899..8f1114c867 100644
--- a/navigation.html
+++ b/navigation.html
@@ -4,8 +4,8 @@
 
     <nav>
       <ul class="coursenav">
+        <li><a href="/info">Course Info</a></li>
         <li><a href="/courseware">Courseware</a></li>
-        <li><a href="/info">Info</a></li>
         <li><a href="/book">Textbook</a></li>
         <li><a href="/discussion">Discussion</a></li>
         <li><a href="/wiki">Wiki</a></li>
diff --git a/sass/_courseware.scss b/sass/_courseware.scss
index b79bc89e5d..9587b6d826 100644
--- a/sass/_courseware.scss
+++ b/sass/_courseware.scss
@@ -8,16 +8,16 @@ div.course-wrapper {
   div#accordion {
     @extend .sidebar;
 
-		div#open_close_accordion {
-			position: absolute;
-			right: 0px;
-			width: 20px;
-			height: 20px;
-			background: #ccc;
-			border: 1px solid black;
-			right: -22px;
-			top: 5px;
-		}
+    div#open_close_accordion {
+      position: absolute;
+      right: 0px;
+      width: 20px;
+      height: 20px;
+      background: #ccc;
+      border: 1px solid black;
+      right: -22px;
+      top: 5px;
+    }
 		
     h3 {
       overflow: hidden;
@@ -63,7 +63,7 @@ div.course-wrapper {
 
         a {
           text-decoration: none;
-          margin-bottom: $body-line-height;
+          margin-bottom: lh(.5);
           display: block;
 
           &:hover {
@@ -86,12 +86,15 @@ div.course-wrapper {
     @extend .content;
 
     ol.vert-mod {
-      li {
+     > li {
         @extend .clearfix;
-        border-top: 1px solid #eee;
         border-bottom: 1px solid #eee;
         padding: 15px 0;
 
+        &:last-child {
+          border-bottom: none;
+        }
+
         h2 {
           margin-top: 0;
           margin-bottom: 15px;
diff --git a/sass/_index.scss b/sass/_index.scss
index e5886548e5..a441f03738 100644
--- a/sass/_index.scss
+++ b/sass/_index.scss
@@ -162,6 +162,17 @@ header.announcement {
 
     div {
       padding: lh(10) lh() lh(3);
+
+      //hide login link for homepage
+      nav {
+        h1 {
+          margin-right: 0;
+        }
+
+        a.login {
+          display: none;
+        }
+      }
     }
   }
 
@@ -204,7 +215,7 @@ header.announcement {
           text-decoration: none;
 
           &:hover, &:focus {
-            color: $mit-red;
+            color: #999;
           }
         }
       }
@@ -217,7 +228,7 @@ header.announcement {
         font-family: $header-font-family;
 
         &:hover, &:focus {
-          color: $mit-red;
+          color: #999;
         }
       }
     }
diff --git a/sass/_wiki-basic-html.scss b/sass/_wiki-basic-html.scss
new file mode 100644
index 0000000000..91f9fa4ce8
--- /dev/null
+++ b/sass/_wiki-basic-html.scss
@@ -0,0 +1,151 @@
+section.wiki-body {
+  div#wiki_article {
+    html, address,
+    blockquote,
+    body, dd, div,
+    dl, dt, fieldset, form,
+    frame, frameset,
+    h1, h2, h3, h4,
+    h5, h6, noframes,
+    ol, p, ul, center,
+    dir, hr, menu, pre   { 
+      display: block; 
+      unicode-bidi: embed 
+    }
+
+    li {
+      display: list-item 
+    }
+
+    head { 
+      display: none 
+    }
+
+    table { 
+      display: table 
+    }
+
+    tr { 
+      display: table-row 
+    }
+
+    thead { 
+      display: table-header-group 
+    }
+
+    tbody {
+      display: table-row-group 
+    }
+
+    tfoot {
+      display: table-footer-group 
+    }
+
+    col             { display: table-column }
+
+    colgroup        { display: table-column-group }
+
+    td, th          { display: table-cell }
+
+    caption         { 
+      display: table-caption 
+    }
+
+    th              { 
+      font-weight: bolder; 
+      text-align: center 
+    }
+
+    caption         { 
+      text-align: center 
+    }
+
+    h1 {
+      font-size: 2.4em;
+      margin: .67em 0;
+      letter-spacing: 0px;
+    }
+
+    h2 {
+      text-transform: none;
+      font-size: 2em;
+      margin: .75em 0;
+      letter-spacing: 0px;
+    }
+
+    h3 {
+      font-size: 1.75em;
+      margin: .83em 0;
+    }
+
+    h4 {
+      font-size: 1.25em;
+    }
+
+    h4, p,
+    blockquote, ul,
+    fieldset, form,
+    ol, dl, dir,
+    menu            { margin: 1.12em 0 }
+
+    h5              { font-size: 1.25em; margin: 1.5em 0 }
+
+    h6              { font-size: 1em; margin: 1.67em 0 }
+
+    h1, h2, h3, h4,
+    h5, h6, b,
+    strong          { font-weight: bolder }
+
+    blockquote      { 
+      padding: 10px 20px;
+      background: #e3e3e3;
+      border-left: 4px solid;
+    }
+
+    i, cite, em,
+    var, address    { font-style: italic }
+
+    pre, tt, code,
+    kbd, samp       { 
+      font-family: monospace; 
+    }
+
+    pre             { white-space: pre }
+
+    button, textarea,
+    input, select   { display: inline-block }
+
+    big             { font-size: 1.17em }
+
+    small, sub, sup { font-size: .83em }
+
+    sub             { vertical-align: sub }
+
+    sup             { vertical-align: super }
+
+    table           { border-spacing: 2px; }
+
+    thead, tbody,
+    tfoot           { vertical-align: middle }
+
+    td, th, tr      { vertical-align: inherit }
+
+    s, strike, del  { text-decoration: line-through }
+
+    hr              { height: 1px; background: #999; border: none;}
+
+    ol, ul, dir,
+    menu, dd        { margin-left: 40px }
+
+    ol              { list-style-type: decimal }
+
+    ol ul, ul ol,
+    ul ul, ol ol    { margin-top: 0; margin-bottom: 0 }
+
+    u, ins          { text-decoration: underline }
+
+    br:before       { content: "\A"; white-space: pre-line }
+
+    center          { text-align: center }
+  }
+}
diff --git a/sass/_wiki-create.scss b/sass/_wiki-create.scss
index 78bc8434da..0c26f96c83 100644
--- a/sass/_wiki-create.scss
+++ b/sass/_wiki-create.scss
@@ -1,15 +1,13 @@
 form#wiki_revision {
   float: left;
-  width: flex-grid(7, 9);
+  width: flex-grid(6, 9);
   margin-right: flex-gutter(9);
 	
-	
   label {
     display: block;
     margin-bottom: 7px ;
   }
 
-
   textarea {
     @include box-sizing(border-box);
     margin-bottom: 20px;
@@ -33,8 +31,8 @@ form#wiki_revision {
 
 #wiki_edit_instructions {
   float: left;
-  width: flex-grid(2, 9);
-      
+  width: flex-grid(3, 9);
+
   .markdown-example {
     background-color: $light-gray;
     padding-top: 5px;
diff --git a/sass/_wiki.scss b/sass/_wiki.scss
index 0cf50a54b6..a558e373dc 100644
--- a/sass/_wiki.scss
+++ b/sass/_wiki.scss
@@ -12,7 +12,7 @@ div.wiki-wrapper {
       color: lighten($text-color, 10%);
       font-size: $body-font-size;
       margin: 0  !important;
-      padding: 7px 7px 7px 30px;
+      padding: 7px lh();
       text-align: left;
       width: 100%;
 
@@ -24,31 +24,26 @@ div.wiki-wrapper {
 
     ul {
       li {
+        &.search {
+          @include box-shadow(0 1px 0 #eee);
+          border-bottom: 1px solid #d3d3d3;
+          padding: 7px lh();
+
+          label {
+            display: none;
+          }
+        }
+
         &.create-article {
-          position: relative;
-
           h3 {
-            position: relative;
-
-            &:before {
-              background: blue  url(images/ui-icons_454545_256x240.png) -32px -16px no-repeat;
-              display: block;
-              position: absolute;
-              top: 0;
-              right: 0;
-              width: 16px;
-              height: 16px;
-            }
-
-            &:hover {
-              &:before {
-                background-image: url(images/ui-icons_454545_256x240.png) -64px -16px no-repeat;
-              }
+            a {
+              padding: 7px lh();
             }
           }
         }
       }
     }
+
     div#wiki_create_form {
       @extend .clearfix;
       padding: 15px;
@@ -63,6 +58,8 @@ div.wiki-wrapper {
       }
 
       ul {
+        list-style: none;
+
         li {
           float: left;
 
@@ -130,7 +127,7 @@ div.wiki-wrapper {
     p {
       line-height: 1.6em;
     }
-    
+
     #wiki_history_table {
       tr.dark {
         background-color: $light-gray;
diff --git a/sass/application.scss b/sass/application.scss
index 359197d16a..a61c801f82 100644
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -11,7 +11,7 @@
 @import "courseware", "courseware-video";
 @import "textbook";
 @import "profile";
-@import "wiki-create", "wiki";
+@import "wiki-basic-html", "wiki-create", "wiki";
 @import "activation";
 @import "help";
 @import "discussion", "discussion-questions", "askbot-original";
diff --git a/simplewiki_base.html b/simplewiki_base.html
index cc33a52d42..87f4cd8275 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -88,19 +88,9 @@
     %>
 
       <ul class="action">
-        <li>
-    	        <div class="wiki_box_title">Search</div>
-    	        <form method="POST" action='${reverse("wiki_search_articles", args=[])}'>
-    	            <div style="display:none">
-                	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-                	</div>
-    	            <input type="text" name="value" id="wiki_search_input" style="width: 72%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
-    	            <input type="submit" id="wiki_search_input_submit" value=Go! style="width: 20%" />
-    	        </form>
-        </li>
-        <li>
-          <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=[])}'" value="Random article" class="button" />
-        </li>
+        <!-- <li> -->
+        <!--   <input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=[])}'" value="Random article" class="button" /> -->
+        <!-- </li> -->
         <li>
           <input type="button" onclick="javascript:location.href='${reverse("wiki_list_articles", args=[])}'" value="All articles" class="button" />
         </li>
@@ -139,6 +129,17 @@
             </form>
           </div>
         </li>
+
+        <li class="search">
+    	        <form method="POST" action='${reverse("wiki_search_articles", args=[])}'>
+                <label class="wiki_box_title">Search</label>
+    	            <div style="display:none">
+                	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
+                	</div>
+    	            <input type="text" placeholder="Search" name="value" id="wiki_search_input" style="width: 72%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
+    	            <input type="submit" id="wiki_search_input_submit" value=Go! style="width: 20%" />
+    	        </form>
+        </li>
       </ul>
 
     </div>