diff --git a/activation_active.html b/activation_active.html index 5f2af64c21..c51cccbb70 100644 --- a/activation_active.html +++ b/activation_active.html @@ -8,6 +8,6 @@

This account has already been activated. We will notify you as soon as the course starts.

-

For now you can go to the MITx homepage or the 6.002x course page.

+

For now you can go to the MITx homepage or the 6.002x course page.

diff --git a/activation_complete.html b/activation_complete.html index f976f00239..1a46dc21a9 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -5,6 +5,6 @@

Activation Complete!

Thanks for activating your email. We will notify you as soon as the course starts.

-

For now you can go to the MITx homepage or the 6.002x course page.

+

For now you can go to the MITx homepage or the 6.002x course page.

diff --git a/create_account.html b/create_account.html index 3a57707693..40cfaacd1c 100644 --- a/create_account.html +++ b/create_account.html @@ -2,8 +2,9 @@

Enroll in 6.002x Circuits & Electronics

- +
<% if 'error' in locals(): e = error %> diff --git a/index.html b/index.html index d6fe0d288d..961cedaa30 100644 --- a/index.html +++ b/index.html @@ -27,7 +27,6 @@

The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. You should expect to spend approximately 10 hours per week on the course.

-
diff --git a/login.html b/login.html index abf59aae74..0372532284 100644 --- a/login.html +++ b/login.html @@ -4,6 +4,9 @@

Log in to MITx

