Skip to content

E
edx-platform
Commit 41488fa3 by Reda Lemeden
Options

Merge

parents 9a109167 068e9ead
Showing with 32 additions and 15 deletions
create_account.html
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
<div name="enroll_form" id="enroll_form"> <div name="enroll_form" id="enroll_form">
<h1>Enroll in 6.002x Circuits &amp; Electronics</h1> <h1>Enroll in 6.002x Circuits &amp; Electronics</h1>
<!--[if lte IE 8]>
<p class="ie-warning"> Enrollment requires a modern web browser with JavaScript enabled. You don't have this. You can&rsquo;t enroll without upgrading, since you couldn&rsquo;t take the course without upgrading. Feel free to download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Mozilla Firefox</a> or <a href="http://support.google.com/chrome/bin/answer.py?hl=en&answer=95346">Google Chrome</a>, for free, to enroll and take this course.</p> <p class="ie-warning"> Enrollment requires a modern web browser with JavaScript enabled. You don't have this. You can&rsquo;t enroll without upgrading, since you couldn&rsquo;t take the course without upgrading. Feel free to download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Mozilla Firefox</a> or <a href="http://support.google.com/chrome/bin/answer.py?hl=en&answer=95346">Google Chrome</a>, for free, to enroll and take this course.</p>
<![endif]-->
<form name="enroll" id="enroll_form" method="get"> <form name="enroll" id="enroll_form" method="get">
<fieldset><% if 'error' in locals(): e = error %> <fieldset><% if 'error' in locals(): e = error %>
......
login.html
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
<h1>Log in to MITx</h1> <h1>Log in to MITx</h1>
<p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p> <p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p>
</header> </header>
<!--[if lte IE 8]>
<p class="ie-warning">You are using a browser that is not supported by <em>MITx</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
<![endif]-->
<form id="login_form" method="post"> <form id="login_form" method="post">
<ol> <ol>
......
main.html
...@@ -20,13 +20,16 @@ ...@@ -20,13 +20,16 @@
displayMath: [["\\[","\\]"]]} displayMath: [["\\[","\\]"]]}
}); });
</script> </script>
<script type="text/javascript" src="${ settings.LIB_URL }mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> <script type="text/javascript" src="${ settings.LIB_URL }mathjax-MathJax-c9db6ac/MathJax.js?config=TeX-AMS_HTML-full"></script>
<%block name="headextra"/> <%block name="headextra"/>
</head> </head>
<body class="<%block name="bodyclass"/>"> <body class="<%block name="bodyclass"/>">
<!--[if lte IE 8]>
<p class="ie-warning">You are using a browser that is not supported by <em>MITx</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
<![endif]-->
${self.body()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
......
sass/base/_extends.scss
...@@ -204,3 +204,12 @@ h1.top-header { ...@@ -204,3 +204,12 @@ h1.top-header {
.tran { .tran {
@include transition( all, .2s, $ease-in-out-quad); @include transition( all, .2s, $ease-in-out-quad);
} }
p.ie-warning {
display: block !important;
line-height: 1.3em;
background: yellow;
padding: lh();
text-align: left;
margin-bottom: 0;
}
sass/courseware/_sequence-nav.scss
...@@ -24,9 +24,9 @@ nav.sequence-nav { ...@@ -24,9 +24,9 @@ nav.sequence-nav {
} }
.visited { .visited {
background-color: shade(#F6EFD4, 10%); background-color: #DCCDA2;
background-repeat: no-repeat; background-repeat: no-repeat;
border-color: shade(#F6EFD4, 10%); @include box-shadow(inset 0 0 3px darken(#dccda2, 10%));
&:hover { &:hover {
background-color: #F6EFD4; background-color: #F6EFD4;
...@@ -52,7 +52,7 @@ nav.sequence-nav { ...@@ -52,7 +52,7 @@ nav.sequence-nav {
border: none; border: none;
border-right: 1px solid darken(#F6EFD4, 10%); border-right: 1px solid darken(#F6EFD4, 10%);
cursor: pointer; cursor: pointer;
padding: 14px 4px; padding: 15px 4px 14px;
width: 28px; width: 28px;
height: 17px; height: 17px;
...@@ -128,6 +128,7 @@ nav.sequence-nav { ...@@ -128,6 +128,7 @@ nav.sequence-nav {
margin: 4px 0 0 -5px; margin: 4px 0 0 -5px;
text-shadow: 0 -1px 0 #000; text-shadow: 0 -1px 0 #000;
color: #fff; color: #fff;
line-height: lh();
&:empty { &:empty {
background: none; background: none;
......
sass/index/_extends.scss
...@@ -85,3 +85,10 @@ ...@@ -85,3 +85,10 @@
} }
} }
p.ie-warning {
display: block !important;
line-height: 1.3em;
background: yellow;
margin-bottom: lh();
padding: lh();
}
sass/layout/_leanmodal.scss
...@@ -47,10 +47,6 @@ div.leanModal_box { ...@@ -47,10 +47,6 @@ div.leanModal_box {
&#enroll { &#enroll {
max-width: 600px; max-width: 600px;
p.ie-warning {
display: none;
}
ol { ol {
@extend .clearfix; @extend .clearfix;
padding-top: lh(); padding-top: lh();
......
sass/marketing-ie.scss
...@@ -9,11 +9,6 @@ body { ...@@ -9,11 +9,6 @@ body {
} }
div#enroll { div#enroll {
p.ie-warning {
display: block !important;
line-height: 1.3em;
}
form { form {
display: none; display: none;
} }
......
sass/wiki/_wiki.scss
...@@ -24,9 +24,10 @@ div.wiki-wrapper { ...@@ -24,9 +24,10 @@ div.wiki-wrapper {
p { p {
float: left; float: left;
padding: lh(.75) lh();
margin-bottom: 0; margin-bottom: 0;
color: darken(#F6EFD4, 55%); color: darken(#F6EFD4, 55%);
line-height: 46px;
padding-left: lh();
} }
ul { ul {
...@@ -46,6 +47,7 @@ div.wiki-wrapper { ...@@ -46,6 +47,7 @@ div.wiki-wrapper {
@include border-radius(0); @include border-radius(0);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
color: darken(#F6EFD4, 80%); color: darken(#F6EFD4, 80%);
display: block;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
letter-spacing: 1px; letter-spacing: 1px;
......
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