From 012edbfd40079586c8750c53672b496fbacf6de7 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Fri, 7 Sep 2012 11:14:26 -0400
Subject: [PATCH 1/3] Fix main navigation and footer links also make text not
 italic

---
 lms/static/sass/course/base/_base.scss                | 1 +
 lms/static/sass/course/layout/_courseware_header.scss | 4 ++--
 lms/static/sass/shared/_footer.scss                   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss
index 1edb9aa7ba..9d6cf81c9f 100644
--- a/lms/static/sass/course/base/_base.scss
+++ b/lms/static/sass/course/base/_base.scss
@@ -2,6 +2,7 @@ body {
   min-width: 980px;
   min-height: 100%;
   background: url(../images/bg-texture.png) #d6d6d6;
+  font-style: normal;
 }
 
 body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a, label {
diff --git a/lms/static/sass/course/layout/_courseware_header.scss b/lms/static/sass/course/layout/_courseware_header.scss
index 86b5fe58c5..f278339523 100644
--- a/lms/static/sass/course/layout/_courseware_header.scss
+++ b/lms/static/sass/course/layout/_courseware_header.scss
@@ -40,9 +40,9 @@ nav.course-material {
         }
 
         &.active {
-          // background: rgba(0, 0, 0, .2);
+          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/shared/_footer.scss b/lms/static/sass/shared/_footer.scss
index d182ed4316..a418b887ad 100644
--- a/lms/static/sass/shared/_footer.scss
+++ b/lms/static/sass/shared/_footer.scss
@@ -110,6 +110,7 @@ footer {
           padding: 0;
 
           a {
+            @include inline-block;
             opacity: 0.3;
             @include transition(all, 0.1s, linear);
 

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 2/3] 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 %}

From 4d4e5824cdd0c11ebac601bf15a5fa99679232ee Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Fri, 7 Sep 2012 13:29:49 -0400
Subject: [PATCH 3/3] Change form style for login and signup modals so it is
 consistant in every browser and we have no usability problems

---
 lms/static/sass/ie.scss            |  4 ----
 lms/static/sass/shared/_modal.scss | 11 +++++++++--
 lms/templates/login_modal.html     |  4 ++--
 lms/templates/signup_modal.html    | 14 +++++++-------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss
index ff5608deaf..a22d3935fd 100644
--- a/lms/static/sass/ie.scss
+++ b/lms/static/sass/ie.scss
@@ -130,10 +130,6 @@ header.global {
   background: #000;
 }
 
-.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);
diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss
index 409c6088ec..b7ea762ce8 100644
--- a/lms/static/sass/shared/_modal.scss
+++ b/lms/static/sass/shared/_modal.scss
@@ -147,10 +147,9 @@
       }
 
       label {
-        display: none;
+        color: #999;
 
         &.field-error {
-          display: block;
           color: #8F0E0E;
 
           + input {
@@ -164,6 +163,14 @@
         margin-right: 5px;
       }
 
+      ::-webkit-input-placeholder {
+        color: #ddd;
+      }
+
+      :-moz-placeholder {  
+        color: #ddd;  
+      }
+
       textarea {
         background: rgb(255,255,255);
         display: block;
diff --git a/lms/templates/login_modal.html b/lms/templates/login_modal.html
index 8652f457e6..d7d327178c 100644
--- a/lms/templates/login_modal.html
+++ b/lms/templates/login_modal.html
@@ -10,9 +10,9 @@
 
     <form id="login_form" class="login_form" method="post" data-remote="true" action="/login">
       <label>E-mail</label>
-      <input name="email" type="email" placeholder="E-mail">
+      <input name="email" type="email">
       <label>Password</label>
-      <input name="password" type="password" placeholder="Password">
+      <input name="password" type="password">
       <label class="remember-me">
         <input name="remember" type="checkbox" value="true">
         Remember me
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 1510eb407b..96b2e33ac3 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -21,18 +21,18 @@
         <div class="input-group">
 	  % if has_extauth_info is UNDEFINED:
           <label data-field="email">E-mail*</label>
-          <input name="email" type="email" placeholder="E-mail*">
+          <input name="email" type="email" placeholder="eg. example@edx.org">
           <label data-field="password">Password*</label>
-          <input name="password" type="password" placeholder="Password*">
+          <input name="password" type="password" placeholder="****">
           <label data-field="username">Public Username*</label>
-          <input name="username" type="text" placeholder="Public Username*">
+          <input name="username" type="text" placeholder="Shown on forms">
           <label data-field="name">Full Name</label>
-          <input name="name" type="text" placeholder="Full Name*">
+          <input name="name" type="text" placeholder="For your certificate">
 	  % else:
 	  <p><i>Welcome</i> ${extauth_email}</p><br/>
 	  <p><i>Enter a public username:</i></p>
           <label data-field="username">Public Username*</label>
-          <input name="username" type="text" value="${extauth_username}" placeholder="Public Username*">
+          <input name="username" type="text" value="${extauth_username}" placeholder="Shown on forums">
 	  % endif
         </div>
 
@@ -75,9 +75,9 @@
           </section>
 
           <label data-field="mailing_address">Mailing address</label>
-          <textarea name="mailing_address" placeholder="Mailing address"></textarea>
+          <textarea name="mailing_address"></textarea>
           <label data-field="goals">Goals in signing up for edX</label>
-          <textarea name="goals" placeholder="Goals in signing up for edX"></textarea>
+          <textarea name="goals"></textarea>
 
         </div>