+
    diff --git a/main.html b/main.html index dea829f05f..888fb82903 100644 --- a/main.html +++ b/main.html @@ -20,13 +20,16 @@ displayMath: [["\\[","\\]"]]} }); - + <%block name="headextra"/> "> + ${self.body()} <%block name="bodyextra"/> diff --git a/profile.html b/profile.html index fd5b3ef0ab..a126ad1fe9 100644 --- a/profile.html +++ b/profile.html @@ -108,7 +108,7 @@ $(function() { %>

    - ${ section['section'] } ${"({0}/{1}) {2}".format( earned, total, percentageString )}

    + ${ section['section'] } ${"({0:g}/{1:g}) {2}".format( earned, total, percentageString )} ${section['subtitle']} %if 'due' in section and section['due']!="": due ${section['due']} @@ -118,7 +118,7 @@ $(function() {
      ${ "Problem Scores: " if section['graded'] else "Practice Scores: "} %for score in section['scores']: -
    1. ${ score[0] }/${ score[1] }
      2. +
    2. ${"{0:g}/{1:g}".format(score[0],score[1])}
      3. %endfor
    %endif diff --git a/profile_graphs.js b/profile_graphs.js index 0a5b68bdb2..dbe5dc1f96 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -61,7 +61,7 @@ $(function () { color: colors[${sectionIndex}].toString(), }); ticks = ticks.concat( [ [${tickIndex}, "${section['totallabel']}"] ] ); - detail_tooltips["${section['category']} Average"] = [ "${section['totalscore']['summary']}" ]; + detail_tooltips["${section['category']} Total"] = [ "${section['totalscore']['summary']}" ]; <% tickIndex += 1 + sectionSpacer %> %else: ##This is for sections like midterm or final, which have no smaller components diff --git a/sass/_profile.scss b/sass/_profile.scss index 669daecffb..f696116ab8 100644 --- a/sass/_profile.scss +++ b/sass/_profile.scss @@ -76,6 +76,10 @@ div.profile-wrapper { padding: lh() 0; width: 100%; + &:last-child { + border-bottom: 0px; + } + h2 { border-right: 1px dashed #ddd; @include box-sizing(border-box); diff --git a/sass/_textbook.scss b/sass/_textbook.scss index 8943eb1064..f0e43cd523 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -54,7 +54,7 @@ div.book-wrapper { a { @extend .block-link; - padding: 14px; + padding: 0 lh(); } ul { diff --git a/sass/application.scss b/sass/application.scss index c3f529534e..65825e4de4 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -11,7 +11,7 @@ @import "textbook"; @import "info"; @import "profile"; -@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki"; +@import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki", "wiki/table"; @import "help"; @import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/modals", "discussion/profile"; diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index 985365736d..d55fe62f96 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -172,6 +172,8 @@ h1.top-header { font-size: 12px; margin: (-$body-line-height) (-$body-line-height) $body-line-height; text-shadow: 0 1px 0 #fff; + line-height: 46px; + height:46px; @media print { display: none; @@ -190,7 +192,6 @@ h1.top-header { border-left: 1px solid darken(#f6efd4, 20%); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); display: block; - padding: lh(.75); text-transform: uppercase; &:hover { @@ -203,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; +} diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 24d0687015..99e29a39d2 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -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; @@ -121,13 +121,14 @@ nav.sequence-nav { p { position: absolute; display: none; - background: #B3A87E; + background: #333; padding: 6px; white-space: pre-wrap; z-index: 99; margin: 4px 0 0 -5px; - text-shadow: 0 -1px 0 darken(#B3A87E, 10%); + text-shadow: 0 -1px 0 #000; color: #fff; + line-height: lh(); &:empty { background: none; @@ -138,7 +139,7 @@ nav.sequence-nav { } &::after { - background: #B3A87E; + background: #333; content: " "; display: block; height: 10px; @@ -172,7 +173,7 @@ nav.sequence-nav { border-left: 1px solid darken(#f6efd4, 20%); cursor: pointer; display: table-cell; - padding: 14px 4px; + padding: 0 4px; text-indent: -9999px; width: 82px; diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index 1935711314..42d8350fef 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -39,6 +39,7 @@ body.askbot { div.discussion-content { @include box-sizing(border-box); display: table-cell; + min-width: 650px; padding: lh(); vertical-align: top; width: flex-grid(9) + flex-gutter(); diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 4d3b1be05e..72e4e69444 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -42,7 +42,7 @@ div.question-list-header { div.question-sort { float: right; margin-left: flex-gutter(); - margin-top: 10px; + margin-top: 6px; nav { @extend .action-link; @@ -87,11 +87,13 @@ div.question-list-header { } - ul.tags li { - background: #fff; + ul.tags { + li { + background: #fff; - &:before { - border-color: transparent #fff transparent transparent; + &:before { + border-color: transparent #fff transparent transparent; + } } } } @@ -138,9 +140,14 @@ ul.question-list, div#question-list { text-transform: none; } + p.excerpt { + color: #777; + } + div.user-info { display: inline-block; vertical-align: top; + margin-bottom: 10px; span.relative-time { font-weight: normal; @@ -158,8 +165,11 @@ ul.question-list, div#question-list { } &.question-meta { + float: right; + margin-top: 10px; width: flex-grid(3.5,9); + ul { text-align: right; @@ -172,6 +182,10 @@ ul.question-list, div#question-list { margin-right: 10px; width: 60px; + &:last-child { + margin-right: 0px; + } + &:hover { span, div { color: #555; diff --git a/sass/discussion/_sidebar.scss b/sass/discussion/_sidebar.scss index 47003ad4e7..fb007bab3b 100644 --- a/sass/discussion/_sidebar.scss +++ b/sass/discussion/_sidebar.scss @@ -7,6 +7,10 @@ div.discussion-wrapper aside { padding: lh(); width: flex-grid(3); + &.main-sidebar { + min-width:200px; + } + h1 { @extend .bottom-border; margin: (-(lh())) (-(lh())) 0; @@ -26,8 +30,15 @@ div.discussion-wrapper aside { box-shadow: none; } - input[type="text"] { - width: 76%; + div.inputs { + input[type="submit"] { + width: 27%; + float: right; + } + + input[type="text"] { + width: 62%; + } } div.box { diff --git a/sass/index/_extends.scss b/sass/index/_extends.scss index eaeb34a9e8..04bd5b83b6 100644 --- a/sass/index/_extends.scss +++ b/sass/index/_extends.scss @@ -85,3 +85,10 @@ } } +p.ie-warning { + display: block !important; + line-height: 1.3em; + background: yellow; + margin-bottom: lh(); + padding: lh(); +} diff --git a/sass/layout/_leanmodal.scss b/sass/layout/_leanmodal.scss index b344fbf9b9..b9399a39e4 100644 --- a/sass/layout/_leanmodal.scss +++ b/sass/layout/_leanmodal.scss @@ -47,10 +47,6 @@ div.leanModal_box { &#enroll { max-width: 600px; - p.ie-warning { - display: none; - } - ol { @extend .clearfix; padding-top: lh(); diff --git a/sass/marketing-ie.scss b/sass/marketing-ie.scss index 43c1e06f12..c92fd2f7fb 100644 --- a/sass/marketing-ie.scss +++ b/sass/marketing-ie.scss @@ -9,11 +9,6 @@ body { } div#enroll { - p.ie-warning { - display: block !important; - line-height: 1.3em; - } - form { display: none; } diff --git a/sass/wiki/_table.scss b/sass/wiki/_table.scss new file mode 100644 index 0000000000..ffb2796906 --- /dev/null +++ b/sass/wiki/_table.scss @@ -0,0 +1,48 @@ +table.wiki-history { + thead { + background: #ddd; + // border-bottom: 1px solid #ddd; + + tr { + height: 40px; + + th { + padding-top: 10px; + padding-left: 15px; + + &#revision { + width: 5%; + } + + &#comment { + width: 15%; + } + + &#diff { + width: 60%; + } + + &#modified { + width:20%; + } + } + } + } + tbody { + tr td { + padding: 8px 15px; + } + } + + tr.dark { + background-color: #efefef; + } +} + +div.history-controls { + margin-top: 20px; + + input[type="submit"] { + @extend .light-button; + } +} diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 3b131f846b..4e88811dc7 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -3,13 +3,19 @@ div.wiki-wrapper { width: 100%; section.wiki-body { + @extend .clearfix; @extend .content; + position: relative; + header { @extend .topbar; + height:46px; + @include box-shadow(inset 0 1px 0 white); &:empty { display: none !important; + border-bottom: 0; } a { @@ -18,10 +24,10 @@ div.wiki-wrapper { p { float: left; - padding: 15px; margin-bottom: 0; color: darken(#F6EFD4, 55%); - line-height: 1em; + line-height: 46px; + padding-left: lh(); } ul { @@ -32,71 +38,113 @@ div.wiki-wrapper { float: left; input[type="button"] { - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); - @include border-radius(0); - @include transition(); + @extend .block-link; + background-color: darken(#F6EFD4, 5%); + background-position: 12px center; + background-repeat: no-repeat; border: 0; border-left: 1px solid darken(#f6efd4, 20%); + @include border-radius(0); + @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); color: darken(#F6EFD4, 80%); - text-shadow: none; + display: block; font-weight: normal; font-size: 12px; - text-transform: uppercase; letter-spacing: 1px; - padding: 14px; - padding-left: 38px; + line-height: 46px; margin: 0; - + padding: 0 lh() 0 38px; + text-shadow: none; + text-transform: uppercase; + @include transition(); &.view { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/view.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/view.png'); } &.history { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/history.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/history.png'); } &.edit { - background: darken(#F6EFD4, 5%) url('/static/images/sequence-nav/edit.png') no-repeat 12px 12px; + background-image: url('/static/images/sequence-nav/edit.png'); } &:hover { - background-color: #F6EFD4; + background-color: transparent; } } } } } - h1.wiki-title { - font-weight: bold; - padding-bottom: 10px; - margin-bottom: 20px; - border-bottom: 1px solid #ccc; - } + h2.wiki-title { + margin-top: 0; + margin-bottom: 15px; + width: flex-grid(4, 9); + padding-right: flex-gutter(9); + border-right: 1px dashed #ddd; + @include box-sizing(border-box); + display: table-cell; + vertical-align: top; + + @media screen and (max-width:1120px) { + display: block; + width: auto; + border-right: 0; + } + + @media print { + display: block; + width: auto; + border-right: 0; + } + } p { line-height: 1.6em; } - ul.article-list { - margin-left: 15px; + section.results { + display: table-cell; + width: flex-grid(5, 9); + padding-left: flex-gutter(9); - li { - margin: 10px 0; - list-style-image: url('/static/images/bullet-triangle.png'); + @media screen and (max-width:1120px) { + display: block; + width: auto; + padding: 0; + } - h3 { - font-size: 18px; - font-weight: normal; + @media print { + display: block; + width: auto; + padding: 0; + + canvas, img { + page-break-inside: avoid; + } + } + + ul.article-list { + margin-left: 15px; + + li { + list-style: none; + margin: 0; + padding: 10px 0; + border-bottom: 1px solid #eee; + + &:last-child { + border-bottom: 0; + } + h3 { + font-size: 18px; + font-weight: normal; + } } } } - #wiki_history_table { - tr.dark { - background-color: $light-gray; - } - } } } diff --git a/simplewiki_base.html b/simplewiki_base.html index 81b88ec1b9..0f08d612c8 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -127,8 +127,8 @@
    - - + + @@ -137,34 +137,33 @@
    -
    %if wiki_article is not UNDEFINED: +
    %if wiki_article.locked: -

    This article has been locked

    +

    This article has been locked

    %endif -

    Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

    +

    Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

    %endif - %if wiki_article is not UNDEFINED: -
      + %if wiki_article is not UNDEFINED: +
        -
      • - -
        • +
      • + +
        • -
      • - -
        • +
      • + +
        • -
      • - -
        • -
      +
    • + +
      • +
    +
    %endif -
    - -

    <%block name="wiki_page_title"/>

    + <%block name="wiki_page_title"/> <%block name="wiki_body"/>
diff --git a/simplewiki_create.html b/simplewiki_create.html index a2161a22a7..6903c5ecd2 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -5,7 +5,7 @@ <%block name="title">Create Article - MITx 6.002 Wiki <%block name="wiki_page_title"> -Create article +

Create article

<%block name="wiki_body"> diff --git a/simplewiki_edit.html b/simplewiki_edit.html index 54fe13fe24..50cc33d20c 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -5,7 +5,7 @@ <%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> -${ wiki_article.title } +

${ wiki_article.title }

<%block name="wiki_head"> diff --git a/simplewiki_error.html b/simplewiki_error.html index 8b7324a998..73408349eb 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -10,7 +10,7 @@ <%block name="wiki_page_title"> -Oops... +

Oops...

diff --git a/simplewiki_history.html b/simplewiki_history.html index 87daba9f21..9b7c9e11db 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -9,7 +9,9 @@ %> <%block name="wiki_page_title"> +

${ wiki_article.title } +

<%block name="wiki_body"> @@ -17,7 +19,7 @@ ${ wiki_article.title }
- +
@@ -27,34 +29,34 @@ ${ wiki_article.title } - <% loopCount = 0 %> - %for revision in wiki_history: - %if revision.deleted < 2 or show_delete_revision: - <% loopCount += 1 %> - - - - - - - %endif + <% loopCount = 0 %> + %for revision in wiki_history: + %if revision.deleted < 2 or show_delete_revision: + <% loopCount += 1 %> + + + + + + + %endif %endfor %if wiki_prev_page or wiki_next_page: @@ -72,17 +74,18 @@ ${ wiki_article.title } %endif
Revision
- - - - ${ revision.revision_text if revision.revision_text else "None" } - %for x in revision.get_diff(): - ${x|h}
- %endfor 		${revision.get_user()} -
- ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} -
+ + + + ${ revision.revision_text if revision.revision_text else "None" } + %for x in revision.get_diff(): + ${x|h}
+ %endfor 		${revision.get_user()} +
+ ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} +
- - -%if show_delete_revision: - - - - -%endif +
+ + %if show_delete_revision: + + + + + %endif +
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index ee67f365ff..0b47bc08a2 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -9,14 +9,17 @@ from django.core.urlresolvers import reverse %> <%block name="wiki_page_title"> +

%if wiki_search_query: Search results for ${wiki_search_query | h} %else: Displaying all articles %endif +

<%block name="wiki_body"> +
+
diff --git a/simplewiki_view.html b/simplewiki_view.html index ef7b02d6b2..0421214a59 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -5,7 +5,7 @@ <%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> - ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} +

${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''}

<%block name="wiki_body">