Merge branch 'MDL-69114-39' of git://github.com/bmbrands/moodle into MOODLE_39_STABLE

diff --combined theme/boost/style/moodle.css
index 64777c9,2ca384e..793e648
--- 1/theme/boost/style/moodle.css
--- 2/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@@ -2342,14 -2342,14 +2342,14 @@@
    --yellow: #ff7518;
    --green: #398439;
    --teal: #20c997;
-   --cyan: #5bc0de;
+   --cyan: #008196;
    --white: #fff;
    --gray: #6c757d;
    --gray-dark: #343a40;
    --primary: #1177d1;
    --secondary: #ced4da;
    --success: #398439;
-   --info: #5bc0de;
+   --info: #008196;
    --warning: #f0ad4e;
    --danger: #d43f3a;
    --light: #f8f9fa;
@@@ -3605,19 -3605,19 +3605,19 @@@ pre 
  .table-info,
  .table-info > th,
  .table-info > td {
-   background-color: #d1edf6; }
+   background-color: #b8dce2; }
  
  .table-info th,
  .table-info td,
  .table-info thead th,
  .table-info tbody + tbody {
-   border-color: #aadeee; }
+   border-color: #7abdc8; }
  
  .table-hover .table-info:hover {
-   background-color: #bce5f2; }
+   background-color: #a6d3db; }
    .table-hover .table-info:hover > td,
    .table-hover .table-info:hover > th {
-     background-color: #bce5f2; }
+     background-color: #a6d3db; }
  
  .table-warning,
  .table-warning > th,
@@@ -4243,30 -4243,30 +4243,30 @@@ fieldset:disabled a.btn 
        box-shadow: 0 0 0 0.2rem rgba(87, 150, 87, 0.5); }
  
  .btn-info {
-   color: #212529;
-   background-color: #5bc0de;
-   border-color: #5bc0de; }
+   color: #fff;
+   background-color: #008196;
+   border-color: #008196; }
    .btn-info:hover {
      color: #fff;
-     background-color: #3bb4d8;
-     border-color: #31b0d5; }
+     background-color: #006070;
+     border-color: #005563; }
    .btn-info:focus, .btn-info.focus {
      color: #fff;
-     background-color: #3bb4d8;
-     border-color: #31b0d5;
-     box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+     background-color: #006070;
+     border-color: #005563;
+     box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
    .btn-info.disabled, .btn-info:disabled {
-     color: #212529;
-     background-color: #5bc0de;
-     border-color: #5bc0de; }
+     color: #fff;
+     background-color: #008196;
+     border-color: #008196; }
    .btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active,
    .show > .btn-info.dropdown-toggle {
      color: #fff;
-     background-color: #31b0d5;
-     border-color: #2aaacf; }
+     background-color: #005563;
+     border-color: #004a56; }
      .btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus,
      .show > .btn-info.dropdown-toggle:focus {
-       box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+       box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
  
  .btn-warning {
    color: #212529;
@@@ -4436,25 -4436,25 +4436,25 @@@
        box-shadow: 0 0 0 0.2rem rgba(57, 132, 57, 0.5); }
  
  .btn-outline-info {
-   color: #5bc0de;
-   border-color: #5bc0de; }
+   color: #008196;
+   border-color: #008196; }
    .btn-outline-info:hover {
-     color: #212529;
-     background-color: #5bc0de;
-     border-color: #5bc0de; }
+     color: #fff;
+     background-color: #008196;
+     border-color: #008196; }
    .btn-outline-info:focus, .btn-outline-info.focus {
-     box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+     box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
    .btn-outline-info.disabled, .btn-outline-info:disabled {
-     color: #5bc0de;
+     color: #008196;
      background-color: transparent; }
    .btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active,
    .show > .btn-outline-info.dropdown-toggle {
-     color: #212529;
-     background-color: #5bc0de;
-     border-color: #5bc0de; }
+     color: #fff;
+     background-color: #008196;
+     border-color: #008196; }
      .btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus,
      .show > .btn-outline-info.dropdown-toggle:focus {
-       box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+       box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
  
  .btn-outline-warning {
    color: #f0ad4e;
@@@ -5897,14 -5897,14 +5897,14 @@@ input[type="button"].btn-block 
      box-shadow: 0 0 0 0.2rem rgba(57, 132, 57, 0.5); }
  
  .badge-info {
-   color: #212529;
-   background-color: #5bc0de; }
+   color: #fff;
+   background-color: #008196; }
    a.badge-info:hover, a.badge-info:focus {
-     color: #212529;
-     background-color: #31b0d5; }
+     color: #fff;
+     background-color: #005563; }
    a.badge-info:focus, a.badge-info.focus {
      outline: 0;
-     box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+     box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
  
  .badge-warning {
    color: #212529;
@@@ -6007,13 -6007,13 +6007,13 @@@
      color: #0f210f; }
  
  .alert-info {
-   color: #2f6473;
-   background-color: #def2f8;
-   border-color: #d1edf6; }
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2; }
    .alert-info hr {
-     border-top-color: #bce5f2; }
+     border-top-color: #a6d3db; }
    .alert-info .alert-link {
-     color: #20454f; }
+     color: #00171b; }
  
  .alert-warning {
    color: #7d5a29;
@@@ -6234,15 -6234,15 +6234,15 @@@
      border-color: #1e451e; }
  
  .list-group-item-info {
-   color: #2f6473;
-   background-color: #d1edf6; }
+   color: #00434e;
+   background-color: #b8dce2; }
    .list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus {
-     color: #2f6473;
-     background-color: #bce5f2; }
+     color: #00434e;
+     background-color: #a6d3db; }
    .list-group-item-info.list-group-item-action.active {
      color: #fff;
-     background-color: #2f6473;
-     border-color: #2f6473; }
+     background-color: #00434e;
+     border-color: #00434e; }
  
  .list-group-item-warning {
    color: #7d5a29;
@@@ -6929,12 -6929,12 +6929,12 @@@ button.bg-success:focus 
    background-color: #2a602a !important; }
  
  .bg-info {
-   background-color: #5bc0de !important; }
+   background-color: #008196 !important; }
  
  a.bg-info:hover, a.bg-info:focus,
  button.bg-info:hover,
  button.bg-info:focus {
-   background-color: #31b0d5 !important; }
+   background-color: #005563 !important; }
  
  .bg-warning {
    background-color: #f0ad4e !important; }
@@@ -7014,7 -7014,7 +7014,7 @@@ button.bg-dark:focus 
    border-color: #398439 !important; }
  
  .border-info {
-   border-color: #5bc0de !important; }
+   border-color: #008196 !important; }
  
  .border-warning {
    border-color: #f0ad4e !important; }
@@@ -9259,10 -9259,10 +9259,10 @@@ a.text-success:hover, a.text-success:fo
    color: #224f22 !important; }
  
  .text-info {
-   color: #5bc0de !important; }
+   color: #008196 !important; }
  
  a.text-info:hover, a.text-info:focus {
-   color: #28a1c5 !important; }
+   color: #003f4a !important; }
  
  .text-warning {
    color: #f0ad4e !important; }
@@@ -9417,9 -9417,9 +9417,9 @@@ a.text-dark:hover, a.text-dark:focus 
      background-color: #2a602a; }
  
  .tag-info {
-   background-color: #5bc0de; }
+   background-color: #008196; }
    .tag-info[href]:hover, .tag-info[href]:focus {
-     background-color: #31b0d5; }
+     background-color: #005563; }
  
  .tag-warning {
    background-color: #f0ad4e; }
@@@ -9857,7 -9857,7 +9857,7 @@@ div.dropdown-item:focus-within 
    color: #398439; }
  
  .highlight {
-   color: #5bc0de; }
+   color: #008196; }
  
  .fitem.advanced .text-info {
    font-weight: bold; }
@@@ -11415,9 -11415,7 +11415,9 @@@ h3.sectionname .inplaceeditable.inplace
      display: block; }
  
  ul {
 -  padding-left: 1rem; }
 +  padding-left: 1rem;
 +  -webkit-margin-start: 0.2rem;
 +  /* stylelint-disable-line */ }
  
  /* YUI 2 Tree View */
  /*rtl:raw:
@@@ -11734,7 -11732,7 +11734,7 @@@ body.h5p-embed .h5pmessages 
    color: #0f210f; }
  
  .alert-info a {
-   color: #20454f; }
+   color: #00171b; }
  
  .alert-warning a {
    color: #573e1c; }
@@@ -12246,11 -12244,11 +12246,11 @@@
    width: 4em; }
  
  #adminthemeselector .selectedtheme td.c0 {
-   border: 1px solid #d1edf6;
+   border: 1px solid #b8dce2;
    border-right-width: 0; }
  
  #adminthemeselector .selectedtheme td.c1 {
-   border: 1px solid #d1edf6;
+   border: 1px solid #b8dce2;
    border-left-width: 0; }
  
  .admin_colourpicker,
@@@ -12269,12 -12267,12 +12269,12 @@@
      box-sizing: content-box; }
    .admin_colourpicker .colourdialogue {
      float: left;
-     border: 1px solid #d1edf6; }
+     border: 1px solid #b8dce2; }
    .admin_colourpicker .previewcolour {
-     border: 1px solid #d1edf6;
+     border: 1px solid #b8dce2;
      margin-left: 301px; }
    .admin_colourpicker .currentcolour {
-     border: 1px solid #d1edf6;
+     border: 1px solid #b8dce2;
      margin-left: 301px;
      border-top-width: 0; } }
  
@@@ -12347,7 -12345,7 +12347,7 @@@
  
  #plugins-check-page .pluginupdateinfo,
  #plugins-control-panel .pluginupdateinfo {
-   background-color: #def2f8;
+   background-color: #cce6ea;
    padding: 5px;
    margin: 10px 0; }
    #plugins-check-page .pluginupdateinfo.maturity50,
@@@ -12577,10 -12575,8 +12577,10 @@@
    .dashboard-card-deck .dashboard-card .dashboard-card-footer {
      padding: 0.8rem; }
  
 -.dashboard-card-deck.fixed-width-cards .dashboard-card {
 -  width: 300px; }
 +@media (min-width: 576px) {
 +  .dashboard-card-deck.fixed-width-cards .dashboard-card {
 +    width: 300px;
 +    max-width: 100%; } }
  
  @media (min-width: 576px) {
    .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
@@@ -13490,11 -13486,11 +13490,11 @@@ span.editinstructions 
    margin-left: 30px;
    font-size: 0.8203125rem;
    padding: .1em .4em;
-   background-color: #def2f8;
-   color: #5bc0de;
+   background-color: #cce6ea;
+   color: #008196;
    text-decoration: none;
    z-index: 9999;
-   border: 1px solid #d1edf6; }
+   border: 1px solid #b8dce2; }
  
  /* Course drag and drop upload styles */
  #dndupload-status {
@@@ -13503,10 -13499,10 +13503,10 @@@
    width: 40%;
    margin: 0 30%;
    padding: 6px;
-   border: 1px solid #d1edf6;
+   border: 1px solid #b8dce2;
    text-align: center;
-   background: #def2f8;
-   color: #5bc0de;
+   background: #cce6ea;
+   color: #008196;
    z-index: 1; }
  
  .dndupload-preview {
@@@ -13825,33 -13821,33 +13825,33 @@@
    #course-category-listings .listing-pagination {
      text-align: center; }
      #course-category-listings .listing-pagination .yui3-button {
-       color: #212529;
-       background-color: #5bc0de;
-       border-color: #5bc0de;
+       color: #fff;
+       background-color: #008196;
+       border-color: #008196;
        border: 0;
        margin: 0.4rem 0.2rem 0.45rem;
        font-size: 10.4px; }
        #course-category-listings .listing-pagination .yui3-button:hover {
          color: #fff;
-         background-color: #3bb4d8;
-         border-color: #31b0d5; }
+         background-color: #006070;
+         border-color: #005563; }
        #course-category-listings .listing-pagination .yui3-button:focus, #course-category-listings .listing-pagination .yui3-button.focus {
          color: #fff;
-         background-color: #3bb4d8;
-         border-color: #31b0d5;
-         box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+         background-color: #006070;
+         border-color: #005563;
+         box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
        #course-category-listings .listing-pagination .yui3-button.disabled, #course-category-listings .listing-pagination .yui3-button:disabled {
-         color: #212529;
-         background-color: #5bc0de;
-         border-color: #5bc0de; }
+         color: #fff;
+         background-color: #008196;
+         border-color: #008196; }
        #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled):active, #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled).active,
        .show > #course-category-listings .listing-pagination .yui3-button.dropdown-toggle {
          color: #fff;
-         background-color: #31b0d5;
-         border-color: #2aaacf; }
+         background-color: #005563;
+         border-color: #004a56; }
          #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled):active:focus, #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled).active:focus,
          .show > #course-category-listings .listing-pagination .yui3-button.dropdown-toggle:focus {
-           box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+           box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
        #course-category-listings .listing-pagination .yui3-button.active-page {
          color: #fff;
          background-color: #1177d1;
@@@ -15320,15 -15316,8 +15320,15 @@@ a.ygtvspacer:hover 
    .message-app .lazy-load-list {
      overflow-y: auto; }
  
 +#page-message-index #page-header {
 +  display: none; }
 +
  #page-message-index #region-main {
 -  height: 100%; }
 +  height: 100%;
 +  margin-top: 0; }
 +  #page-message-index #region-main .conversationcontainer {
 +    max-height: calc(100vh - 50px);
 +    overflow: auto; }
    #page-message-index #region-main div[role="main"] {
      height: 100%; }
      #page-message-index #region-main div[role="main"] #maincontent {
@@@ -15603,14 -15592,14 +15603,14 @@@ body.path-question-type 
      color: #573e1c; }
  
  .que .formulation {
-   color: #2f6473;
-   background-color: #def2f8;
-   border-color: #d1edf6;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2;
    /* stylelint-disable-line max-line-length */ }
    .que .formulation hr {
-     border-top-color: #bce5f2; }
+     border-top-color: #a6d3db; }
    .que .formulation .alert-link {
-     color: #20454f; }
+     color: #00171b; }
  
  .que.multichoice .answer div.r0 .icon.fa-check,
  .que.multichoice .answer div.r1 .icon.fa-check,
@@@ -16959,19 -16948,17 +16959,19 @@@ select 
    max-height: none;
    z-index: 1; }
  
 -.path-mod-forum .unified-grader .body-container.hidden {
 -  display: none !important;
 -  /* stylelint-disable-line declaration-no-important */ }
 +.path-mod-forum .unified-grader .body-container {
 +  overflow: auto; }
 +  .path-mod-forum .unified-grader .body-container.hidden {
 +    display: none !important;
 +    /* stylelint-disable-line declaration-no-important */ }
  
  .path-mod-forum .unified-grader .userpicture {
    height: 60px;
    width: 60px; }
  
  .path-mod-forum .unified-grader .grader-grading-panel {
 -  position: absolute;
    top: 0;
 +  position: absolute;
    height: 100%;
    z-index: 0;
    width: 430px; }
@@@ -17222,13 -17209,7 +17222,13 @@@
  
  @media (max-width: 575.98px) {
    .path-mod-forum .unified-grader .grader-grading-panel {
 -    width: 100%; } }
 +    width: 100%;
 +    position: fixed;
 +    height: calc(100vh - 50px);
 +    overflow: scroll;
 +    top: 50px; }
 +  .path-mod-forum .unified-grader .body-container {
 +    overflow: visible; } }
  
  .maincalendar .calendarmonth td,
  .maincalendar .calendarmonth th {
@@@ -17569,14 -17550,14 +17569,14 @@@ div#dock 
    padding: 0.75rem 1.25rem;
    margin-bottom: 1rem;
    border: 0 solid transparent;
-   color: #2f6473;
-   background-color: #def2f8;
-   border-color: #d1edf6;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2;
    /* stylelint-disable-line max-line-length */ }
    .assignfeedback_editpdf_widget .label hr {
-     border-top-color: #bce5f2; }
+     border-top-color: #a6d3db; }
    .assignfeedback_editpdf_widget .label .alert-link {
-     color: #20454f; }
+     color: #00171b; }
  
  .assignfeedback_editpdf_menu {
    padding: 0; }
@@@ -17988,7 -17969,7 +17988,7 @@@ p.arrow_button 
    box-shadow: inset 0 0 0 2px #fff; }
  
  .btn-info:focus, .btn-info.focus {
-   outline: 0.2rem solid #124a5b;
+   outline: 0.2rem solid black;
    box-shadow: inset 0 0 0 2px #fff; }
  
  .btn-warning:focus, .btn-warning.focus {
@@@ -18020,7 -18001,7 +18020,7 @@@
    box-shadow: inset 0 0 0 2px #343a40; }
  
  .btn-outline-info:focus, .btn-outline-info.focus {
-   outline: 0.2rem solid #124a5b;
+   outline: 0.2rem solid black;
    box-shadow: inset 0 0 0 2px #343a40; }
  
  .btn-outline-warning:focus, .btn-outline-warning.focus {
@@@ -19092,14 -19073,14 +19092,14 @@@ span[data-flexitour="container"][x-plac
      box-shadow: 0 0 0 0.2rem rgba(57, 132, 57, 0.5); }
  
  .label-info {
-   color: #212529;
-   background-color: #5bc0de; }
+   color: #fff;
+   background-color: #008196; }
    a.label-info:hover, a.label-info:focus {
-     color: #212529;
-     background-color: #31b0d5; }
+     color: #fff;
+     background-color: #005563; }
    a.label-info:focus, a.label-info.focus {
      outline: 0;
-     box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+     box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
  
  .label-warning {
    color: #212529;

diff --combined theme/classic/style/moodle.css
index c346fb7,ca03b19..47b43e9
--- 1/theme/classic/style/moodle.css
--- 2/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@@ -2342,14 -2342,14 +2342,14 @@@
    --yellow: #ff7518;
    --green: #398439;
    --teal: #20c997;
-   --cyan: #5bc0de;
+   --cyan: #008196;
    --white: #fff;
    --gray: #6c757d;
    --gray-dark: #343a40;
    --primary: #1177d1;
    --secondary: #ced4da;
    --success: #398439;
-   --info: #5bc0de;
+   --info: #008196;
    --warning: #f0ad4e;
    --danger: #d43f3a;
    --light: #f8f9fa;
@@@ -3607,19 -3607,19 +3607,19 @@@ pre 
  .table-info,
  .table-info > th,
  .table-info > td {
-   background-color: #d1edf6; }
+   background-color: #b8dce2; }
  
  .table-info th,
  .table-info td,
  .table-info thead th,
  .table-info tbody + tbody {
-   border-color: #aadeee; }
+   border-color: #7abdc8; }
  
  .table-hover .table-info:hover {
-   background-color: #bce5f2; }
+   background-color: #a6d3db; }
    .table-hover .table-info:hover > td,
    .table-hover .table-info:hover > th {
-     background-color: #bce5f2; }
+     background-color: #a6d3db; }
  
  .table-warning,
  .table-warning > th,
@@@ -4249,30 -4249,30 +4249,30 @@@ fieldset:disabled a.btn 
        box-shadow: 0 0 0 0.2rem rgba(87, 150, 87, 0.5); }
  
  .btn-info {
-   color: #212529;
-   background-color: #5bc0de;
-   border-color: #5bc0de; }
+   color: #fff;
+   background-color: #008196;
+   border-color: #008196; }
    .btn-info:hover {
      color: #fff;
-     background-color: #3bb4d8;
-     border-color: #31b0d5; }
+     background-color: #006070;
+     border-color: #005563; }
    .btn-info:focus, .btn-info.focus {
      color: #fff;
-     background-color: #3bb4d8;
-     border-color: #31b0d5;
-     box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+     background-color: #006070;
+     border-color: #005563;
+     box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
    .btn-info.disabled, .btn-info:disabled {
-     color: #212529;
-     background-color: #5bc0de;
-     border-color: #5bc0de; }
+     color: #fff;
+     background-color: #008196;
+     border-color: #008196; }
    .btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active,
    .show > .btn-info.dropdown-toggle {
      color: #fff;
-     background-color: #31b0d5;
-     border-color: #2aaacf; }
+     background-color: #005563;
+     border-color: #004a56; }
      .btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus,
      .show > .btn-info.dropdown-toggle:focus {
-       box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+       box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
  
  .btn-warning {
    color: #212529;
@@@ -4442,25 -4442,25 +4442,25 @@@
        box-shadow: 0 0 0 0.2rem rgba(57, 132, 57, 0.5); }
  
  .btn-outline-info {
-   color: #5bc0de;
-   border-color: #5bc0de; }
+   color: #008196;
+   border-color: #008196; }
    .btn-outline-info:hover {
-     color: #212529;
-     background-color: #5bc0de;
-     border-color: #5bc0de; }
+     color: #fff;
+     background-color: #008196;
+     border-color: #008196; }
    .btn-outline-info:focus, .btn-outline-info.focus {
-     box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+     box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
    .btn-outline-info.disabled, .btn-outline-info:disabled {
-     color: #5bc0de;
+     color: #008196;
      background-color: transparent; }
    .btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active,
    .show > .btn-outline-info.dropdown-toggle {
-     color: #212529;
-     background-color: #5bc0de;
-     border-color: #5bc0de; }
+     color: #fff;
+     background-color: #008196;
+     border-color: #008196; }
      .btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus,
      .show > .btn-outline-info.dropdown-toggle:focus {
-       box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+       box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
  
  .btn-outline-warning {
    color: #f0ad4e;
@@@ -6047,14 -6047,14 +6047,14 @@@ input[type="button"].btn-block 
      box-shadow: 0 0 0 0.2rem rgba(57, 132, 57, 0.5); }
  
  .badge-info {
-   color: #212529;
-   background-color: #5bc0de; }
+   color: #fff;
+   background-color: #008196; }
    a.badge-info:hover, a.badge-info:focus {
-     color: #212529;
-     background-color: #31b0d5; }
+     color: #fff;
+     background-color: #005563; }
    a.badge-info:focus, a.badge-info.focus {
      outline: 0;
-     box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+     box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
  
  .badge-warning {
    color: #212529;
@@@ -6160,13 -6160,13 +6160,13 @@@
      color: #0f210f; }
  
  .alert-info {
-   color: #2f6473;
-   background-color: #def2f8;
-   border-color: #d1edf6; }
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2; }
    .alert-info hr {
-     border-top-color: #bce5f2; }
+     border-top-color: #a6d3db; }
    .alert-info .alert-link {
-     color: #20454f; }
+     color: #00171b; }
  
  .alert-warning {
    color: #7d5a29;
@@@ -6427,15 -6427,15 +6427,15 @@@
      border-color: #1e451e; }
  
  .list-group-item-info {
-   color: #2f6473;
-   background-color: #d1edf6; }
+   color: #00434e;
+   background-color: #b8dce2; }
    .list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus {
-     color: #2f6473;
-     background-color: #bce5f2; }
+     color: #00434e;
+     background-color: #a6d3db; }
    .list-group-item-info.list-group-item-action.active {
      color: #fff;
-     background-color: #2f6473;
-     border-color: #2f6473; }
+     background-color: #00434e;
+     border-color: #00434e; }
  
  .list-group-item-warning {
    color: #7d5a29;
@@@ -7132,12 -7132,12 +7132,12 @@@ button.bg-success:focus 
    background-color: #2a602a !important; }
  
  .bg-info {
-   background-color: #5bc0de !important; }
+   background-color: #008196 !important; }
  
  a.bg-info:hover, a.bg-info:focus,
  button.bg-info:hover,
  button.bg-info:focus {
-   background-color: #31b0d5 !important; }
+   background-color: #005563 !important; }
  
  .bg-warning {
    background-color: #f0ad4e !important; }
@@@ -7217,7 -7217,7 +7217,7 @@@ button.bg-dark:focus 
    border-color: #398439 !important; }
  
  .border-info {
-   border-color: #5bc0de !important; }
+   border-color: #008196 !important; }
  
  .border-warning {
    border-color: #f0ad4e !important; }
@@@ -9462,10 -9462,10 +9462,10 @@@ a.text-success:hover, a.text-success:fo
    color: #224f22 !important; }
  
  .text-info {
-   color: #5bc0de !important; }
+   color: #008196 !important; }
  
  a.text-info:hover, a.text-info:focus {
-   color: #28a1c5 !important; }
+   color: #003f4a !important; }
  
  .text-warning {
    color: #f0ad4e !important; }
@@@ -9621,9 -9621,9 +9621,9 @@@ a.text-dark:hover, a.text-dark:focus 
      background-color: #2a602a; }
  
  .tag-info {
-   background-color: #5bc0de; }
+   background-color: #008196; }
    .tag-info[href]:hover, .tag-info[href]:focus {
-     background-color: #31b0d5; }
+     background-color: #005563; }
  
  .tag-warning {
    background-color: #f0ad4e; }
@@@ -10062,7 -10062,7 +10062,7 @@@ div.dropdown-item:focus-within 
    color: #398439; }
  
  .highlight {
-   color: #5bc0de; }
+   color: #008196; }
  
  .fitem.advanced .text-info {
    font-weight: bold; }
@@@ -11626,9 -11626,7 +11626,9 @@@ h3.sectionname .inplaceeditable.inplace
      display: block; }
  
  ul {
 -  padding-left: 1rem; }
 +  padding-left: 1rem;
 +  -webkit-margin-start: 0.2rem;
 +  /* stylelint-disable-line */ }
  
  /* YUI 2 Tree View */
  /*rtl:raw:
@@@ -11948,7 -11946,7 +11948,7 @@@ body.h5p-embed .h5pmessages 
    color: #0f210f; }
  
  .alert-info a {
-   color: #20454f; }
+   color: #00171b; }
  
  .alert-warning a {
    color: #573e1c; }
@@@ -12460,11 -12458,11 +12460,11 @@@
    width: 4em; }
  
  #adminthemeselector .selectedtheme td.c0 {
-   border: 1px solid #d1edf6;
+   border: 1px solid #b8dce2;
    border-right-width: 0; }
  
  #adminthemeselector .selectedtheme td.c1 {
-   border: 1px solid #d1edf6;
+   border: 1px solid #b8dce2;
    border-left-width: 0; }
  
  .admin_colourpicker,
@@@ -12483,12 -12481,12 +12483,12 @@@
      box-sizing: content-box; }
    .admin_colourpicker .colourdialogue {
      float: left;
-     border: 1px solid #d1edf6; }
+     border: 1px solid #b8dce2; }
    .admin_colourpicker .previewcolour {
-     border: 1px solid #d1edf6;
+     border: 1px solid #b8dce2;
      margin-left: 301px; }
    .admin_colourpicker .currentcolour {
-     border: 1px solid #d1edf6;
+     border: 1px solid #b8dce2;
      margin-left: 301px;
      border-top-width: 0; } }
  
@@@ -12561,7 -12559,7 +12561,7 @@@
  
  #plugins-check-page .pluginupdateinfo,
  #plugins-control-panel .pluginupdateinfo {
-   background-color: #def2f8;
+   background-color: #cce6ea;
    padding: 5px;
    margin: 10px 0;
    border-radius: 5px; }
@@@ -12792,10 -12790,8 +12792,10 @@@
    .dashboard-card-deck .dashboard-card .dashboard-card-footer {
      padding: 0.8rem; }
  
 -.dashboard-card-deck.fixed-width-cards .dashboard-card {
 -  width: 300px; }
 +@media (min-width: 576px) {
 +  .dashboard-card-deck.fixed-width-cards .dashboard-card {
 +    width: 300px;
 +    max-width: 100%; } }
  
  @media (min-width: 576px) {
    .dashboard-card-deck:not(.fixed-width-cards) .dashboard-card {
@@@ -13705,11 -13701,11 +13705,11 @@@ span.editinstructions 
    margin-left: 30px;
    font-size: 0.8203125rem;
    padding: .1em .4em;
-   background-color: #def2f8;
-   color: #5bc0de;
+   background-color: #cce6ea;
+   color: #008196;
    text-decoration: none;
    z-index: 9999;
-   border: 1px solid #d1edf6; }
+   border: 1px solid #b8dce2; }
  
  /* Course drag and drop upload styles */
  #dndupload-status {
@@@ -13718,10 -13714,10 +13718,10 @@@
    width: 40%;
    margin: 0 30%;
    padding: 6px;
-   border: 1px solid #d1edf6;
+   border: 1px solid #b8dce2;
    text-align: center;
-   background: #def2f8;
-   color: #5bc0de;
+   background: #cce6ea;
+   color: #008196;
    z-index: 1;
    border-radius: 8px; }
  
@@@ -14042,33 -14038,33 +14042,33 @@@
    #course-category-listings .listing-pagination {
      text-align: center; }
      #course-category-listings .listing-pagination .yui3-button {
-       color: #212529;
-       background-color: #5bc0de;
-       border-color: #5bc0de;
+       color: #fff;
+       background-color: #008196;
+       border-color: #008196;
        border: 0;
        margin: 0.4rem 0.2rem 0.45rem;
        font-size: 10.4px; }
        #course-category-listings .listing-pagination .yui3-button:hover {
          color: #fff;
-         background-color: #3bb4d8;
-         border-color: #31b0d5; }
+         background-color: #006070;
+         border-color: #005563; }
        #course-category-listings .listing-pagination .yui3-button:focus, #course-category-listings .listing-pagination .yui3-button.focus {
          color: #fff;
-         background-color: #3bb4d8;
-         border-color: #31b0d5;
-         box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+         background-color: #006070;
+         border-color: #005563;
+         box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
        #course-category-listings .listing-pagination .yui3-button.disabled, #course-category-listings .listing-pagination .yui3-button:disabled {
-         color: #212529;
-         background-color: #5bc0de;
-         border-color: #5bc0de; }
+         color: #fff;
+         background-color: #008196;
+         border-color: #008196; }
        #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled):active, #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled).active,
        .show > #course-category-listings .listing-pagination .yui3-button.dropdown-toggle {
          color: #fff;
-         background-color: #31b0d5;
-         border-color: #2aaacf; }
+         background-color: #005563;
+         border-color: #004a56; }
          #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled):active:focus, #course-category-listings .listing-pagination .yui3-button:not(:disabled):not(.disabled).active:focus,
          .show > #course-category-listings .listing-pagination .yui3-button.dropdown-toggle:focus {
-           box-shadow: 0 0 0 0.2rem rgba(82, 169, 195, 0.5); }
+           box-shadow: 0 0 0 0.2rem rgba(38, 148, 166, 0.5); }
        #course-category-listings .listing-pagination .yui3-button.active-page {
          color: #fff;
          background-color: #1177d1;
@@@ -15538,15 -15534,8 +15538,15 @@@ a.ygtvspacer:hover 
    .message-app .lazy-load-list {
      overflow-y: auto; }
  
 +#page-message-index #page-header {
 +  display: none; }
 +
  #page-message-index #region-main {
 -  height: 100%; }
 +  height: 100%;
 +  margin-top: 0; }
 +  #page-message-index #region-main .conversationcontainer {
 +    max-height: calc(100vh - 50px);
 +    overflow: auto; }
    #page-message-index #region-main div[role="main"] {
      height: 100%; }
      #page-message-index #region-main div[role="main"] #maincontent {
@@@ -15826,14 -15815,14 +15826,14 @@@ body.path-question-type 
      color: #573e1c; }
  
  .que .formulation {
-   color: #2f6473;
-   background-color: #def2f8;
-   border-color: #d1edf6;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2;
    /* stylelint-disable-line max-line-length */ }
    .que .formulation hr {
-     border-top-color: #bce5f2; }
+     border-top-color: #a6d3db; }
    .que .formulation .alert-link {
-     color: #20454f; }
+     color: #00171b; }
  
  .que.multichoice .answer div.r0 .icon.fa-check,
  .que.multichoice .answer div.r1 .icon.fa-check,
@@@ -17188,19 -17177,17 +17188,19 @@@ select 
    max-height: none;
    z-index: 1; }
  
 -.path-mod-forum .unified-grader .body-container.hidden {
 -  display: none !important;
 -  /* stylelint-disable-line declaration-no-important */ }
 +.path-mod-forum .unified-grader .body-container {
 +  overflow: auto; }
 +  .path-mod-forum .unified-grader .body-container.hidden {
 +    display: none !important;
 +    /* stylelint-disable-line declaration-no-important */ }
  
  .path-mod-forum .unified-grader .userpicture {
    height: 60px;
    width: 60px; }
  
  .path-mod-forum .unified-grader .grader-grading-panel {
 -  position: absolute;
    top: 0;
 +  position: absolute;
    height: 100%;
    z-index: 0;
    width: 430px; }
@@@ -17451,13 -17438,7 +17451,13 @@@
  
  @media (max-width: 575.98px) {
    .path-mod-forum .unified-grader .grader-grading-panel {
 -    width: 100%; } }
 +    width: 100%;
 +    position: fixed;
 +    height: calc(100vh - 50px);
 +    overflow: scroll;
 +    top: 50px; }
 +  .path-mod-forum .unified-grader .body-container {
 +    overflow: visible; } }
  
  .maincalendar .calendarmonth td,
  .maincalendar .calendarmonth th {
@@@ -17800,14 -17781,14 +17800,14 @@@ div#dock 
    margin-bottom: 1rem;
    border: 0 solid transparent;
    border-radius: 0.25rem;
-   color: #2f6473;
-   background-color: #def2f8;
-   border-color: #d1edf6;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2;
    /* stylelint-disable-line max-line-length */ }
    .assignfeedback_editpdf_widget .label hr {
-     border-top-color: #bce5f2; }
+     border-top-color: #a6d3db; }
    .assignfeedback_editpdf_widget .label .alert-link {
-     color: #20454f; }
+     color: #00171b; }
  
  .assignfeedback_editpdf_menu {
    padding: 0; }
@@@ -18222,7 -18203,7 +18222,7 @@@ p.arrow_button 
    box-shadow: inset 0 0 0 2px #fff; }
  
  .btn-info:focus, .btn-info.focus {
-   outline: 0.2rem solid #124a5b;
+   outline: 0.2rem solid black;
    box-shadow: inset 0 0 0 2px #fff; }
  
  .btn-warning:focus, .btn-warning.focus {
@@@ -18254,7 -18235,7 +18254,7 @@@
    box-shadow: inset 0 0 0 2px #343a40; }
  
  .btn-outline-info:focus, .btn-outline-info.focus {
-   outline: 0.2rem solid #124a5b;
+   outline: 0.2rem solid black;
    box-shadow: inset 0 0 0 2px #343a40; }
  
  .btn-outline-warning:focus, .btn-outline-warning.focus {
@@@ -19277,14 -19258,14 +19277,14 @@@ span[data-flexitour="container"][x-plac
      box-shadow: 0 0 0 0.2rem rgba(57, 132, 57, 0.5); }
  
  .label-info {
-   color: #212529;
-   background-color: #5bc0de; }
+   color: #fff;
+   background-color: #008196; }
    a.label-info:hover, a.label-info:focus {
-     color: #212529;
-     background-color: #31b0d5; }
+     color: #fff;
+     background-color: #005563; }
    a.label-info:focus, a.label-info.focus {
      outline: 0;
-     box-shadow: 0 0 0 0.2rem rgba(91, 192, 222, 0.5); }
+     box-shadow: 0 0 0 0.2rem rgba(0, 129, 150, 0.5); }
  
  .label-warning {
    color: #212529;