Skip to content

E
edx-platform
Commit c94d6868 by Piotr Mitros
Options

Merge

parents 0b3c9dc9 f6434f90
Showing with 115 additions and 77 deletions
create_account.html
...@@ -2,6 +2,9 @@ ...@@ -2,6 +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>
<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>
<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 %>
......
index.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<section> <section>
<h1>Circuits &amp; Electronics</h1> <h1>Circuits &amp; Electronics</h1>
<h2>6.002x</h2> <h2>6.002x</h2>
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002x Circuits <span>&amp;</span> Electronics</a> <a class="enroll" rel="leanModal" href="#enroll"><noscript>In order to</noscript> Enroll in 6.002x Circuits <span>&amp;</span> Electronics <noscript>you need to have javascript enabled</noscript></a>
</section> </section>
<p>6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT&rsquo;s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 5, 2012 through June 8, 2012.</p> <p>6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT&rsquo;s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 5, 2012 through June 8, 2012.</p>
</section> </section>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</section> </section>
<section class="cta"> <section class="cta">
<a class="enroll" rel="leanModal" href="#enroll">Enroll in 6.002x Circuits &amp; Electronics</a> <a class="enroll" rel="leanModal" href="#enroll"><noscript>In order to</noscript> Enroll in 6.002x Circuits &amp; Electronics <noscript>you need to have javascript enabled</noscript></a>
</section> </section>
</section> </section>
......
sass/_textbook.scss
...@@ -74,6 +74,13 @@ div.book-wrapper { ...@@ -74,6 +74,13 @@ div.book-wrapper {
} }
} }
} }
&.bottom-nav {
margin-top: lh();
margin-bottom: -(lh());
border-bottom: 0;
border-top: 1px solid #EDDFAA;
}
} }
section.page { section.page {
......
sass/discussion/_answers.scss
...@@ -17,7 +17,7 @@ div.answer-controls { ...@@ -17,7 +17,7 @@ div.answer-controls {
nav { nav {
@extend .action-link; @extend .action-link;
float: right; float: right;
margin-top: 25px; margin-top: 34px;
a { a {
&.on span{ &.on span{
...@@ -27,7 +27,7 @@ div.answer-controls { ...@@ -27,7 +27,7 @@ div.answer-controls {
&:before { &:before {
content: '|'; content: '|';
color: darken(#F6EFD4, 10%); color: darken(#F6EFD4, 10%);
font-size: 22px; font-size: 16px;
} }
} }
} }
...@@ -111,14 +111,13 @@ div.answer-own { ...@@ -111,14 +111,13 @@ div.answer-own {
} }
div.answer-actions { div.answer-actions {
border-left: 3px solid darken(#F6EFD4, 10%);
margin: 0; margin: 0;
padding:8px 8px 8px 0; padding:8px 8px 8px 0;
text-align: right; text-align: right;
background:lighten(#F6EFD4, 5%); border-top: 1px solid #efefef;
span.sep { span.sep {
color: #ddd; color: #EDDFAA;
} }
a { a {
......
sass/discussion/_askbot-original.scss
...@@ -1037,44 +1037,44 @@ body.anon #searchbar { ...@@ -1037,44 +1037,44 @@ body.anon #searchbar {
// border: #cce6ec 3px solid; // border: #cce6ec 3px solid;
// width: 725px; } } // width: 725px; } }
.ask-page div#question-list, .edit-question-page div#question-list { // .ask-page div#question-list, .edit-question-page div#question-list {
float: none; // float: none;
border-bottom: #f0f0ec 1px solid; // border-bottom: #f0f0ec 1px solid;
float: left; // float: left;
margin-bottom: 10px; } // margin-bottom: 10px; }
.ask-page div#question-list a, .edit-question-page div#question-list a {
line-height: 30px; }
.ask-page div#question-list h2, .edit-question-page div#question-list h2 { // .ask-page div#question-list a, .edit-question-page div#question-list a {
font-size: 13px; // line-height: 30px; }
padding-bottom: 0;
color: #1b79bd;
border-top: #f0f0ec 1px solid;
border-left: #f0f0ec 1px solid;
height: 30px;
line-height: 30px;
font-weight: normal; }
.ask-page div#question-list span, .edit-question-page div#question-list span { // .ask-page div#question-list h2, .edit-question-page div#question-list h2 {
width: 28px; // font-size: 13px;
height: 26px; // padding-bottom: 0;
line-height: 26px; // color: #1b79bd;
text-align: center; // border-top: #f0f0ec 1px solid;
margin-right: 10px; // border-left: #f0f0ec 1px solid;
float: left; // height: 30px;
display: block; // line-height: 30px;
color: #fff; // font-weight: normal; }
background: #b8d0d5;
border-radius: 3px;
-ms-border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-khtml-border-radius: 3px; }
.ask-page label, .edit-question-page label { // .ask-page div#question-list span, .edit-question-page div#question-list span {
color: #525252; // width: 28px;
font-size: 13px; } // height: 26px;
// line-height: 26px;
// text-align: center;
// margin-right: 10px;
// float: left;
// display: block;
// color: #fff;
// background: #b8d0d5;
// border-radius: 3px;
// -ms-border-radius: 3px;
// -moz-border-radius: 3px;
// -webkit-border-radius: 3px;
// -khtml-border-radius: 3px; }
// .ask-page label, .edit-question-page label {
// color: #525252;
// font-size: 13px; }
// .ask-page #id_tags, .edit-question-page #id_tags { // .ask-page #id_tags, .edit-question-page #id_tags {
// border: #cce6ec 3px solid; // border: #cce6ec 3px solid;
...@@ -1083,9 +1083,9 @@ body.anon #searchbar { ...@@ -1083,9 +1083,9 @@ body.anon #searchbar {
// width: 395px; // width: 395px;
// font-size: 14px; } // font-size: 14px; }
.title-desc { // .title-desc {
color: #707070; // color: #707070;
font-size: 13px; } // font-size: 13px; }
// #fmanswer input.submit, .ask-page input.submit, .edit-question-page input.submit { // #fmanswer input.submit, .ask-page input.submit, .edit-question-page input.submit {
// float: left; // float: left;
......
sass/discussion/_discussion.scss
...@@ -43,14 +43,17 @@ body.askbot { ...@@ -43,14 +43,17 @@ body.askbot {
vertical-align: top; vertical-align: top;
width: flex-grid(9) + flex-gutter(); width: flex-grid(9) + flex-gutter();
p.tabula-rasa { .tabula-rasa {
@extend .light-button;
@include border-radius(5px); @include border-radius(5px);
background-color: #f6f6f6; display: block;
color: #888;
margin: 10px auto; margin: 10px auto;
padding: 20px; padding: 20px;
text-align: center; text-align: center;
width: flex-grid(5); width: flex-grid(5);
text-decoration: none;
color: #888;
font-weight: bold;
&:first-child { &:first-child {
margin-top: 70px; margin-top: 70px;
...@@ -59,11 +62,11 @@ body.askbot { ...@@ -59,11 +62,11 @@ body.askbot {
margin-bottom: 70px; margin-bottom: 70px;
} }
a { // span, a {
text-decoration: none; // text-decoration: none;
color: #888; // color: #888;
font-weight: bold; // font-weight: bold;
} // }
} }
} }
} }
......
sass/discussion/_forms.scss
...@@ -19,11 +19,21 @@ form.answer-form { ...@@ -19,11 +19,21 @@ form.answer-form {
display: block; display: block;
margin-bottom: -5px; margin-bottom: -5px;
} }
.title-desc {
@include box-sizing(border-box);
background: #333;
color: #fff;
font-size: 13px;
padding: 5px 10px;
width: flex-grid(6);
-webkit-font-smoothing: antialiased;
}
} }
span.form-error, label.form-error { span.form-error, label.form-error {
color: #990000; color: #990000;
display: inline; display: inline-block;
font-size: 90%; font-size: 90%;
font-weight: bold; font-weight: bold;
padding: 10px 0; padding: 10px 0;
...@@ -78,6 +88,7 @@ form.question-form { ...@@ -78,6 +88,7 @@ form.question-form {
} }
input[type="text"] { input[type="text"] {
@include box-sizing(border-box);
width: flex-grid(6); width: flex-grid(6);
} }
......
sass/discussion/_question-view.scss
...@@ -100,12 +100,10 @@ div.question-header { ...@@ -100,12 +100,10 @@ div.question-header {
display: inline-block; display: inline-block;
float: left; float: left;
width: flex-grid(1.8,8); width: flex-grid(1.8,8);
border-left: 1px dotted #CCC;
div.post-update-info { div.post-update-info {
@include box-sizing(border-box); @include box-sizing(border-box);
// @include border-radius(5px);
// background:lighten(#F6EFD4, 5%);
border-left: 3px solid darken(#F6EFD4, 10%);
padding: 10px; padding: 10px;
margin-bottom: 10px; margin-bottom: 10px;
...@@ -131,20 +129,6 @@ div.question-header { ...@@ -131,20 +129,6 @@ div.question-header {
margin-bottom: 2px; margin-bottom: 2px;
} }
// div.avatar {
// display: inline-block;
// float: left;
// margin-right: 3px;
// img.gravatar {
// background: white;
// border: 1px solid darken(#F6EFD4, 10%);
// margin-right: 5px;
// padding: 3px ;
// vertical-align: bottom;
// }
// }
div.user-meta { div.user-meta {
display: inline-block; display: inline-block;
...@@ -163,10 +147,8 @@ div.question-header { ...@@ -163,10 +147,8 @@ div.question-header {
div.comments-container { div.comments-container {
@include box-sizing(border-box); @include box-sizing(border-box);
// background: lighten(#efefef, 3%);
padding: 3%; padding: 3%;
display: inline-block; display: inline-block;
// margin: 15px 0 0;
padding: 3%; padding: 3%;
width: 100%; width: 100%;
...@@ -182,9 +164,6 @@ div.question-header { ...@@ -182,9 +164,6 @@ div.question-header {
&:first-child { &:first-child {
border-top: 0; border-top: 0;
} }
// &:last-child {
// border-bottom: 1px solid #ddd;
// }
} }
form.post-comments { form.post-comments {
......
sass/discussion/_questions.scss
...@@ -30,6 +30,7 @@ div.question-list-header { ...@@ -30,6 +30,7 @@ div.question-list-header {
div.question-sort { div.question-sort {
float: right; float: right;
margin-left: flex-gutter(); margin-left: flex-gutter();
margin-top: 10px;
nav { nav {
@extend .action-link; @extend .action-link;
...@@ -43,7 +44,7 @@ div.question-list-header { ...@@ -43,7 +44,7 @@ div.question-list-header {
&:before { &:before {
content: '|'; content: '|';
color: darken(#F6EFD4, 10%); color: darken(#F6EFD4, 10%);
font-size: 22px; font-size: 16px;
} }
} }
} }
...@@ -173,6 +174,15 @@ ul.question-list, div#question-list { ...@@ -173,6 +174,15 @@ ul.question-list, div#question-list {
} }
} }
div.post-own-question {
border-top: 1px solid #efefef;
padding: 10px;
a {
font-weight: bold;
}
}
} }
.search-result-summary { .search-result-summary {
......
sass/layout/_leanmodal.scss
...@@ -47,6 +47,10 @@ div.leanModal_box { ...@@ -47,6 +47,10 @@ div.leanModal_box {
&#enroll { &#enroll {
max-width: 600px; max-width: 600px;
p.ie-warning {
display: none;
}
ol { ol {
@extend .clearfix; @extend .clearfix;
......
sass/marketing-ie.scss
...@@ -7,3 +7,14 @@ body { ...@@ -7,3 +7,14 @@ body {
margin: 0; margin: 0;
overflow: hidden; overflow: hidden;
} }
div#enroll {
p.ie-warning {
display: block !important;
line-height: 1.3em;
}
form {
display: none;
}
}
staticbook.html
...@@ -57,6 +57,17 @@ function next_page() { ...@@ -57,6 +57,17 @@ function next_page() {
</nav> </nav>
<img id="bookpage" src="${ settings.BOOK_URL }p${ "%03i"%(page) }.png"> <img id="bookpage" src="${ settings.BOOK_URL }p${ "%03i"%(page) }.png">
<nav class="bottom-nav">
<ul>
<li class="last">
<a href="javascript:prev_page()">Previous page</a>
</li>
<li class="next">
<a href="javascript:next_page()">Next page</a>
</li>
</ul>
</nav>
</section> </section>
</section> </section>
</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