diff --git a/mod/quiz/tests/behat/quiz_feedback.feature b/mod/quiz/tests/behat/quiz_feedback.feature index 15ef33c91c3..37b9470c553 100644 --- a/mod/quiz/tests/behat/quiz_feedback.feature +++ b/mod/quiz/tests/behat/quiz_feedback.feature @@ -19,10 +19,10 @@ Feature: Enable deferred or immediate feedback for quiz | contextlevel | reference | name | | Course | C1 | Test questions | And the following "questions" exist: - | questioncategory | qtype | name | questiontext | - | Test questions | truefalse | TF1 | First question | + | questioncategory | qtype | name | questiontext | generalfeedback | + | Test questions | truefalse | TF1 | Moodle is the best LMS | You should know that Moodle is the best LMS | - @javascript + @javascript @accessibility Scenario: Attempt quiz with How questions behave set to Deferred Feedback Given the following "activity" exists: | activity | quiz | @@ -45,16 +45,18 @@ Feature: Enable deferred or immediate feedback for quiz # Confirm that check button does not exist when attempting quiz Then "Check Question 1" "button" should not exist And I set the field "False" to "1" + And the "region-main" "region" should meet accessibility standards And I press "Finish attempt ..." And I should not see "This is the wrong answer." - And I should not see "You should have selected true." + And I should not see "You should know that Moodle is the best LMS" And I should not see "The correct answer is 'True'." And I press "Submit all and finish" # Confirm that quiz answer feedback only appears when attempt is submitted And I click on "Submit all and finish" "button" in the "Submit all your answers and finish?" "dialogue" And I should see "This is the wrong answer." - And I should see "You should have selected true." + And I should see "You should know that Moodle is the best LMS" And I should see "The correct answer is 'True'." + And the "region-main" "region" should meet accessibility standards Scenario: Attempt quiz with How questions behave set to Immediate Feedback Given the following "activity" exists: @@ -98,7 +100,7 @@ Feature: Enable deferred or immediate feedback for quiz | 1 | True | When I am on the "Quiz 1" "quiz activity" page logged in as student1 And I click on "Review" "link" - Then I should see "You should have selected true." + Then I should see "You should know that Moodle is the best LMS" And I see "This is the right answer." And I see "The correct answer is 'True'." And the following exist in the "quizreviewsummary" table: diff --git a/theme/boost/scss/moodle/question.scss b/theme/boost/scss/moodle/question.scss index de203bfd29d..69c25e91eeb 100644 --- a/theme/boost/scss/moodle/question.scss +++ b/theme/boost/scss/moodle/question.scss @@ -327,7 +327,9 @@ body.path-question-type { } .que .outcome, .que .comment { - @include alert-variant(shift-color($warning, $alert-bg-scale), shift-color($warning, $alert-border-scale), shift-color($warning, $alert-color-scale - 9%)); /* stylelint-disable-line max-line-length */ + color: shift-color($warning, $alert-color-scale - 10%); + border-color: shift-color($warning, $alert-border-scale); + @include gradient-bg(shift-color($warning, $alert-bg-scale - 5%)); // Darken link colour inside comments for better colour contrast against regular text. a { color: darken($link-color, 30%); @@ -335,7 +337,9 @@ body.path-question-type { } .que .formulation { - @include alert-variant(shift-color($info, $alert-bg-scale), shift-color($info, $alert-border-scale), shift-color($info, $alert-color-scale + 40%)); /* stylelint-disable-line max-line-length */ + color: shift-color($info, $alert-color-scale + 40%); + border-color: shift-color($info, $alert-border-scale); + @include gradient-bg(shift-color($info, $alert-bg-scale - 10%)); } .que.multichoice .answer div.r0 .icon.fa-check, @@ -687,4 +691,4 @@ body.path-question-type .mform fieldset.hidden { .qbank_managecategories-newchild.qbank_managecategories-droptarget { border-color: $link-color; color: $link-color; -} \ No newline at end of file +} diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 232e76112b5..9feb2388aca 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -32376,18 +32376,9 @@ body.path-question-type .fitem .col-form-label.sr-only:not(legend):not([for=id_c .que .outcome, .que .comment { - color: #8e662e; - background-color: #fcefdc; + color: #90682f; border-color: #fbe6ca; - /* stylelint-disable-line max-line-length */ -} -.que .outcome hr, -.que .comment hr { - border-top-color: #f9dbb2; -} -.que .outcome .alert-link, -.que .comment .alert-link { - color: #674a22; + background-color: #fdf3e4; } .que .outcome a, .que .comment a { @@ -32396,15 +32387,8 @@ body.path-question-type .fitem .col-form-label.sr-only:not(legend):not([for=id_c .que .formulation { color: #000d0f; - background-color: #cce6ea; border-color: #b3d9e0; - /* stylelint-disable-line max-line-length */ -} -.que .formulation hr { - border-top-color: #a1d0d9; -} -.que .formulation .alert-link { - color: black; + background-color: #e6f2f5; } .que.multichoice .answer div.r0 .icon.fa-check, diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 1c883cd968a..30a4b11dc7b 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -32376,18 +32376,9 @@ body.path-question-type .fitem .col-form-label.sr-only:not(legend):not([for=id_c .que .outcome, .que .comment { - color: #8e662e; - background-color: #fcefdc; + color: #90682f; border-color: #fbe6ca; - /* stylelint-disable-line max-line-length */ -} -.que .outcome hr, -.que .comment hr { - border-top-color: #f9dbb2; -} -.que .outcome .alert-link, -.que .comment .alert-link { - color: #674a22; + background-color: #fdf3e4; } .que .outcome a, .que .comment a { @@ -32396,15 +32387,8 @@ body.path-question-type .fitem .col-form-label.sr-only:not(legend):not([for=id_c .que .formulation { color: #000d0f; - background-color: #cce6ea; border-color: #b3d9e0; - /* stylelint-disable-line max-line-length */ -} -.que .formulation hr { - border-top-color: #a1d0d9; -} -.que .formulation .alert-link { - color: black; + background-color: #e6f2f5; } .que.multichoice .answer div.r0 .icon.fa-check,