Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Reda Lemeden
2012-03-01 15:48:22 -05:00
parent 9a109167ca 068e9eadec
commit 41488fa3af
9 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
create_account.html
View File

@@ -2,8 +2,9 @@
<div name="enroll_form" id="enroll_form">
<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>
<![endif]-->
<form name="enroll" id="enroll_form" method="get">
<fieldset><% if 'error' in locals(): e = error %>

3
login.html
View File

@@ -4,6 +4,9 @@
<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>
</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">
<ol>

5
main.html
View File

@@ -20,13 +20,16 @@
displayMath: [["\\[","\\]"]]}
});
</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"/>
</head>
<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()}
<%block name="bodyextra"/>

9
sass/base/_extends.scss
View File

@@ -204,3 +204,12 @@ h1.top-header {
.tran {
@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;
}

7
sass/courseware/_sequence-nav.scss
View File

@@ -24,9 +24,9 @@ nav.sequence-nav {
}
.visited {
background-color: shade(#F6EFD4, 10%);
background-color: #DCCDA2;
background-repeat: no-repeat;
border-color: shade(#F6EFD4, 10%);
@include box-shadow(inset 0 0 3px darken(#dccda2, 10%));
&:hover {
background-color: #F6EFD4;
@@ -52,7 +52,7 @@ nav.sequence-nav {
border: none;
border-right: 1px solid darken(#F6EFD4, 10%);
cursor: pointer;
padding: 14px 4px;
padding: 15px 4px 14px;
width: 28px;
height: 17px;
@@ -128,6 +128,7 @@ nav.sequence-nav {
margin: 4px 0 0 -5px;
text-shadow: 0 -1px 0 #000;
color: #fff;
line-height: lh();
&:empty {
background: none;

7
sass/index/_extends.scss
View File

@@ -85,3 +85,10 @@
}
}
p.ie-warning {
display: block !important;
line-height: 1.3em;
background: yellow;
margin-bottom: lh();
padding: lh();
}

4
sass/layout/_leanmodal.scss
View File

@@ -47,10 +47,6 @@ div.leanModal_box {
&#enroll {
max-width: 600px;
p.ie-warning {
display: none;
}
ol {
@extend .clearfix;
padding-top: lh();

5
sass/marketing-ie.scss
View File

@@ -9,11 +9,6 @@ body {
}
div#enroll {
p.ie-warning {
display: block !important;
line-height: 1.3em;
}
form {
display: none;
}

4
sass/wiki/_wiki.scss
View File

@@ -24,9 +24,10 @@ div.wiki-wrapper {
p {
float: left;
padding: lh(.75) lh();
margin-bottom: 0;
color: darken(#F6EFD4, 55%);
line-height: 46px;
padding-left: lh();
}
ul {
@@ -46,6 +47,7 @@ div.wiki-wrapper {
@include border-radius(0);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
color: darken(#F6EFD4, 80%);
display: block;
font-weight: normal;
font-size: 12px;
letter-spacing: 1px;