From a7f2d9677577a2d5a8e7bd7c9a9dc526452a7eec Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 10 Feb 2012 12:17:49 -0500 Subject: [PATCH 01/46] Added bar on progress graph to show overall grade. --HG-- branch : bridger-dev --- profile_graphs.js | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/profile_graphs.js b/profile_graphs.js index 80eb9dc3b0..43e15937d9 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -16,7 +16,7 @@ $(function () { }).appendTo("body").fadeIn(200); } - /* -------------------------------- Grade detail graph -------------------------------- */ + /* -------------------------------- Grade detail bars -------------------------------- */ var colors = [$.color.parse("#E8B800"), $.color.parse("#A0CEFA"), $.color.parse("#BD3738"), $.color.parse("#429A2E")]; //var colors = [$.color.parse("#1B2045"), $.color.parse("#557a00"), $.color.parse("#F5600"), $.color.parse("#FEBA2C")]; //var colors = [$.color.parse("#E7C856"), $.color.parse("#CD462E"), $.color.parse("#B01732"), $.color.parse("#41192A")]; @@ -82,9 +82,39 @@ $(function () { //Alwasy be sure that one series has the xaxis set to 2, or the second xaxis labels won't show up series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "red", xaxis: 2} ); + + /* ----------------------------- Grade overviewew bar -------------------------*/ + <% + totalWeight = 0.0 + sectionIndex = 0 + totalScore = 0.0 + %> + %for section in grade_summary: + <% + weighted_score = section['totalscore']['score'] * section['weight'] + summary_text = "{0} - {1:.0%} of possible {2:.0%}".format(section['category'], weighted_score, section['weight']) + %> + %if section['totalscore']['score'] > 0: + series.push({label: "${section['category']} - Weighted", + data: [[${tickIndex}, ${weighted_score}]], + color: colors[${sectionIndex}].toString(), + }); + %endif + + detail_tooltips["${section['category']} - Weighted"] = [ "${summary_text}" ]; + <% + sectionIndex += 1 + totalWeight += section['weight'] + totalScore += section['totalscore']['score'] * section['weight'] + %> + %endfor + <% tickIndex += 1 + sectionSpacer %> + + var options = { - series: {lines: {show: false, steps: false }, - bars: {show: true, barWidth: 0.6, align: 'center', lineWidth: 1},}, + series: {stack: true, + lines: {show: false, steps: false }, + bars: {show: true, barWidth: 0.6, align: 'center', lineWidth: 1},}, xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}}, xaxes: [{ticks: ticks}, {ticks: bottomTicks}], yaxis: {ticks: [[1, "100%"], [0.87, "A 87%"], [0.7, "B 70%"], [0.6, "C 60%"], [0, "0%"]], min: 0.0, max: 1.0, labelWidth: 50}, @@ -103,8 +133,8 @@ $(function () { $("#x").text(pos.x.toFixed(2)); $("#y").text(pos.y.toFixed(2)); if (item) { - if (previousPoint != item.dataIndex) { - previousPoint = item.dataIndex; + if (previousPoint != (item.dataIndex, item.seriesIndex)) { + previousPoint = (item.dataIndex, item.seriesIndex); $("#tooltip").remove(); From 59ff6ce7df96a9a2d3032ddb42839ba12fa26fc8 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 10 Feb 2012 12:35:42 -0500 Subject: [PATCH 02/46] Added percentage label to course overview progress --HG-- branch : bridger-dev --- profile_graphs.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/profile_graphs.js b/profile_graphs.js index 43e15937d9..171cacc7f3 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -88,15 +88,16 @@ $(function () { totalWeight = 0.0 sectionIndex = 0 totalScore = 0.0 + overviewBarX = tickIndex %> %for section in grade_summary: <% weighted_score = section['totalscore']['score'] * section['weight'] - summary_text = "{0} - {1:.0%} of possible {2:.0%}".format(section['category'], weighted_score, section['weight']) + summary_text = "{0} - {1:.0%} of a possible {2:.0%}".format(section['category'], weighted_score, section['weight']) %> %if section['totalscore']['score'] > 0: series.push({label: "${section['category']} - Weighted", - data: [[${tickIndex}, ${weighted_score}]], + data: [[${overviewBarX}, ${weighted_score}]], color: colors[${sectionIndex}].toString(), }); %endif @@ -124,9 +125,16 @@ $(function () { legend: {show: false}, }; - if ($("#grade-detail-graph").length > 0) { - $.plot($("#grade-detail-graph"), series, options); + var $grade_detail_graph = $("#grade-detail-graph"); + if ($grade_detail_graph.length > 0) { + var plot = $.plot($grade_detail_graph, series, options); + + var o = plot.pointOffset({x: ${overviewBarX} , y: ${totalScore}}); + $grade_detail_graph.append('
${"{:.0%}".format(totalScore)}
'); } + + + var previousPoint = null; $("#grade-detail-graph").bind("plothover", function (event, pos, item) { From 69343aaedd81111711bea2d45f2243fe01ccb91a Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 10 Feb 2012 15:57:39 -0500 Subject: [PATCH 03/46] Rotated the profile graph labels, so the all fit --HG-- branch : bridger-dev --- profile.html | 4 ++-- profile_graphs.js | 41 ++++++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/profile.html b/profile.html index 422d21f2b8..6e627005de 100644 --- a/profile.html +++ b/profile.html @@ -5,9 +5,9 @@ %> <%block name="headextra"> - + - + diff --git a/profile_graphs.js b/profile_graphs.js index 171cacc7f3..a24bdfb7c4 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -42,7 +42,7 @@ $(function () { data: ${ json.dumps( [[i + tickIndex, score['percentage']] for i,score in enumerate(section['subscores'])] ) }, color: colors[${sectionIndex}].toString(), }); - ticks = ticks.concat( ${ json.dumps( [[i + tickIndex, str(i + 1)] for i,score in enumerate(section['subscores'])] ) } ); + ticks = ticks.concat( ${ json.dumps( [[i + tickIndex, score['label'] ] for i,score in enumerate(section['subscores'])] ) } ); bottomTicks.push( [ ${tickIndex + len(section['subscores'])/2}, "${section['category']}" ] ); detail_tooltips["${section['category']}"] = ${ json.dumps([score['summary'] for score in section['subscores']] ) }; @@ -57,8 +57,8 @@ $(function () { data: [[${tickIndex}, ${section['totalscore']['score']}]], color: colors[${sectionIndex}].toString(), }); - ticks = ticks.concat( [ [${tickIndex}, "Total"] ] ); - detail_tooltips["${section['category']} Total"] = [ "${section['totalscore']['summary']}" ]; + ticks = ticks.concat( [ [${tickIndex}, "${section['totallabel']}"] ] ); + detail_tooltips["${section['category']} Average"] = [ "${section['totalscore']['summary']}" ]; <% tickIndex += 1 + sectionSpacer %> %else: ##This is for sections like midterm or final, which have no smaller components @@ -66,12 +66,8 @@ $(function () { data: [[${tickIndex}, ${section['totalscore']['score']}]], color: colors[${sectionIndex}].toString(), }); - %if section['category'] == "Midterm": - bottomTicks = bottomTicks.concat( [ [${tickIndex}, "${section['category']}"] ] ); - %else: - ticks = ticks.concat( [ [${tickIndex}, "${section['category']}"] ] ); - %endif - + ticks = ticks.concat( [ [${tickIndex}," ${section['totallabel']}"] ] ); + detail_tooltips["${section['category']}"] = [ "${section['totalscore']['summary']}" ]; <% tickIndex += 1 + sectionSpacer %> @@ -80,7 +76,7 @@ $(function () { %endfor //Alwasy be sure that one series has the xaxis set to 2, or the second xaxis labels won't show up - series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "red", xaxis: 2} ); + series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "red"} ); /* ----------------------------- Grade overviewew bar -------------------------*/ @@ -93,7 +89,7 @@ $(function () { %for section in grade_summary: <% weighted_score = section['totalscore']['score'] * section['weight'] - summary_text = "{0} - {1:.0%} of a possible {2:.0%}".format(section['category'], weighted_score, section['weight']) + summary_text = "{0} - {1:.1%} of a possible {2:.0%}".format(section['category'], weighted_score, section['weight']) %> %if section['totalscore']['score'] > 0: series.push({label: "${section['category']} - Weighted", @@ -109,6 +105,8 @@ $(function () { totalScore += section['totalscore']['score'] * section['weight'] %> %endfor + ticks = ticks.concat( [ [${overviewBarX}, "Totals"] ] ); + <% tickIndex += 1 + sectionSpacer %> @@ -116,8 +114,7 @@ $(function () { series: {stack: true, lines: {show: false, steps: false }, bars: {show: true, barWidth: 0.6, align: 'center', lineWidth: 1},}, - xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}}, - xaxes: [{ticks: ticks}, {ticks: bottomTicks}], + xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}, ticks: ticks, labelAngle: 90}, yaxis: {ticks: [[1, "100%"], [0.87, "A 87%"], [0.7, "B 70%"], [0.6, "C 60%"], [0, "0%"]], min: 0.0, max: 1.0, labelWidth: 50}, grid: { hoverable: true, clickable: true, borderWidth: 1, markings: [ {yaxis: {from: 0.87, to: 1 }, color: "#EBFFD5"}, {yaxis: {from: 0.7, to: 0.87 }, color: "#E6FFFF"}, @@ -131,6 +128,24 @@ $(function () { var o = plot.pointOffset({x: ${overviewBarX} , y: ${totalScore}}); $grade_detail_graph.append('
${"{:.0%}".format(totalScore)}
'); + + // //Rotate the x-axis labels + // var rotateValue = "rotate(-60deg)"; + // var rotateOrigin = "bottom left"; + // $("#grade-detail-graph .x1Axis .tickLabel").css( { + // '-webkit-transform': rotateValue, + // '-moz-transform': rotateValue, + // '-ms-transform': rotateValue, + // '-o-transform': rotateValue, + // 'transform': rotateValue, + // + // '-webkit-transform-origin': rotateOrigin, + // '-moz-transform-origin': rotateOrigin, + // '-ms-transform-origin': rotateOrigin, + // '-o-transform-origin': rotateOrigin, + // + // 'text-align' : 'left', + // }); } From 885c3ac1a608dbb48b2022708e715a4607d37a15 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Fri, 10 Feb 2012 16:57:00 -0500 Subject: [PATCH 04/46] The organization of simplewiki_base was a little messed up. Most content was being put in the header --HG-- branch : bridger-dev --- simplewiki_base.html | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/simplewiki_base.html b/simplewiki_base.html index 17f110bf1a..0f4e70cb2c 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -65,35 +65,29 @@ }); - - -<%block name="bodyextra"> + <%block name="wiki_head"/> + +<%block name="bodyextra"> <%include file="navigation.html" args="active_page='wiki'" />
- <%block name="wiki_panel"> - + <%block name="wiki_panel">
- <% - if (wiki_article is not UNDEFINED): - baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) - else: - baseURL = reverse("wiki_view", args=["/"]) - %> - + <% + if (wiki_article is not UNDEFINED): + baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) + else: + baseURL = reverse("wiki_view", args=["/"]) + %>
From 3ef3c055af3357688988ba09259683c115f73070 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 19 Feb 2012 10:39:18 -0500 Subject: [PATCH 22/46] Profile page fixed --- profile_graphs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profile_graphs.js b/profile_graphs.js index 073f3cda2e..502c3c1469 100644 --- a/profile_graphs.js +++ b/profile_graphs.js @@ -127,7 +127,7 @@ $(function () { var plot = $.plot($grade_detail_graph, series, options); var o = plot.pointOffset({x: ${overviewBarX} , y: ${totalScore}}); - $grade_detail_graph.append('
${"{:.0%}".format(totalScore)}
'); + $grade_detail_graph.append('
${"{totalscore:.0%}".format(totalscore=totalScore)}
'); // //Rotate the x-axis labels // var rotateValue = "rotate(-60deg)"; From 0807cf81607fba6f461578bda243cb96de1076d1 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 19 Feb 2012 14:03:12 -0500 Subject: [PATCH 23/46] Updated FAQ --- 6002x-faq.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/6002x-faq.html b/6002x-faq.html index ccbe473b4e..475e0312c8 100644 --- a/6002x-faq.html +++ b/6002x-faq.html @@ -55,10 +55,19 @@ assignments and exams.

I just enrolled for the course. I have not received any form of acknowledgement that I have enrolled.

-

You should receive a single activation e-mail. If you did not, -check your spam folder, or try to register again with your correct -e-mail address and a new username (most errors are from typos in -e-mail addresses).

+

You should receive a single activation e-mail. If you did not, the +most common issues are: +

    +
  • Typo in e-mail address +
  • Old browser. We recommend trying a modern version of Firefox or Chrome +
  • JavaScript disabled +
  • Activation e-mail in spam folder. Check spam folder. +
  • Non-unique username. Try adding a random string at the end. +
+ +

If you run into issues, try recreating your account. There is no need +to do anything about the old account, if any. If it is not activated +through the link in the e-mail, it will disappear later.

How do I drop the course?

From 73322a5e6ad4f5d3785432fd7c2467d6c3eff53a Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 19 Feb 2012 17:03:29 -0500 Subject: [PATCH 24/46] Capa problems handle case sensitivity and give better errors --HG-- branch : pmitros-capa-fixes --- problem.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/problem.js b/problem.js index e5bc56e3ab..547a1f0e81 100644 --- a/problem.js +++ b/problem.js @@ -13,11 +13,15 @@ function ${ id }_load() { postJSON('/modx/problem/${ id }/problem_check', submit_data, function(json) { - - if(json['success'] == 'syntax') - alert('Syntax error'); - else - ${ id }_load(); + switch(json.success) { + case 'incorrect': // Worked, but answer not + case 'correct': + ${ id }_load(); + //alert("!!"+json.success); + break; + default: + alert(json.success); + } }); log_event('problem_check', submit_data); }); From 2501b583057fea952f73edf9a53a8a3a1015855e Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 20 Feb 2012 07:13:16 -0500 Subject: [PATCH 25/46] Removed unnecessary symlinks. WARNING: Must update and push data before deploying --HG-- branch : pmitros-mod-template --- Lab2A.html | 1 - custom_tags | 1 - schematic_tutorial.html | 1 - 3 files changed, 3 deletions(-) delete mode 120000 Lab2A.html delete mode 120000 custom_tags delete mode 120000 schematic_tutorial.html diff --git a/Lab2A.html b/Lab2A.html deleted file mode 120000 index 3eeed8320d..0000000000 --- a/Lab2A.html +++ /dev/null @@ -1 +0,0 @@ -../data/problems/Lab2A.html \ No newline at end of file diff --git a/custom_tags b/custom_tags deleted file mode 120000 index ec1dac8fbe..0000000000 --- a/custom_tags +++ /dev/null @@ -1 +0,0 @@ -../data/custom_tags \ No newline at end of file diff --git a/schematic_tutorial.html b/schematic_tutorial.html deleted file mode 120000 index da681ac006..0000000000 --- a/schematic_tutorial.html +++ /dev/null @@ -1 +0,0 @@ -../data/problems/schematic_tutorial.html \ No newline at end of file From c423e17cc3126225d6d82e8e97a08fbd0031aeb6 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 20 Feb 2012 09:53:40 -0500 Subject: [PATCH 26/46] Added style to remove enrollment form for IE7 and below and added a paragraph explainaing why --- create_account.html | 3 +++ sass/layout/_leanmodal.scss | 4 ++++ sass/marketing-ie.scss | 11 +++++++++++ 3 files changed, 18 insertions(+) diff --git a/create_account.html b/create_account.html index e50c26d748..3a57707693 100644 --- a/create_account.html +++ b/create_account.html @@ -2,6 +2,9 @@

Enroll in 6.002x Circuits & Electronics

+ +

Enrollment requires a modern web browser with JavaScript enabled. You don't have this. You can’t enroll without upgrading, since you couldn’t take the course without upgrading. Feel free to download the latest version of Mozilla Firefox or Google Chrome, for free, to enroll and take this course.

+
<% if 'error' in locals(): e = error %> diff --git a/sass/layout/_leanmodal.scss b/sass/layout/_leanmodal.scss index fb3e2d5a8f..e0beeeb6f4 100644 --- a/sass/layout/_leanmodal.scss +++ b/sass/layout/_leanmodal.scss @@ -47,6 +47,10 @@ div.leanModal_box { &#enroll { max-width: 600px; + p.ie-warning { + display: none; + } + ol { @extend .clearfix; diff --git a/sass/marketing-ie.scss b/sass/marketing-ie.scss index 0d1562a88a..43c1e06f12 100644 --- a/sass/marketing-ie.scss +++ b/sass/marketing-ie.scss @@ -7,3 +7,14 @@ body { margin: 0; overflow: hidden; } + +div#enroll { + p.ie-warning { + display: block !important; + line-height: 1.3em; + } + + form { + display: none; + } +} From d83a4d22f370fce08eec314ce368516659693a75 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 20 Feb 2012 10:51:39 -0500 Subject: [PATCH 27/46] Added messaging for users with javascript diabled --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index f71f9430d5..d6fe0d288d 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@

Circuits & Electronics

6.002x

- Enroll in 6.002x Circuits & Electronics + Enroll in 6.002x Circuits & Electronics

6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT’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.

@@ -52,7 +52,7 @@
- Enroll in 6.002x Circuits & Electronics + Enroll in 6.002x Circuits & Electronics
From bf632da06f98a22c35549ccc2bba442fa0c1b804 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 20 Feb 2012 11:18:58 -0500 Subject: [PATCH 28/46] Add textbook nav on the bottom of the page too --- sass/_textbook.scss | 7 +++++++ staticbook.html | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/sass/_textbook.scss b/sass/_textbook.scss index 2e8fe98cd7..ea49f20d96 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -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 { diff --git a/staticbook.html b/staticbook.html index 6e080f5165..fe3116025c 100644 --- a/staticbook.html +++ b/staticbook.html @@ -57,6 +57,17 @@ function next_page() { + +
From b8dcbaf36c13db9f0f86ec1a048f2bbde963d87e Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Mon, 20 Feb 2012 11:37:39 -0500 Subject: [PATCH 29/46] Fixed visual bugs on the main question list + restyled author info in answer view --- sass/discussion/_answers.scss | 9 ++-- sass/discussion/_askbot-original.scss | 74 +++++++++++++-------------- sass/discussion/_discussion.scss | 19 ++++--- sass/discussion/_forms.scss | 13 ++++- sass/discussion/_question-view.scss | 23 +-------- sass/discussion/_questions.scss | 12 ++++- 6 files changed, 76 insertions(+), 74 deletions(-) diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index 88965db304..9907e74777 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -17,7 +17,7 @@ div.answer-controls { nav { @extend .action-link; float: right; - margin-top: 25px; + margin-top: 34px; a { &.on span{ @@ -27,7 +27,7 @@ div.answer-controls { &:before { content: '|'; color: darken(#F6EFD4, 10%); - font-size: 22px; + font-size: 16px; } } } @@ -111,14 +111,13 @@ div.answer-own { } div.answer-actions { - border-left: 3px solid darken(#F6EFD4, 10%); margin: 0; padding:8px 8px 8px 0; text-align: right; - background:lighten(#F6EFD4, 5%); + border-top: 1px solid #efefef; span.sep { - color: #ddd; + color: #EDDFAA; } a { diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index 0e6b761181..ead9508c0e 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -1037,44 +1037,44 @@ body.anon #searchbar { // border: #cce6ec 3px solid; // width: 725px; } } -.ask-page div#question-list, .edit-question-page div#question-list { - float: none; - border-bottom: #f0f0ec 1px solid; - float: left; - margin-bottom: 10px; } +// .ask-page div#question-list, .edit-question-page div#question-list { +// float: none; +// border-bottom: #f0f0ec 1px solid; +// float: left; +// margin-bottom: 10px; } -.ask-page div#question-list a, .edit-question-page div#question-list a { - line-height: 30px; } +// .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 { - font-size: 13px; - 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 h2, .edit-question-page div#question-list h2 { +// font-size: 13px; +// 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 { - width: 28px; - 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 div#question-list span, .edit-question-page div#question-list span { +// width: 28px; +// 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 label, .edit-question-page label { +// color: #525252; +// font-size: 13px; } // .ask-page #id_tags, .edit-question-page #id_tags { // border: #cce6ec 3px solid; @@ -1083,9 +1083,9 @@ body.anon #searchbar { // width: 395px; // font-size: 14px; } -.title-desc { - color: #707070; - font-size: 13px; } +// .title-desc { +// color: #707070; +// font-size: 13px; } // #fmanswer input.submit, .ask-page input.submit, .edit-question-page input.submit { // float: left; diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index effb9a22ec..bba34d7ff3 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -43,14 +43,17 @@ body.askbot { vertical-align: top; width: flex-grid(9) + flex-gutter(); - p.tabula-rasa { + .tabula-rasa { + @extend .light-button; @include border-radius(5px); - background-color: #f6f6f6; - color: #888; + display: block; margin: 10px auto; padding: 20px; text-align: center; width: flex-grid(5); + text-decoration: none; + color: #888; + font-weight: bold; &:first-child { margin-top: 70px; @@ -59,11 +62,11 @@ body.askbot { margin-bottom: 70px; } - a { - text-decoration: none; - color: #888; - font-weight: bold; - } + // span, a { + // text-decoration: none; + // color: #888; + // font-weight: bold; + // } } } } diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss index e8fcd22193..d31144e8f5 100644 --- a/sass/discussion/_forms.scss +++ b/sass/discussion/_forms.scss @@ -19,11 +19,21 @@ form.answer-form { display: block; 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 { color: #990000; - display: inline; + display: inline-block; font-size: 90%; font-weight: bold; padding: 10px 0; @@ -78,6 +88,7 @@ form.question-form { } input[type="text"] { + @include box-sizing(border-box); width: flex-grid(6); } diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index bdc2b3f980..eb3eabad2c 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -100,12 +100,10 @@ div.question-header { display: inline-block; float: left; width: flex-grid(1.8,8); + border-left: 1px dotted #CCC; div.post-update-info { @include box-sizing(border-box); - // @include border-radius(5px); - // background:lighten(#F6EFD4, 5%); - border-left: 3px solid darken(#F6EFD4, 10%); padding: 10px; margin-bottom: 10px; @@ -131,20 +129,6 @@ div.question-header { 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 { display: inline-block; @@ -163,10 +147,8 @@ div.question-header { div.comments-container { @include box-sizing(border-box); - // background: lighten(#efefef, 3%); padding: 3%; display: inline-block; - // margin: 15px 0 0; padding: 3%; width: 100%; @@ -182,9 +164,6 @@ div.question-header { &:first-child { border-top: 0; } - // &:last-child { - // border-bottom: 1px solid #ddd; - // } } form.post-comments { diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 526d03a98d..093a8e95ea 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -30,6 +30,7 @@ div.question-list-header { div.question-sort { float: right; margin-left: flex-gutter(); + margin-top: 10px; nav { @extend .action-link; @@ -43,7 +44,7 @@ div.question-list-header { &:before { content: '|'; color: darken(#F6EFD4, 10%); - font-size: 22px; + font-size: 16px; } } } @@ -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 { From 01ab182a8e12ee6120682a5592cdfe1a88f5c974 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Mon, 20 Feb 2012 14:28:30 -0500 Subject: [PATCH 30/46] Fixed bugs in the answer and question editing forms --- sass/discussion/_answers.scss | 6 ++++++ sass/discussion/_askbot-original.scss | 4 ++-- sass/discussion/_forms.scss | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sass/discussion/_answers.scss b/sass/discussion/_answers.scss index 9907e74777..55bda8bcec 100644 --- a/sass/discussion/_answers.scss +++ b/sass/discussion/_answers.scss @@ -73,6 +73,12 @@ div.answer-block { color: #555; } } + + div.deleted { + p { + color: $mit-red; + } + } } div.paginator { diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index ead9508c0e..9e05f364fc 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -2202,8 +2202,8 @@ span { p.form-item { margin: 0px; } -.deleted { - background: #f4e7e7 none repeat scroll 0 0; } +// .deleted { +// background: #f4e7e7 none repeat scroll 0 0; } .form-row { line-height: 25px; } diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss index d31144e8f5..c7cfe85648 100644 --- a/sass/discussion/_forms.scss +++ b/sass/discussion/_forms.scss @@ -13,7 +13,7 @@ form.answer-form { } div.form-item { - margin: 25px 0; + margin: 15px 0; label { display: block; From 576643da7eb976005c4203eebd2ac369abaa1fdb Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 20 Feb 2012 15:24:35 -0500 Subject: [PATCH 31/46] Added base styles for the askbot profile page --- sass/application.scss | 2 +- sass/discussion/_askbot-original.scss | 54 +++++++++++++-------------- sass/discussion/_profile.scss | 46 +++++++++++++++++++++++ 3 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 sass/discussion/_profile.scss diff --git a/sass/application.scss b/sass/application.scss index 81e2af18c9..65eaf599db 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -13,4 +13,4 @@ @import "profile"; @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki"; @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"; +@import "discussion/askbot-original", "discussion/discussion","discussion/sidebar", "discussion/questions", "discussion/tags", "discussion/question-view" , "discussion/answers", "discussion/forms", "discussion/form-wmd-toolbar", "discussion/profile"; diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index 0e6b761181..6ceaef3c95 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -1877,19 +1877,19 @@ a { margin-bottom: 15px; float: left; } -.user-profile-page { - font-size: 13px; - color: #525252; - p { - font-size: 13px; - line-height: 1.3; - color: #525252; } - .avatar img { - border: #eee 1px solid; - padding: 5px; } - h2 { - padding: 10px 0px 10px 0px; - font-family: 'yanone kaffeesatz',sans-serif; } } +// .user-profile-page { +// font-size: 13px; +// color: #525252; +// p { +// font-size: 13px; +// line-height: 1.3; +// color: #525252; } +// .avatar img { +// border: #eee 1px solid; +// padding: 5px; } +// h2 { +// padding: 10px 0px 10px 0px; +// font-family: 'yanone kaffeesatz',sans-serif; } } .user-details { font-size: 13px; @@ -1970,10 +1970,10 @@ a { font-weight: 700; color: #777; } -.answer-summary { - display: block; - clear: both; - padding: 3px; } +// .answer-summary { +// display: block; +// clear: both; +// padding: 3px; } .answer-votes { background-color: #eeeeee; @@ -2621,16 +2621,16 @@ p.signup_p { li { display: inline; } } -.user-profile-page { - .avatar p { - margin-bottom: 0px; } - .tabbar a#stats { - margin-left: 0; } - img.gravatar { - margin: 2px 0 3px 0; } - h3 { - padding: 0; - margin-top: -3px; } } +// .user-profile-page { +// .avatar p { +// margin-bottom: 0px; } +// .tabbar a#stats { +// margin-left: 0; } +// img.gravatar { +// margin: 2px 0 3px 0; } +// h3 { +// padding: 0; +// margin-top: -3px; } } .userlist { font-size: 13px; } diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss new file mode 100644 index 0000000000..f1dbe1be91 --- /dev/null +++ b/sass/discussion/_profile.scss @@ -0,0 +1,46 @@ +body.user-profile-page { + section.user-info { + // @extend .sidebar; + h1 { + @extend h2; + margin-top: 0; + } + } + + section.questions { + h1 { + @extend .top-header; + } + } + + ul.sub-info { + border-top: 1px solid #ddd; + margin-top: lh(); + list-style: none; + + > li { + width: flex-grid(2.25, 9); + display: table-cell; + padding: (flex-gutter(9)/2); + border-right: 1px solid #ddd; + @include box-sizing(border-box); + + &:first-child { + padding-left: 0; + } + + &:last-child { + border-right: 0; + padding-right: 0; + } + + h2 { + margin-top: 0; + } + } + + ul.user-stats-table { + list-style: none; + } + } +} From 6c9540fe4e535a7419a25ceb5e5989a879fda7d7 Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Mon, 20 Feb 2012 17:09:36 -0500 Subject: [PATCH 32/46] Minor styles changes and visual fixes to various parts of the app --- sass/application.scss | 2 +- sass/discussion/_askbot-original.scss | 76 +++++++++++++-------------- sass/discussion/_modals.scss | 28 ++++++++++ sass/discussion/_question-view.scss | 14 +++++ sass/discussion/_questions.scss | 16 +++--- sass/discussion/_tags.scss | 26 +++++---- sass/layout/_leanmodal.scss | 50 +++++++++--------- 7 files changed, 131 insertions(+), 81 deletions(-) create mode 100644 sass/discussion/_modals.scss diff --git a/sass/application.scss b/sass/application.scss index 81e2af18c9..f32cc91cd5 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -13,4 +13,4 @@ @import "profile"; @import "wiki/basic-html", "wiki/sidebar", "wiki/create", "wiki/wiki"; @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"; +@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"; diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index 9e05f364fc..c7feb7ad76 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -2111,44 +2111,44 @@ ins { background-color: #e6f0a2; } background-color: #e6f0a2; } -.vote-notification { - z-index: 1; - cursor: pointer; - display: none; - position: absolute; - font-family: arial; - font-size: 14px; - font-weight: normal; - color: white; - background-color: #8e0000; - text-align: center; - padding-bottom: 10px; - -webkit-box-shadow: 0px 2px 4px #370000; - -moz-box-shadow: 0px 2px 4px #370000; - box-shadow: 0px 2px 4px #370000; - border-radius: 4px; - -ms-border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - -khtml-border-radius: 4px; - h3 { - background: url(../images/notification.png) repeat-x top; - padding: 10px 10px 10px 10px; - font-size: 13px; - margin-bottom: 5px; - border-top: #8e0000 1px solid; - color: #fff; - font-weight: normal; - border-top-right-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; - -webkit-border-top-right-radius: 4px; } - a { - color: #fb7321; - text-decoration: underline; - font-weight: bold; } } +// .vote-notification { +// z-index: 1; +// cursor: pointer; +// display: none; +// position: absolute; +// font-family: arial; +// font-size: 14px; +// font-weight: normal; +// color: white; +// background-color: #8e0000; +// text-align: center; +// padding-bottom: 10px; +// -webkit-box-shadow: 0px 2px 4px #370000; +// -moz-box-shadow: 0px 2px 4px #370000; +// box-shadow: 0px 2px 4px #370000; +// border-radius: 4px; +// -ms-border-radius: 4px; +// -moz-border-radius: 4px; +// -webkit-border-radius: 4px; +// -khtml-border-radius: 4px; +// h3 { +// background: url(../images/notification.png) repeat-x top; +// padding: 10px 10px 10px 10px; +// font-size: 13px; +// margin-bottom: 5px; +// border-top: #8e0000 1px solid; +// color: #fff; +// font-weight: normal; +// border-top-right-radius: 4px; +// border-top-left-radius: 4px; +// -moz-border-radius-topright: 4px; +// -moz-border-radius-topleft: 4px; +// -webkit-border-top-left-radius: 4px; +// -webkit-border-top-right-radius: 4px; } +// a { +// color: #fb7321; +// text-decoration: underline; +// font-weight: bold; } } // #ground { // width: 100%; diff --git a/sass/discussion/_modals.scss b/sass/discussion/_modals.scss new file mode 100644 index 0000000000..de1a27ecc9 --- /dev/null +++ b/sass/discussion/_modals.scss @@ -0,0 +1,28 @@ +.vote-notification { + background-color: darken($mit-red, 7%); + @include border-radius(4px); + @include box-shadow(0px 2px 9px #aaa); + color: white; + cursor: pointer; + display: none; + font-size: 14px; + font-weight: normal; + padding-bottom: 10px; + position: absolute; + text-align: center; + + h3 { + background: $mit-red; + padding: 10px 10px 10px 10px; + font-size: 13px; + margin-bottom: 5px; + border-bottom: darken(#8e0000, 10%) 1px solid; + @include box-shadow(0 1px 0 lighten($mit-red, 10%)); + color: #fff; + font-weight: normal; + @include border-radius(4px 4px 0 0); + } + a { + color: #fb7321; + text-decoration: underline; + font-weight: bold; } } diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index eb3eabad2c..e51df7733a 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -295,4 +295,18 @@ div.question-header { } } +div.question-status { + background: $mit-red; + clear:both; + color: #fff; + display: block; + padding: 10px 0 10px 7.5%; + h3 { + font-weight: normal; + } + + a { + color: #eee; + } +} diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss index 093a8e95ea..7fc57d7015 100644 --- a/sass/discussion/_questions.scss +++ b/sass/discussion/_questions.scss @@ -86,7 +86,7 @@ ul.question-list, div#question-list { padding: 10px 0; &:hover { - background: lighten(#F6EFD4, 8%); + background: #fbfbfb; } div { @@ -131,27 +131,31 @@ ul.question-list, div#question-list { text-align: right; li { - @include border-radius(3px); + @include linear-gradient(#fff, #f5f5f5); + border: 1px solid #eee; display: inline-block; height:60px; margin-right: 10px; width: 60px; + &:hover { + span, div { + color: #555; + } + } + &.views { - background: lighten(#F6EFD4, 5%); } &.answers { - background: #F6EFD4; } &.votes { - background: darken(#F6EFD4, 5%); } span, div { @include box-sizing(border-box); - color: darken(#F6EFD4, 60%); + color: #888; display: block; text-align: center; } diff --git a/sass/discussion/_tags.scss b/sass/discussion/_tags.scss index a1b11625c0..4bc440a29a 100644 --- a/sass/discussion/_tags.scss +++ b/sass/discussion/_tags.scss @@ -1,18 +1,21 @@ ul.tags { list-style: none; display: inline; + li, a { position: relative; } + li { - @include border-radius(4px); background: #eee; + @include border-radius(4px); + @include box-shadow(1px 1px 0px #bbb); color: #555; display: inline-block; font-size: 12px; + margin-bottom: 5px; margin-left: 15px; padding: 3px 10px 5px 5px; - margin-bottom: 5px; &:before { border-color:transparent #eee transparent transparent; @@ -20,15 +23,15 @@ ul.tags { border-width:12px 12px 12px 0; content:""; height:0; - left:-11px; + left:-10px; position:absolute; top:0; width:0; } span.delete-icon, div.delete-icon { - @include border-radius(0 4px 4px 0); background: #555; + @include border-radius(0 4px 4px 0); clear: none; color: #eee; cursor: pointer; @@ -53,11 +56,12 @@ ul.tags { } span.tag-number { - @include border-radius(3px); - background: #555; - font-size: 10px; - margin: 0 3px; - padding: 2px 5px; - color: #eee; - opacity: 0.5; + display: none; + // @include border-radius(3px); + // background: #555; + // font-size: 10px; + // margin: 0 3px; + // padding: 2px 5px; + // color: #eee; + // opacity: 0.5; } diff --git a/sass/layout/_leanmodal.scss b/sass/layout/_leanmodal.scss index e0beeeb6f4..fc235a6705 100644 --- a/sass/layout/_leanmodal.scss +++ b/sass/layout/_leanmodal.scss @@ -10,24 +10,24 @@ } div.leanModal_box { + background: #fff; + border: none; @include border-radius(3px); @include box-shadow(0 0 6px #000); @include box-sizing(border-box); display: none; - border: none; - background: #fff; padding: lh(2); a.modal_close { - position: absolute; - top: 12px; - right: 12px; - display: block; - width: 14px; - height: 14px; - z-index: 2; color: #aaa; + display: block; font-style: normal; + height: 14px; + position: absolute; + right: 12px; + top: 12px; + width: 14px; + z-index: 2; &:hover{ text-decoration: none; @@ -36,11 +36,11 @@ div.leanModal_box { } h1 { + border-bottom: 1px solid #eee; font-size: 24px; + margin-bottom: lh(); margin-top: 0; padding-bottom: lh(); - border-bottom: 1px solid #eee; - margin-bottom: lh(); text-align: left; } @@ -67,16 +67,16 @@ div.leanModal_box { &:hover { div.tip { - display: block; - line-height: lh(); - position: absolute; background: #333; color: #fff; - width: 500px; + display: block; + font-size: 16px; + line-height: lh(); margin: 0 0 0 -10px; padding: 10px; + position: absolute; -webkit-font-smoothing: antialiased; - font-size: 16px; + width: 500px; } } } @@ -88,16 +88,16 @@ div.leanModal_box { div#enroll_error, div#login_error, div#pwd_error { $error-color: #333; - -webkit-font-smoothing: antialiased; background-color: $error-color; border: darken($error-color, 20%); color: #fff; - text-shadow: 0 1px 0 darken($error-color, 10%); font-family: "Open sans"; font-weight: bold; letter-spacing: 1px; margin: (-(lh())) (-(lh())) lh(); padding: lh(.5); + text-shadow: 0 1px 0 darken($error-color, 10%); + -webkit-font-smoothing: antialiased; &:empty { padding: 0; @@ -112,11 +112,11 @@ div.leanModal_box { margin-bottom: lh(.5); &.terms, &.remember { - float: none; - width: auto; - clear: both; - padding-top: lh(); border-top: 1px solid #eee; + clear: both; + float: none; + padding-top: lh(); + width: auto; } &.honor-code { @@ -143,11 +143,11 @@ div.leanModal_box { margin: lh(.5) 0 lh() lh(); li { + color: #666; + float: none; + font-size: 14px; list-style: disc outside none; margin-bottom: lh(.5); - color: #666; - font-size: 14px; - float: none; } } } From 0e2216932ad43d8a1d8f79647b0139e575f9429c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 20 Feb 2012 17:24:20 -0500 Subject: [PATCH 33/46] Added more style for askbot profile page --- main.html | 2 +- sass/discussion/_askbot-original.scss | 48 ++++++++-------- sass/discussion/_profile.scss | 82 +++++++++++++++++++++++++-- 3 files changed, 103 insertions(+), 29 deletions(-) diff --git a/main.html b/main.html index 567f41b1db..4652fa7046 100644 --- a/main.html +++ b/main.html @@ -1,7 +1,7 @@ - <%block name="title">MITx 6.002 + <%block name="title">MITx 6.002x diff --git a/sass/discussion/_askbot-original.scss b/sass/discussion/_askbot-original.scss index 1bed0076f4..75ced3d66e 100644 --- a/sass/discussion/_askbot-original.scss +++ b/sass/discussion/_askbot-original.scss @@ -107,9 +107,9 @@ // height: 0; // visibility: hidden; } -.badges a { - color: #763333; - text-decoration: underline; } +// .badges a { +// color: #763333; +// text-decoration: underline; } // a:hover { // text-decoration: underline; } @@ -1846,27 +1846,27 @@ body.anon #searchbar { // width: 270px; // margin-bottom: 15px; } -a { - &.medal { - font-size: 17px; - line-height: 250%; - margin-right: 5px; - color: #333; - text-decoration: none; - background: url(../images/medala.gif) no-repeat; - border-left: 1px solid #eee; - border-top: 1px solid #eee; - border-bottom: 1px solid #ccc; - border-right: 1px solid #ccc; - padding: 4px 12px 4px 6px; } - &:hover.medal { - color: #333; - text-decoration: none; - background: url(../images/medala_on.gif) no-repeat; - border-left: 1px solid #e7e296; - border-top: 1px solid #e7e296; - border-bottom: 1px solid #d1ca3d; - border-right: 1px solid #d1ca3d; } } +// a { +// &.medal { +// font-size: 17px; +// line-height: 250%; +// margin-right: 5px; +// color: #333; +// text-decoration: none; +// background: url(../images/medala.gif) no-repeat; +// border-left: 1px solid #eee; +// border-top: 1px solid #eee; +// border-bottom: 1px solid #ccc; +// border-right: 1px solid #ccc; +// padding: 4px 12px 4px 6px; } +// &:hover.medal { +// color: #333; +// text-decoration: none; +// background: url(../images/medala_on.gif) no-repeat; +// border-left: 1px solid #e7e296; +// border-top: 1px solid #e7e296; +// border-bottom: 1px solid #d1ca3d; +// border-right: 1px solid #d1ca3d; } } #award-list .user { float: left; diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index f1dbe1be91..394107a57a 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -1,9 +1,35 @@ body.user-profile-page { section.user-info { // @extend .sidebar; - h1 { - @extend h2; - margin-top: 0; + header { + @extend .clearfix; + section { + float: left; + width: flex-grid(2, 3); + margin-right: flex-gutter(3); + + h1 { + @extend h2; + margin-top: 0; + } + } + + p.karma { + float: left; + width: flex-grid(1, 3); + border: 1px solid #D3D3D3; + @include border-radius(3px); + @include box-shadow(inset 0 0 0 1px #fff, 0 1px 0 #fff); + background: #eee; + text-align: center; + padding: lh(.5) 0; + + + strong { + display: block; + font-style: 20px; + } + } } } @@ -37,10 +63,58 @@ body.user-profile-page { h2 { margin-top: 0; } + + span.tag-number { + display: none; + } } - ul.user-stats-table { + ul { list-style: none; + + &.user-stats-table { + list-style: none; + } + + &.vote-buttons { + list-style: none; + + li { + @include border-radius(4px); + background-color: lighten(#F6EFD4, 3%); + background-position: 10px center; + background-repeat: no-repeat; + height: 20px; + padding: 10px 10px 10px 40px; + display: inline-block; + + &.up { + background-image: url(/static/images/askbot/vote-arrow-up.png); + margin-right: 6px; + } + + &.down { + background-image: url(/static/images/askbot/vote-arrow-down.png); + } + } + } + + &.badges { + @include border-radius(4px); + background-color: #e3e3e3; + @include inline-block(); + + a { + border: 0; + background: none; + text-transform: uppercase; + color: #292309; + font-size: 12px; + padding: 10px; + text-shadow: 0 1px 0 #fff; + display: block; + } + } } } } From cdaed49a2bca23c8902cf137433f29ef5097cd96 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 20 Feb 2012 20:59:02 -0500 Subject: [PATCH 34/46] Subtitle support working --HG-- branch : pmitros-subtitles --- seq_module.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/seq_module.js b/seq_module.js index 57b73543c6..9c52dacad2 100644 --- a/seq_module.js +++ b/seq_module.js @@ -2,27 +2,29 @@ var ${ id }contents=["", %for t in items: - ${t[1]['content']} , + ${t['content']} , %endfor "" ]; var ${ id }types=["", %for t in items: - "${t[1]['type']}" , + "${t['type']}" , %endfor "" ]; var ${ id }init_functions=["", %for t in items: - function(){ ${t[1]['init_js']} }, + function(){ ${t['init_js']} }, %endfor ""]; +var ${ id }titles=${titles}; + var ${ id }destroy_functions=["", %for t in items: - function(){ ${t[1]['destroy_js']} }, + function(){ ${t['destroy_js']} }, %endfor ""]; @@ -52,6 +54,7 @@ function ${ id }goto(i) { function ${ id }setup_click(i) { $('#tt_'+i).click(function(eo) { ${ id }goto(i);}); $('#tt_'+i).addClass("seq_"+${ id }types[i]+"_inactive"); + $('#tt_'+i).attr("title", ${ id }titles[i-1]); } From 2be705ca014853cceb9f17936069c78ced8a2432 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 20 Feb 2012 21:59:26 -0500 Subject: [PATCH 35/46] Fixed bug where wiki warned users even as they saved their changes. --HG-- branch : bridger-dev --- simplewiki_edit.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/simplewiki_edit.html b/simplewiki_edit.html index e0bffd5f31..54fe13fe24 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -19,6 +19,11 @@ ${ wiki_article.title } return "You have made changes to the article that have not been saved yet."; } }; + + $("#submit_edit").click(function() { + $("#id_contents").data('initial_contents', $("#id_contents").val()); + }); + }); From 76f98a17c86a0b6b327d327616e600bb83c40d2f Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Tue, 21 Feb 2012 10:59:42 -0500 Subject: [PATCH 36/46] Added autocomplete styles and removed commenting limit in Askbot --HG-- branch : bridger-dev --- sass/discussion/_discussion.scss | 48 ++++++++++++++++++++++++++--- sass/discussion/_question-view.scss | 2 +- sass/discussion/_tags.scss | 2 +- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/sass/discussion/_discussion.scss b/sass/discussion/_discussion.scss index bba34d7ff3..651699f2f5 100644 --- a/sass/discussion/_discussion.scss +++ b/sass/discussion/_discussion.scss @@ -62,14 +62,52 @@ body.askbot { margin-bottom: 70px; } - // span, a { - // text-decoration: none; - // color: #888; - // font-weight: bold; - // } } } } } } + +// Autocomplete + +.acInput { + width: 200px; +} +.acResults { + background-color: #fff; + border: 1px solid #ababab; + overflow: hidden; + padding: 0px; + @include box-shadow(0 2px 2px #bbb); + + ul { + list-style-position: outside; + list-style: none; + margin: 0; + padding: 0; + width: 100%; + } + + li { + cursor: pointer; + display: block; + font: menu; + margin: 0px; + overflow: hidden; + padding: 5px 10px; + text-align: left; + border-top: 1px solid #eee; + width: 100%; + } +} + +.acLoading { + background : url('../images/indicator.gif') right center no-repeat; +} + +.acSelect { + background-color: $mit-red; + color: #fff; +} + diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss index e51df7733a..bbda9527dd 100644 --- a/sass/discussion/_question-view.scss +++ b/sass/discussion/_question-view.scss @@ -275,7 +275,7 @@ div.question-header { } .counter { color: #888; - display: block; + display: none; float: right; margin-top: 5px; text-align: right; diff --git a/sass/discussion/_tags.scss b/sass/discussion/_tags.scss index 4bc440a29a..317cbe025c 100644 --- a/sass/discussion/_tags.scss +++ b/sass/discussion/_tags.scss @@ -39,7 +39,7 @@ ul.tags { float: none; left: 10px; opacity: 0.5; - padding: 3px 6px; + padding: 4px 6px; position: relative; top: 1px; From ccc3c710b36bc1a9631ecf3de008bcf375cb8000 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 21 Feb 2012 13:08:35 -0500 Subject: [PATCH 37/46] Added consistant sidebar headers and made textbook sidebar close --HG-- branch : kf-sidebar --- courseware.html | 22 ++------ main.html | 2 + sass/_textbook.scss | 88 ++++++++++++++++++++++---------- sass/base/_extends.scss | 41 +++++++++++++++ sass/courseware/_courseware.scss | 6 +-- sass/courseware/_sidebar.scss | 28 ---------- sass/discussion/_profile.scss | 12 +++-- sass/layout/_layout.scss | 8 +-- staticbook.html | 27 ++++++++-- 9 files changed, 145 insertions(+), 89 deletions(-) diff --git a/courseware.html b/courseware.html index b77806f3e1..cd6f08f387 100644 --- a/courseware.html +++ b/courseware.html @@ -1,37 +1,23 @@ <%inherit file="main.html" /> +<%block name="headextra"> + <%include file="navigation.html" args="active_page='courseware'" />
-
+

Courseware Index

close -
+
${accordion} diff --git a/main.html b/main.html index 4652fa7046..48424122af 100644 --- a/main.html +++ b/main.html @@ -117,5 +117,7 @@ $(function() { }); +<%block name="js_extra"/> + diff --git a/sass/_textbook.scss b/sass/_textbook.scss index ea49f20d96..7c7aef1562 100644 --- a/sass/_textbook.scss +++ b/sass/_textbook.scss @@ -1,43 +1,47 @@ div.book-wrapper { @extend .table-wrapper; - ul#booknav { + section.book-sidebar { @extend .sidebar; @include box-sizing(border-box); + @extend .tran; - a { - color: #000; + ul#booknav { - &:hover { - color: #666; - } - } - - li { - background: none; - padding-left: 30px; - - div.hitarea { - margin-left: -22px; - background-image: url('/static/images/treeview-default.gif'); - position: relative; - top: 4px; + a { + color: #000; &:hover { - opacity: 0.6; - filter: alpha(opacity=60); + color: #666; } } - ul { + li { background: none; - } - } + padding-left: 30px; - > li { - border-bottom: 1px solid #d3d3d3; - @include box-shadow(0 1px 0 #eee); - padding: 7px 7px 7px 30px; + div.hitarea { + margin-left: -22px; + background-image: url('/static/images/treeview-default.gif'); + position: relative; + top: 4px; + + &:hover { + opacity: 0.6; + filter: alpha(opacity=60); + } + } + + ul { + background: none; + } + } + + > li { + border-bottom: 1px solid #d3d3d3; + @include box-shadow(0 1px 0 #eee); + padding: 7px 7px 7px 30px; + } } } @@ -92,4 +96,36 @@ div.book-wrapper { } } } + + &.closed { + section.book-sidebar { + width: flex-grid(.6); + + header#open_close_accordion { + padding: 0; + + a { + background-image: url('/static/images/slide-right-icon.png'); + } + + h2 { + visibility: hidden; + width: 10px; + padding: 0; + } + } + + ul#booknav { + visibility: hidden; + width: 10px; + padding: 0; + overflow: hidden; + height: 100px; + } + } + + section.course-content { + width: flex-grid(11.5) + flex-gutter(); + } + } } diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index c482b947e6..48c92cbe9f 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -68,6 +68,13 @@ h1.top-header { width: flex-grid(3); position: relative; + h1, h2 { + font-size: 18px; + text-transform: none; + font-weight: 800; + letter-spacing: 0; + } + h3 { @include box-shadow(0 1px 0 #eee); background: none; @@ -110,11 +117,41 @@ h1.top-header { } } + header#open_close_accordion { + @include box-shadow(0 1px 0 #eee); + border-bottom: 1px solid #d3d3d3; + padding: lh(.5) lh(); + position: relative; + + h2 { + padding-right: 20px; + margin: 0; + } + + a { + width: 16px; + text-indent: -9999px; + height: 16px; + position: absolute; + padding: 8px; + top: 6px; + right: -1px; + border: 1px solid #D3D3D3; + background: #eee url('/static/images/slide-left-icon.png') center center no-repeat; + @include border-radius(3px 0 0 3px); + + &:hover { + background-color: white; + } + } + } + a.button { text-decoration: none; } } + .topbar { background: #F6EFD4; border-bottom: 1px solid darken(#F6EFD4, 10%); @@ -146,3 +183,7 @@ h1.top-header { } } } + +.tran { + @include transition( all, .2s, $ease-in-out-quad); +} diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss index 9d7ab8123a..13d58a3870 100644 --- a/sass/courseware/_courseware.scss +++ b/sass/courseware/_courseware.scss @@ -5,10 +5,6 @@ div.course-wrapper { list-style: none; } - .tran { - @include transition( all, .2s, $ease-in-out-quad); - } - section.course-content { @extend .content; @@ -160,7 +156,7 @@ div.course-wrapper { section.course-index { width: flex-grid(.6); - div#open_close_accordion { + header#open_close_accordion { padding: 0; a { diff --git a/sass/courseware/_sidebar.scss b/sass/courseware/_sidebar.scss index 3f937433f2..98659f12e0 100644 --- a/sass/courseware/_sidebar.scss +++ b/sass/courseware/_sidebar.scss @@ -2,34 +2,6 @@ section.course-index { @extend .sidebar; @extend .tran; - div#open_close_accordion { - @include box-shadow(0 1px 0 #eee); - border-bottom: 1px solid #d3d3d3; - padding: 0 lh(); - position: relative; - - h2 { - padding-right: 20px; - } - - a { - width: 16px; - text-indent: -9999px; - height: 16px; - position: absolute; - padding: 8px; - top: -12px; - right: -1px; - border: 1px solid #D3D3D3; - background: #eee url('/static/images/slide-left-icon.png') center center no-repeat; - @include border-radius(3px 0 0 3px); - - &:hover { - background-color: white; - } - } - } - div#accordion { h3 { diff --git a/sass/discussion/_profile.scss b/sass/discussion/_profile.scss index 394107a57a..3ff1194bdd 100644 --- a/sass/discussion/_profile.scss +++ b/sass/discussion/_profile.scss @@ -3,15 +3,19 @@ body.user-profile-page { // @extend .sidebar; header { @extend .clearfix; + border-bottom: 1px solid #d3d3d3; + @include box-shadow(0 1px 0 #eee); + padding: 0 lh(); + margin: 0 (-(lh())) lh(); + section { float: left; width: flex-grid(2, 3); margin-right: flex-gutter(3); - h1 { - @extend h2; - margin-top: 0; - } + h1 { + margin-top: 0; + } } p.karma { diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss index 584e1e1fa2..d0240b951f 100644 --- a/sass/layout/_layout.scss +++ b/sass/layout/_layout.scss @@ -11,13 +11,13 @@ html { section.main-content { @extend .clearfix; @extend .wrapper; - @include box-sizing(border-box); - overflow: hidden; background: #fff; + border: 1px solid #bbb; border-bottom: 1px solid #bbb; + @include box-shadow(0 0 4px #dfdfdf); + @include box-sizing(border-box); margin-top: 3px; - @include box-shadow(0 0 4px #dfdfdf); - border: 1px solid #bbb; + overflow: hidden; @media screen and (min-width: 1400px) { @include border-radius(4px); diff --git a/staticbook.html b/staticbook.html index fe3116025c..dcde36559c 100644 --- a/staticbook.html +++ b/staticbook.html @@ -1,4 +1,6 @@ <%inherit file="main.html" /> + +<%block name="js_extra"> + <%include file="navigation.html" args="active_page='book'" />
-
    - <%include file="book_toc.html" /> -
+ +
+
+

Table of Contents

+ close +
+ +
    + <%include file="book_toc.html" /> +
+
-