Merge branch 'MDL-69392-310' of git://github.com/junpataleta/moodle i…

…nto MOODLE_310_STABLE

blocks/myoverview/tests/behat/block_myoverview_dashboard.feature

@@ -312,3 +312,8 @@ Feature: The my overview block allows users to easily access their courses
     And I click on "Display drop-down menu" "button" in the "Course overview" "block"
     When I click on "Summary" "link" in the "Course overview" "block"
     Then I should not see "Category 1" in the "Course overview" "block"
+
+  @accessibility
+  Scenario: The dashboard page must have sufficient colour contrast
+    When I log in as "student1"
+    Then the page should meet "wcag143" accessibility standards

mod/forum/tests/behat/discussion_lock.feature

@@ -50,3 +50,33 @@ Feature: As a teacher, you can manually lock individual discussions when viewing
     And I navigate to post "Discussion 1" in "Test forum name" forum
     Then I should see "This discussion has been locked so you can no longer reply to it."
     And "Reply" "link" should not be visible
+
+  @accessibility
+  Scenario: A locked discussion must be accessible
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage
+    And I navigate to post "Discussion 1" in "Test forum name" forum
+    When I reply "Discussion 1" post from "Test forum name" forum with:
+      | Subject | Discussion 1: Hello world! |
+      | Message | Discussion contents 1, hello world! |
+    # Check discussion view accessibility with success notification shown on post.
+    Then the page should meet accessibility standards with "wcag143" extra tests
+    And I press "Settings"
+    When I follow "Lock this discussion"
+    # Check discussion view accessibility with info notification shown when discussion is locked.
+    And the page should meet accessibility standards with "wcag143" extra tests
+    And I log out
+    And I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Test forum name"
+    # Check discussion list accessibility with danger pill shown when discussion is locked.
+    And the page should meet accessibility standards with "wcag143" extra tests
+    And I follow "Preferences" in the user menu
+    And I click on "Forum preferences" "link"
+    And I set the following fields to these values:
+      | Use experimental nested discussion view | Yes |
+    And I press "Save changes"
+    And I am on "Course 1" course homepage
+    And I navigate to post "Discussion 1" in "Test forum name" forum
+    # Check experimental discussion view accessibility with danger pill shown when discussion is locked.
+    And the page should meet accessibility standards with "wcag143" extra tests

question/behaviour/interactive/renderer.php

@@ -57,7 +57,7 @@ public function feedback(question_attempt $qa, question_display_options $options
             'id' => $qa->get_behaviour_field_name('tryagain'),
             'name' => $qa->get_behaviour_field_name('tryagain'),
             'value' => get_string('tryagain', 'qbehaviour_interactive'),
-            'class' => 'submit btn',
+            'class' => 'submit btn btn-secondary',
         );
         if ($options->readonly === qbehaviour_interactive::TRY_AGAIN_VISIBLE_READONLY) {
             // This means the question really was rendered with read-only option.

theme/boost/scss/moodle/question.scss

@@ -245,7 +245,7 @@ body.path-question-type {
     width: 7em;
     padding: 0.5em;
     margin-bottom: 1.8em;
-    background-color: $gray-300;
+    background-color: $gray-100;
     border: 1px solid darken($gray-300, 7%);
 
     @include border-radius(2px);
@@ -292,11 +292,15 @@ body.path-question-type {
 }
 .que .outcome,
 .que .comment {
-    @include alert-variant(theme-color-level('warning', $alert-bg-level), theme-color-level('warning', $alert-border-level), theme-color-level('warning', $alert-color-level)); /* stylelint-disable-line max-line-length */
+    @include alert-variant(theme-color-level('warning', $alert-bg-level), theme-color-level('warning', $alert-border-level), theme-color-level('warning', $alert-color-level - 0.9)); /* stylelint-disable-line max-line-length */
+    // Darken link colour inside comments for better colour contrast against regular text.
+    a {
+        color: darken($link-color, 30%);
+    }
 }
 
 .que .formulation {
-    @include alert-variant(theme-color-level('info', $alert-bg-level), theme-color-level('info', $alert-border-level), theme-color-level('info', $alert-color-level)); /* stylelint-disable-line max-line-length */
+    @include alert-variant(theme-color-level('info', $alert-bg-level - 1.30), theme-color-level('info', $alert-border-level), theme-color-level('info', $alert-color-level + 4)); /* stylelint-disable-line max-line-length */
 }
 
 .que.multichoice .answer div.r0 .icon.fa-check,

theme/boost/scss/preset/default.scss

@@ -11,14 +11,14 @@ $gray-800: #343a40 !default;
 $gray-900: #212529 !default;
 $black:    #000 !default;
 
-$blue:    #1177d1 !default;
+$blue:    #0f6fc5 !default;
 $indigo:  #6610f2 !default;
 $purple:  #613d7c !default;
 $pink:    #e83e8c !default;
-$red:     #d43f3a !default;
+$red:     #ca3120 !default;
 $orange:  #f0ad4e !default;
 $yellow:  #ff7518 !default;
-$green:   #398439 !default;
+$green:   #357a32 !default;
 $teal:    #20c997 !default;
 $cyan:    #008196 !default;