Merge conflicts

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]-->
 
   <script type="text/x-mathjax-config">

marketing.html

@@ -15,11 +15,15 @@
   <script type="text/javascript" src="/static/js/video_player.js"></script>
   <!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
 
-  <script type="text/javascript">
-    $(function(){
-      $("a[rel*=leanModal]").leanModal();
-    });
-  </script>
+  <!--[if lt IE 9]>
+  <script src="/static/js/html5shiv.js"></script>
+  <![endif]-->
+
+	<script type="text/javascript">
+		$(function(){
+			$("a[rel*=leanModal]").leanModal();
+		});
+	</script>
 
 <%block name="headextra"/>
 

sass/_base.scss

@@ -1,3 +1,7 @@
+:focus {
+  outline-color: #ccc;
+}
+
 h1 {
   font-size:1.6em;
   margin:20px 0 10px 0;

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;
         }
       }
     }

sass/_local.scss

@@ -16,7 +16,6 @@
 
 .seq_problem_visited    {     background-color: #ccccaa;}
 .seq_video_visited      {     background-color: #ccaacc;}
-.seq_video_visited      {     background-color: #cccaac;}
 .seq_html_visited       {     background-color: #caaccc;}
 .seq_tab_visited        {     background-color: #aacccc;}
 .seq_vertical_visited   {     background-color: #acaccc;}

sass/_profile.scss

@@ -1,5 +1,5 @@
 div.profile-wrapper {
-  display: table;
+  @extend .table-wrapper;
 
   section.user-info {
     @include box-sizing(border-box);