Merge pull request openedx#668 from MITx/bug/kfiedler/ie

Fix IE bugs including schematic editor text alignment
jazkarta · Sep 13, 2012 · 9053fde · 9053fde
2 parents b90ddc7 + abdd3e9
commit 9053fde
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 16 deletions.
diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/common/lib/xmodule/xmodule/css/capa/display.scss
@@ -311,6 +311,10 @@ section.problem {
       text-align: left;
     }
 
+    td {
+      text-align: left;
+    }
+
     caption, th, td {
       padding: .25em .75em .25em 0;
       padding: .25rem .75rem .25rem 0;

diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
@@ -2,6 +2,7 @@ html, body {
   background: rgb(250,250,250);
   font-family: $sans-serif;
   font-size: 1em;
+  font-style: normal;
   line-height: 1em;
   //-webkit-font-smoothing: antialiased;
 }

diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss
@@ -87,7 +87,7 @@ div.course-wrapper {
         ul {
           list-style: disc outside none;
           padding-left: 1em;
-          
+
           &.discussion-errors {
             list-style: none;
             padding-left: 2em;

diff --git a/lms/static/sass/ie.scss b/lms/static/sass/ie.scss
@@ -130,6 +130,13 @@ 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);
 }
+
+header.global ol.user > li.primary a.dropdown {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
+
diff --git 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);
 

diff --git a/lms/templates/login_modal.html b/lms/templates/login_modal.html
@@ -10,9 +10,9 @@ <h2>Log In</h2>
 
     <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/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"/>
 
@@ -19,6 +16,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
@@ -12,6 +12,10 @@
   {% render_block "css" %}
 
   <meta name="path_prefix" content="{{MITX_ROOT_URL}}">
+  <!--[if lt IE 9]>
+  <script src="{% static "js/html5shiv.js" %}"></script>
+  <![endif]-->
+
 </head>
 
 
@@ -40,4 +44,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 %}
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
@@ -21,18 +21,18 @@ <h2>Sign Up for <span class="edx">edX</span></h2>
         <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 @@ <h2>Sign Up for <span class="edx">edX</span></h2>
           </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>