From aec8cc42dcda83457b81986a0ce01ba3b7bc6655 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Fri, 7 Sep 2012 12:59:30 -0400
Subject: [PATCH] Add ie fix for wiki

---
 lms/static/sass/course/base/_base.scss                |  5 -----
 lms/static/sass/course/layout/_courseware_header.scss |  3 +--
 lms/static/sass/course/wiki/_wiki.scss                |  2 +-
 lms/static/sass/ie.scss                               | 11 +++++++++++
 lms/templates/main.html                               |  6 +++---
 lms/templates/main_django.html                        |  8 +++++++-
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss
index 9d6cf81c9f..902c8025fd 100644
--- a/lms/static/sass/course/base/_base.scss
+++ b/lms/static/sass/course/base/_base.scss
@@ -40,11 +40,6 @@ a {
   }
 }
 
-
-
-
-
-
 form {
   label {
     display: block;
diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss
index f278339523..103139b330 100644
--- a/lms/static/sass/course/layout/_courseware_header.scss
+++ b/lms/static/sass/course/layout/_courseware_header.scss
@@ -40,9 +40,8 @@ nav.course-material {
         }
 
         &.active {
-          background-color: #333;
-          background-color: rgba(0, 0, 0, 0);
           @include linear-gradient(top, rgba(0, 0, 0, .4), rgba(0, 0, 0, .25));
+          background-color: transparent;
           @include box-shadow(0 1px 0 rgba(255, 255, 255, .5), 0 1px 1px rgba(0, 0, 0, .3) inset);
           color: #fff;
           text-shadow: 0 1px 0 rgba(0, 0, 0, .4);
diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index 1bc38abd9a..84260e2a86 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -397,7 +397,7 @@ section.wiki {
 
   #hint_id_content {
     position: absolute;
-    top: 10px;
+    top: 4px;
     right: 0%;
     font-size: 12px;
     text-align:right;
diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss
index 35997d95a7..ff5608deaf 100644
--- a/lms/static/sass/ie.scss
+++ b/lms/static/sass/ie.scss
@@ -133,3 +133,14 @@ header.global {
 .modal .inner-wrapper form label {
   display: block;
 }
+
+nav.course-material ol.course-tabs li a.active, nav.course-material .xmodule_SequenceModule nav.sequence-nav ol.course-tabs li a.seq_video.active, .xmodule_SequenceModule nav.sequence-nav nav.course-material ol.course-tabs li a.seq_video.active {
+  background-color: #333;
+  background-color: rgba(0, 0, 0, .4);
+}
+
+header.global ol.user > li.primary a.dropdown {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+
diff --git a/lms/templates/main.html b/lms/templates/main.html
index 51b8d6030e..ec0b907fdf 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -8,9 +8,6 @@
 
   <%static:css group='application'/>
 
-  <!--[if lte IE 9]>
-  <%static:css group='ie-fixes'/>
-  <![endif]-->
   <%static:js group='main_vendor'/>
   <%block name="headextra"/>
 
@@ -18,6 +15,9 @@
   <!--[if lt IE 9]>
   <script src="${static.url('js/html5shiv.js')}"></script>
   <![endif]-->
+  <!--[if lte IE 9]>
+  <%static:css group='ie-fixes'/>
+  <![endif]-->
 
   <meta name="path_prefix" content="${MITX_ROOT_URL}">
 </head>
diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html
index d300e666a9..fa59f0128b 100644
--- a/lms/templates/main_django.html
+++ b/lms/templates/main_django.html
@@ -11,7 +11,13 @@
   {% block headextra %}{% endblock %}
   {% render_block "css" %}
   
+  <!--[if lte IE 9]> <link href="{% static "sass/ie.css" %}" rel="stylesheet" type="text/css" /> <![endif]-->
+
   <meta name="path_prefix" content="{{MITX_ROOT_URL}}">
+
+  <!--[if lt IE 9]>
+  <script src="{% static "js/html5shiv.js" %}"></script>
+  <![endif]-->
 </head>
 
 
@@ -40,4 +46,4 @@
   Inheriting from this file allows us to include apps that use the
   django templating system without rewriting all of their views in
   mako. 
-{% endcomment %}
\ No newline at end of file
+{% endcomment %}