From b18d7c1f03a3b6b234512c457085c9d0fa295b80 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 24 Feb 2012 23:06:52 -0500 Subject: [PATCH 01/17] Fixed format specifier to not print out 12 instead of 12.0 on profile page --- profile.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From f0e2b6002493f8bf8ab20e505363768b1f0b1c81 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 24 Feb 2012 23:39:23 -0500 Subject: [PATCH 02/17] Fixed bug where tooltip of profile graph totals wouldn't show up --- profile_graphs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profile_graphs.js b/profile_graphs.js index 502c3c1469..5ffbde5521 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -58,7 +58,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 From d7fff54080564f0e0fff80b8bc80b6f19e20aa3b Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 10:07:01 -0500 Subject: [PATCH 03/17] Removed date sorting and added question excerpts --- sass/discussion/_questions.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 4d3b1be05e..c6acfc05b7 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -138,6 +138,10 @@ ul.question-list, div#question-list { text-transform: none; } + p.excerpt { + color: #777; + } + div.user-info { display: inline-block; vertical-align: top; @@ -158,6 +162,8 @@ ul.question-list, div#question-list { } &.question-meta { + float: right; + margin-top: 10px; width: flex-grid(3.5,9); ul { From 8bb11c52afe1e746f521f100c025053146c4bc56 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 10:50:19 -0500 Subject: [PATCH 04/17] Fixed sidebar and question list layout in smaller resolutions --- sass/discussion/_discussion.scss | 1 + sass/discussion/_questions.scss | 11 +++++++---- sass/discussion/_sidebar.scss | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) 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 c6acfc05b7..7d82f8bbd5 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -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; + } } } } @@ -145,6 +147,7 @@ ul.question-list, div#question-list { div.user-info { display: inline-block; vertical-align: top; + margin-bottom: 10px; span.relative-time { font-weight: normal; 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 { From 919cf9b1da30172d1971871a3ea1488e6ed3324d Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 13:38:41 -0500 Subject: [PATCH 05/17] Fixed minor alignment and baseline issues --- sass/discussion/_questions.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 7d82f8bbd5..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; @@ -169,6 +169,7 @@ ul.question-list, div#question-list { margin-top: 10px; width: flex-grid(3.5,9); + ul { text-align: right; @@ -181,6 +182,10 @@ ul.question-list, div#question-list { margin-right: 10px; width: 60px; + &:last-child { + margin-right: 0px; + } + &:hover { span, div { color: #555; From 4a734bf1b5a1eb68142353d3722020b1704a816e Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 15:02:37 -0500 Subject: [PATCH 06/17] Fixed wiki history table and header alignment issues --- sass/application.scss | 2 +- sass/wiki/_table.scss | 48 ++++++++++++++++++++++++ sass/wiki/_wiki.scss | 9 ++--- simplewiki_history.html | 83 +++++++++++++++++++++-------------------- 4 files changed, 94 insertions(+), 48 deletions(-) create mode 100644 sass/wiki/_table.scss 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/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..bff06a37a6 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -7,6 +7,8 @@ div.wiki-wrapper { header { @extend .topbar; + height:46px; + @include box-shadow(inset 0 1px 0 white); &:empty { display: none !important; @@ -43,7 +45,7 @@ div.wiki-wrapper { font-size: 12px; text-transform: uppercase; letter-spacing: 1px; - padding: 14px; + padding: 14.9px; padding-left: 38px; margin: 0; @@ -93,10 +95,5 @@ div.wiki-wrapper { } } - #wiki_history_table { - tr.dark { - background-color: $light-gray; - } - } } } diff --git a/simplewiki_history.html b/simplewiki_history.html index 87daba9f21..ddee16c1f6 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -17,7 +17,7 @@ ${ wiki_article.title }
- +
@@ -27,34 +27,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 +72,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 +
From 4520b15da95ae3fed065f9e9cac9ffbded366b8f Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 29 Feb 2012 16:05:50 -0500 Subject: [PATCH 07/17] Removed border from last course chapter in profile --- sass/_profile.scss | 4 ++++ 1 file changed, 4 insertions(+) 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); From cbfe2ae85162ea2a7646414d2de715eef7bc5fec Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 29 Feb 2012 16:52:01 -0500 Subject: [PATCH 08/17] Fixed https link --- activation_active.html | 2 +- activation_complete.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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.

