Revert "Merge pull request #642 from MITx/bug/kfiedler/ie"

This reverts commit 3e1bac48, reversing
changes made to 4f680ee0.

lms/static/sass/course/base/_base.scss

@@ -2,7 +2,6 @@ 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 {
@@ -40,6 +39,11 @@ a {
   }
 }
 
+
+
+
+
+
 form {
   label {
     display: block;

lms/static/sass/course/layout/_courseware_header.scss

@@ -40,6 +40,7 @@ nav.course-material {
         }
 
         &.active {
+          // background: rgba(0, 0, 0, .2);
           @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);

lms/static/sass/course/wiki/_wiki.scss

@@ -397,7 +397,7 @@ section.wiki {
 
   #hint_id_content {
     position: absolute;
-    top: 4px;
+    top: 10px;
     right: 0%;
     font-size: 12px;
     text-align:right;

lms/static/sass/ie.scss

@@ -130,13 +130,6 @@ header.global {
   background: #000;
 }
 
-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);
+.modal .inner-wrapper form label {
+  display: block;
 }
-
-header.global ol.user > li.primary a.dropdown {
-  padding-top: 6px;
-  padding-bottom: 6px;
-}
-

lms/static/sass/shared/_footer.scss

@@ -110,7 +110,6 @@ footer {
           padding: 0;
 
           a {
-            @include inline-block;
             opacity: 0.3;
             @include transition(all, 0.1s, linear);
 

lms/static/sass/shared/_modal.scss

@@ -147,9 +147,10 @@
       }
 
       label {
-        color: #999;
+        display: none;
 
         &.field-error {
+          display: block;
           color: #8F0E0E;
 
           + input {
@@ -163,14 +164,6 @@
         margin-right: 5px;
       }
 
-      ::-webkit-input-placeholder {
-        color: #ddd;
-      }
-
-      :-moz-placeholder {  
-        color: #ddd;  
-      }
-
       textarea {
         background: rgb(255,255,255);
         display: block;

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">
+      <input name="email" type="email" placeholder="E-mail">
       <label>Password</label>
-      <input name="password" type="password">
+      <input name="password" type="password" placeholder="Password">
       <label class="remember-me">
         <input name="remember" type="checkbox" value="true">
         Remember me

lms/templates/main.html

@@ -8,6 +8,9 @@
 
   <%static:css group='application'/>
 
+  <!--[if lte IE 9]>
+  <%static:css group='ie-fixes'/>
+  <![endif]-->
   <%static:js group='main_vendor'/>
   <%block name="headextra"/>
 
@@ -15,9 +18,6 @@
   <!--[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>

lms/templates/main_django.html

@@ -11,13 +11,7 @@
   {% 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>
 
 
@@ -46,4 +40,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 %}
+{% endcomment %}
\ No newline at end of file

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="eg. example@edx.org">
+          <input name="email" type="email" placeholder="E-mail*">
           <label data-field="password">Password*</label>
-          <input name="password" type="password" placeholder="****">
+          <input name="password" type="password" placeholder="Password*">
           <label data-field="username">Public Username*</label>
-          <input name="username" type="text" placeholder="Shown on forms">
+          <input name="username" type="text" placeholder="Public Username*">
           <label data-field="name">Full Name</label>
-          <input name="name" type="text" placeholder="For your certificate">
+          <input name="name" type="text" placeholder="Full Name*">
 	  % 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="Shown on forums">
+          <input name="username" type="text" value="${extauth_username}" placeholder="Public Username*">
 	  % endif
         </div>
 
@@ -75,9 +75,9 @@
           </section>
 
           <label data-field="mailing_address">Mailing address</label>
-          <textarea name="mailing_address"></textarea>
+          <textarea name="mailing_address" placeholder="Mailing address"></textarea>
           <label data-field="goals">Goals in signing up for edX</label>
-          <textarea name="goals"></textarea>
+          <textarea name="goals" placeholder="Goals in signing up for edX"></textarea>
 
         </div>