From 3350e77134dd9d869271b3bea1cc1340bac98e9a Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sat, 11 Feb 2012 00:01:43 -0500 Subject: [PATCH 1/6] Custom tags dir --HG-- branch : pmitros-mod-template From 6fa23e9084d05bd4a8b9edbf553232ed8f2eefe1 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 13 Feb 2012 08:04:17 -0500 Subject: [PATCH 2/6] Custom tags link added --HG-- branch : pmitros-mod-template --- custom_tags | 1 + 1 file changed, 1 insertion(+) create mode 120000 custom_tags diff --git a/custom_tags b/custom_tags new file mode 120000 index 0000000000..bd9c88c4ae --- /dev/null +++ b/custom_tags @@ -0,0 +1 @@ +../data/custom_tags/ \ No newline at end of file From 73322a5e6ad4f5d3785432fd7c2467d6c3eff53a Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Sun, 19 Feb 2012 17:03:29 -0500 Subject: [PATCH 3/6] 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 4/6] 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 b8dcbaf36c13db9f0f86ec1a048f2bbde963d87e Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Mon, 20 Feb 2012 11:37:39 -0500 Subject: [PATCH 5/6] 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 6/6] 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;