From 5d24d6cc3667c8d1043ec250c14e74c1214448c4 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 27 Feb 2012 12:15:54 -0500
Subject: [PATCH] Added more js to the footer and added some small other style
 fixes

---
 courseware.html                  |  2 ++
 main.html                        | 19 +++++++++----------
 marketing.html                   |  2 --
 sass/courseware/_courseware.scss |  2 +-
 sass/index/_footer.scss          |  4 ++++
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/courseware.html b/courseware.html
index af3b721e2e..67e596545e 100644
--- a/courseware.html
+++ b/courseware.html
@@ -1,11 +1,13 @@
 <%inherit file="main.html" />
 
+<%block name="js_extra">
 <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
 <script type="text/javascript">
   $(function() {
       ${init}
     });
 </script>
+</%block>
 
 <%include file="navigation.html" args="active_page='courseware'" />
 
diff --git a/main.html b/main.html
index 76a035c449..f7a4e2a90c 100644
--- a/main.html
+++ b/main.html
@@ -9,11 +9,6 @@
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
   <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
   <script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script>
-  <script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script>
-  <script type="text/javascript" src="/static/js/jquery.leanModal.min.js"></script>
-  <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" src="/static/js/cktsim.js"></script>
 
   <!--[if lt IE 9]>
   <script src="/static/js/html5shiv.js"></script>
@@ -84,6 +79,12 @@
       </dl>
     </div>
 
+  <script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script>
+  <script type="text/javascript" src="/static/js/jquery.leanModal.min.js"></script>
+  <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" src="/static/js/cktsim.js"></script>
+ 
 <script>
   // Feedback form
 $(function() {
@@ -109,13 +110,11 @@ $(function() {
         });
       });
     });
-</script>
 
-  <script type="text/javascript">
-    $(function(){
-      $("a[rel*=leanModal]").leanModal();
+$(function(){
+    $("a[rel*=leanModal]").leanModal();
     });
-  </script>
+</script>
 
 <%block name="js_extra"/>
 
diff --git a/marketing.html b/marketing.html
index e09029c24c..8cbbb3e2fc 100644
--- a/marketing.html
+++ b/marketing.html
@@ -23,9 +23,7 @@
   <!--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]-->
 
 
 <%block name="headextra"/>
diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss
index f408f3cbb0..5100e46ea7 100644
--- a/sass/courseware/_courseware.scss
+++ b/sass/courseware/_courseware.scss
@@ -145,7 +145,7 @@ div.course-wrapper {
     div#seq_content {
       h1 {
         background: none;
-        margin-bottom: 0;
+        margin-bottom: lh();
         padding-bottom: 0;
         border-bottom: none;
       }
diff --git a/sass/index/_footer.scss b/sass/index/_footer.scss
index ec1a1c2f37..dc3747dd64 100644
--- a/sass/index/_footer.scss
+++ b/sass/index/_footer.scss
@@ -59,6 +59,10 @@ footer {
         position: relative;
         top: -5px;
 
+        @media screen and (max-width: 780px) {
+          float: none;
+        }
+
         li {
           float: left;
           margin-right: lh(.5);