From 4c16563def07f402b0008724130edfc0d4a9f39e Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 29 Feb 2012 17:25:14 -0500 Subject: [PATCH 09/17] Removed long comment; browser bug was rendering part of it --- index.html | 1 - 1 file changed, 1 deletion(-) 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.

-
From 682a167c6569e0a621006f47faa535720b30fd2e Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 1 Mar 2012 10:00:12 -0500 Subject: [PATCH 10/17] Changed height and padding for wiki header --- sass/base/_extends.scss | 1 + sass/wiki/_wiki.scss | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index 985365736d..ad2716ee2f 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -172,6 +172,7 @@ h1.top-header { font-size: 12px; margin: (-$body-line-height) (-$body-line-height) $body-line-height; text-shadow: 0 1px 0 #fff; + height:46px; @media print { display: none; diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index bff06a37a6..60dd559a31 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -20,10 +20,10 @@ div.wiki-wrapper { p { float: left; - padding: 15px; + padding: lh(.75) lh(); margin-bottom: 0; color: darken(#F6EFD4, 55%); - line-height: 1em; + line-height: lh(); } ul { @@ -34,6 +34,7 @@ div.wiki-wrapper { float: left; input[type="button"] { + @extend .block-link; @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include border-radius(0); @include transition(); @@ -42,28 +43,31 @@ div.wiki-wrapper { color: darken(#F6EFD4, 80%); text-shadow: none; font-weight: normal; - font-size: 12px; - text-transform: uppercase; + // font-size: 12px; + // text-transform: uppercase; letter-spacing: 1px; - padding: 14.9px; + // padding: 14.9px; + padding: lh(.60) lh(); padding-left: 38px; margin: 0; - + background-position: 12px center; + background-color: darken(#F6EFD4, 5%); + background-repeat: no-repeat; &.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; } } } From f7996b58f8d611e3956c5a724d57509e9de0c915 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 11:35:32 -0500 Subject: [PATCH 11/17] added a fix for the wiki topbar --- sass/wiki/_wiki.scss | 1 + simplewiki_base.html | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 60dd559a31..2677ca34f2 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -12,6 +12,7 @@ div.wiki-wrapper { &:empty { display: none !important; + border-bottom: 0; } a { diff --git a/simplewiki_base.html b/simplewiki_base.html index 81b88ec1b9..996e59a9cd 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -137,31 +137,31 @@
-
%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"/>

From 1987e8a29b970ec8b6e1ae0e914cdc5297814c92 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 11:39:18 -0500 Subject: [PATCH 12/17] tooltip lost styles --- sass/courseware/_sequence-nav.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 24d0687015..9270bf3a99 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -121,12 +121,12 @@ 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; &:empty { @@ -138,7 +138,7 @@ nav.sequence-nav { } &::after { - background: #B3A87E; + background: #333; content: " "; display: block; height: 10px; From 4d53b370d7f0e1b8135bf9bc40e3b5d255167c44 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Thu, 1 Mar 2012 12:25:26 -0500 Subject: [PATCH 13/17] Edited the simple wiki templates to allow for more flexibility in title markup + changed the layout of search results --- sass/wiki/_wiki.scss | 74 ++++++++++++++++++++++++++++------- simplewiki_base.html | 7 ++-- simplewiki_create.html | 2 +- simplewiki_edit.html | 2 +- simplewiki_error.html | 2 +- simplewiki_history.html | 2 + simplewiki_searchresults.html | 4 ++ simplewiki_view.html | 2 +- 8 files changed, 73 insertions(+), 22 deletions(-) diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 60dd559a31..e97e89f1b9 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -3,7 +3,10 @@ div.wiki-wrapper { width: 100%; section.wiki-body { + @extend .clearfix; @extend .content; + position: relative; + header { @extend .topbar; @@ -74,27 +77,70 @@ div.wiki-wrapper { } } - 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; + } } } } diff --git a/simplewiki_base.html b/simplewiki_base.html index 81b88ec1b9..db1120c15f 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -127,8 +127,8 @@
- - + + @@ -163,8 +163,7 @@ %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 ddee16c1f6..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"> 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"> +
    %for article in wiki_search_results: <% article_deleted = not article.current_revision.deleted == 0 %> @@ -27,4 +30,5 @@ Displaying all articles No articles matching ${wiki_search_query if wiki_search_query is not UNDEFINED else ""} ! %endif
+
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"> From f885cd85b6a1f5e44b754975215d4451b3dd7443 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 12:45:17 -0500 Subject: [PATCH 14/17] Fix styles for topbar --- sass/_textbook.scss | 2 +- sass/base/_extends.scss | 2 +- sass/courseware/_sequence-nav.scss | 2 +- sass/wiki/_wiki.scss | 24 +++++++++++------------- 4 files changed, 14 insertions(+), 16 deletions(-) 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/base/_extends.scss b/sass/base/_extends.scss index ad2716ee2f..2ac93d731e 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -172,6 +172,7 @@ 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 { @@ -191,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 { diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 9270bf3a99..47b23adbc9 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -172,7 +172,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/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 2677ca34f2..5de3851cd0 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -24,7 +24,6 @@ div.wiki-wrapper { padding: lh(.75) lh(); margin-bottom: 0; color: darken(#F6EFD4, 55%); - line-height: lh(); } ul { @@ -36,24 +35,23 @@ div.wiki-wrapper { input[type="button"] { @extend .block-link; - @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); - @include border-radius(0); - @include transition(); + 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; font-weight: normal; - // font-size: 12px; - // text-transform: uppercase; + font-size: 12px; letter-spacing: 1px; - // padding: 14.9px; - padding: lh(.60) lh(); - padding-left: 38px; + line-height: 46px; margin: 0; - background-position: 12px center; - background-color: darken(#F6EFD4, 5%); - background-repeat: no-repeat; + padding: 0 lh() 0 38px; + text-shadow: none; + text-transform: uppercase; + @include transition(); &.view { background-image: url('/static/images/sequence-nav/view.png'); From d3460a8ed2dddf9cfeea5c7fb853e38222bff1f6 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 13:37:44 -0500 Subject: [PATCH 15/17] Added fix for tooltips linehight --- sass/courseware/_sequence-nav.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 47b23adbc9..6c605760f0 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -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; From 5b8f0205bc6df0285ae0f98a03ae67d9b154724a Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 14:27:47 -0500 Subject: [PATCH 16/17] Minor adjustemnts to the topbar and Mathjax2 --- main.html | 2 +- sass/courseware/_sequence-nav.scss | 6 +++--- sass/wiki/_wiki.scss | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main.html b/main.html index dea829f05f..b3c1d67a91 100644 --- a/main.html +++ b/main.html @@ -20,7 +20,7 @@ displayMath: [["\\[","\\]"]]} }); - + <%block name="headextra"/> diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 6c605760f0..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; diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 850099fc4e..4e88811dc7 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -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; From 068e9eadeca717ecc47fefec6e5f6dad3a4976f1 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 1 Mar 2012 15:30:56 -0500 Subject: [PATCH 17/17] Adde new warning messages for userers IE8 and under --- create_account.html | 3 ++- login.html | 3 +++ main.html | 3 +++ sass/base/_extends.scss | 9 +++++++++ sass/index/_extends.scss | 7 +++++++ sass/layout/_leanmodal.scss | 4 ---- sass/marketing-ie.scss | 5 ----- 7 files changed, 24 insertions(+), 10 deletions(-) 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/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 b3c1d67a91..888fb82903 100644 --- a/main.html +++ b/main.html @@ -27,6 +27,9 @@ "> + ${self.body()} <%block name="bodyextra"/> diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index 2ac93d731e..d55fe62f96 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -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; +} 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; }