Commit b6e03c60 by Kyle Fiedler

Added back the ie fixes from before

parent 1dceff78
html, body { hktml, body {
background: rgb(250,250,250); background: rgb(250,250,250);
font-family: $sans-serif; font-family: $sans-serif;
font-size: 1em; font-size: 1em;
font-style: normal;
line-height: 1em; line-height: 1em;
//-webkit-font-smoothing: antialiased; //-webkit-font-smoothing: antialiased;
} }
......
...@@ -130,6 +130,13 @@ header.global { ...@@ -130,6 +130,13 @@ header.global {
background: #000; background: #000;
} }
.modal .inner-wrapper form label { 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 {
display: block; background-color: #333;
background-color: rgba(0, 0, 0, .4);
}
header.global ol.user > li.primary a.dropdown {
padding-top: 6px;
padding-bottom: 6px;
} }
...@@ -110,6 +110,7 @@ footer { ...@@ -110,6 +110,7 @@ footer {
padding: 0; padding: 0;
a { a {
@include inline-block;
opacity: 0.3; opacity: 0.3;
@include transition(all, 0.1s, linear); @include transition(all, 0.1s, linear);
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
<form id="login_form" class="login_form" method="post" data-remote="true" action="/login"> <form id="login_form" class="login_form" method="post" data-remote="true" action="/login">
<label>E-mail</label> <label>E-mail</label>
<input name="email" type="email" placeholder="E-mail"> <input name="email" type="email">
<label>Password</label> <label>Password</label>
<input name="password" type="password" placeholder="Password"> <input name="password" type="password">
<label class="remember-me"> <label class="remember-me">
<input name="remember" type="checkbox" value="true"> <input name="remember" type="checkbox" value="true">
Remember me Remember me
......
...@@ -8,9 +8,6 @@ ...@@ -8,9 +8,6 @@
<%static:css group='application'/> <%static:css group='application'/>
<!--[if lte IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
<%static:js group='main_vendor'/> <%static:js group='main_vendor'/>
<%block name="headextra"/> <%block name="headextra"/>
...@@ -19,6 +16,9 @@ ...@@ -19,6 +16,9 @@
<script src="${static.url('js/html5shiv.js')}"></script> <script src="${static.url('js/html5shiv.js')}"></script>
<![endif]--> <![endif]-->
<!--[if lte IE 9]>
<%static:css group='ie-fixes'/>
<![endif]-->
<meta name="path_prefix" content="${MITX_ROOT_URL}"> <meta name="path_prefix" content="${MITX_ROOT_URL}">
</head> </head>
......
...@@ -12,6 +12,13 @@ ...@@ -12,6 +12,13 @@
{% render_block "css" %} {% render_block "css" %}
<meta name="path_prefix" content="{{MITX_ROOT_URL}}"> <meta name="path_prefix" content="{{MITX_ROOT_URL}}">
<!--[if lt IE 9]>
<script src="{% static "js/html5shiv.js" %}"></script>
<![endif]-->
<!--[if lte IE 9]>
<link href="{% static "sass/ie.css" %}" rel="stylesheet" type="text/css" />
<![endif]-->
</head> </head>
......
...@@ -21,18 +21,18 @@ ...@@ -21,18 +21,18 @@
<div class="input-group"> <div class="input-group">
% if has_extauth_info is UNDEFINED: % if has_extauth_info is UNDEFINED:
<label data-field="email">E-mail*</label> <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> <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> <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> <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: % else:
<p><i>Welcome</i> ${extauth_email}</p><br/> <p><i>Welcome</i> ${extauth_email}</p><br/>
<p><i>Enter a public username:</i></p> <p><i>Enter a public username:</i></p>
<label data-field="username">Public Username*</label> <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 % endif
</div> </div>
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
</section> </section>
<label data-field="mailing_address">Mailing address</label> <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> <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> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment