Merge branch 'MDL-69069-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 01:32:36 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 01:32:36 +0000 (09:32 +0800)
1  2 
theme/boost/style/moodle.css
theme/classic/style/moodle.css

@@@ -12741,34 -12741,22 +12741,34 @@@ input[disabled] 
  
  /* calendar.less */
  .calendar_event_category {
 -  background-color: #d8bfd8; }
 +  background-color: #e0cbe0; }
 +  .calendar_event_category .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_course {
    background-color: #ffd3bd; }
 +  .calendar_event_course .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_site {
    background-color: #d6f8cd; }
 +  .calendar_event_site .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_group {
    background-color: #fee7ae; }
 +  .calendar_event_group .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_user {
    background-color: #dce7ec; }
 +  .calendar_event_user .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_other {
    background-color: #ced4da; }
 +  .calendar_event_other .commands a {
 +    color: #0d5ca1; }
  
  .path-calendar .calendartable {
    width: 100%;
            border-radius: 6px;
            vertical-align: middle; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_category {
 -            background-color: #d8bfd8; }
 +            background-color: #e0cbe0;
 +            border: 2px solid #9e619f; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_course {
 -            background-color: #ffd3bd; }
 +            background-color: #ffd3bd;
 +            border: 2px solid #d34600; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_site {
 -            background-color: #d6f8cd; }
 +            background-color: #d6f8cd;
 +            border: 2px solid #2b8713; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_group {
 -            background-color: #fee7ae; }
 +            background-color: #fee7ae;
 +            border: 2px solid #9a6e02; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_user {
 -            background-color: #dce7ec; }
 +            background-color: #dce7ec;
 +            border: 2px solid #4e7c91; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_other {
 -            background-color: #ced4da; }
 +            background-color: #ced4da;
 +            border: 2px solid #687889; }
      .path-calendar .maincalendar .calendarmonth td {
        height: 5em; }
      .path-calendar .maincalendar .calendarmonth .clickable:hover {
      color: #0b4f8a;
      text-decoration: underline; }
    .path-calendar .maincalendar .calendar_event_category {
 -    border-color: #d8bfd8; }
 +    border-color: #e0cbe0; }
    .path-calendar .maincalendar .calendar_event_course {
      border-color: #ffd3bd; }
    .path-calendar .maincalendar .calendar_event_site {
    .block .minicalendar td a {
      width: 100%;
      height: 100%;
 -    display: block; }
 +    display: block;
 +    color: #0d5ca1; }
    .block .minicalendar td.duration_global {
      border-top: 1px solid #d6f8cd;
      border-bottom: 1px solid #d6f8cd; }
      .block .minicalendar td.duration_global.duration_finish {
        background-color: #d6f8cd; }
    .block .minicalendar td.duration_category {
 -    border-top: 1px solid #d8bfd8;
 -    border-bottom: 1px solid #d8bfd8; }
 +    border-top: 1px solid #e0cbe0;
 +    border-bottom: 1px solid #e0cbe0; }
      .block .minicalendar td.duration_category.duration_finish {
 -      background-color: #d8bfd8; }
 +      background-color: #e0cbe0; }
    .block .minicalendar td.duration_course {
      border-top: 1px solid #ffd3bd;
      border-bottom: 1px solid #ffd3bd; }
  
  .block .calendar_filters li {
    margin-bottom: 0.2em; }
 +  .block .calendar_filters li span.calendar_event_category i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_course i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_site i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_group i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_user i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_other i {
 +    color: #0d5ca1; }
    .block .calendar_filters li span img {
      padding: 0 0.2em;
      margin: 0; }
@@@ -13543,11 -13512,16 +13543,16 @@@ span.editinstructions 
    margin-left: 30px;
    font-size: 0.8203125rem;
    padding: .1em .4em;
-   background-color: #cce6ea;
-   color: #008196;
    text-decoration: none;
    z-index: 9999;
-   border: 1px solid #b8dce2; }
+   border: 0 solid transparent;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2; }
+   span.editinstructions hr {
+     border-top-color: #a6d3db; }
+   span.editinstructions .alert-link {
+     color: #00171b; }
  
  /* Course drag and drop upload styles */
  #dndupload-status {
    width: 40%;
    margin: 0 30%;
    padding: 6px;
-   border: 1px solid #b8dce2;
    text-align: center;
-   background: #cce6ea;
-   color: #008196;
-   z-index: 1; }
+   z-index: 1;
+   border: 0 solid transparent;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2; }
+   #dndupload-status hr {
+     border-top-color: #a6d3db; }
+   #dndupload-status .alert-link {
+     color: #00171b; }
  
  .dndupload-preview {
    color: #909090;
@@@ -19101,65 -19080,6 +19111,65 @@@ span[data-flexitour="container"][x-plac
        height: 1em;
        font-size: 4em; }
  
 +.form-control:-ms-input-placeholder {
 +  color: #6c757d; }
 +
 +.custom-select {
 +  -webkit-appearance: none;
 +  -moz-appearance: none; }
 +
 +.custom-range {
 +  -webkit-appearance: none;
 +  -moz-appearance: none; }
 +  .custom-range::-webkit-slider-thumb, .custom-range::-moz-range-thumb, .custom-range::-ms-thumb {
 +    -webkit-appearance: none;
 +    -moz-appearance: none; }
 +
 +input[type="date"].form-control,
 +input[type="time"].form-control,
 +input[type="datetime-local"].form-control,
 +input[type="month"].form-control {
 +  -webkit-appearance: none;
 +  -moz-appearance: none; }
 +
 +@media (min-width: 576px) {
 +  .card-columns {
 +    -webkit-column-gap: 1.25rem;
 +    -moz-column-gap: 1.25rem; } }
 +
 +.carousel-item {
 +  -webkit-backface-visibility: hidden; }
 +
 +.card {
 +  -webkit-background-clip: border-box; }
 +
 +.carousel-indicators li,
 +.dropdown-menu,
 +.form-control,
 +.modal-content,
 +.popover,
 +.toast {
 +  -webkit-background-clip: padding-box; }
 +
 +.btn {
 +  -webkit-user-select: none;
 +  -ms-user-select: none; }
 +
 +.user-select-all {
 +  -webkit-user-select: all !important;
 +  /* stylelint-disable-line declaration-no-important */
 +  -ms-user-select: none; }
 +
 +.user-select-auto {
 +  -webkit-user-select: auto !important;
 +  /* stylelint-disable-line declaration-no-important */
 +  -ms-user-select: none; }
 +
 +.user-select-none {
 +  -webkit-user-select: none !important;
 +  /* stylelint-disable-line declaration-no-important */
 +  -ms-user-select: none; }
 +
  body {
    -webkit-font-smoothing: antialiased;
    -moz-osx-font-smoothing: grayscale; }
@@@ -12955,34 -12955,22 +12955,34 @@@ input[disabled] 
  
  /* calendar.less */
  .calendar_event_category {
 -  background-color: #d8bfd8; }
 +  background-color: #e0cbe0; }
 +  .calendar_event_category .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_course {
    background-color: #ffd3bd; }
 +  .calendar_event_course .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_site {
    background-color: #d6f8cd; }
 +  .calendar_event_site .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_group {
    background-color: #fee7ae; }
 +  .calendar_event_group .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_user {
    background-color: #dce7ec; }
 +  .calendar_event_user .commands a {
 +    color: #0d5ca1; }
  
  .calendar_event_other {
    background-color: #ced4da; }
 +  .calendar_event_other .commands a {
 +    color: #0d5ca1; }
  
  .path-calendar .calendartable {
    width: 100%;
            border-radius: 6px;
            vertical-align: middle; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_category {
 -            background-color: #d8bfd8; }
 +            background-color: #e0cbe0;
 +            border: 2px solid #9e619f; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_course {
 -            background-color: #ffd3bd; }
 +            background-color: #ffd3bd;
 +            border: 2px solid #d34600; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_site {
 -            background-color: #d6f8cd; }
 +            background-color: #d6f8cd;
 +            border: 2px solid #2b8713; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_group {
 -            background-color: #fee7ae; }
 +            background-color: #fee7ae;
 +            border: 2px solid #9a6e02; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_user {
 -            background-color: #dce7ec; }
 +            background-color: #dce7ec;
 +            border: 2px solid #4e7c91; }
            .path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_other {
 -            background-color: #ced4da; }
 +            background-color: #ced4da;
 +            border: 2px solid #687889; }
      .path-calendar .maincalendar .calendarmonth td {
        height: 5em; }
      .path-calendar .maincalendar .calendarmonth .clickable:hover {
      color: #0b4f8a;
      text-decoration: underline; }
    .path-calendar .maincalendar .calendar_event_category {
 -    border-color: #d8bfd8; }
 +    border-color: #e0cbe0; }
    .path-calendar .maincalendar .calendar_event_course {
      border-color: #ffd3bd; }
    .path-calendar .maincalendar .calendar_event_site {
    .block .minicalendar td a {
      width: 100%;
      height: 100%;
 -    display: block; }
 +    display: block;
 +    color: #0d5ca1; }
    .block .minicalendar td.duration_global {
      border-top: 1px solid #d6f8cd;
      border-bottom: 1px solid #d6f8cd; }
      .block .minicalendar td.duration_global.duration_finish {
        background-color: #d6f8cd; }
    .block .minicalendar td.duration_category {
 -    border-top: 1px solid #d8bfd8;
 -    border-bottom: 1px solid #d8bfd8; }
 +    border-top: 1px solid #e0cbe0;
 +    border-bottom: 1px solid #e0cbe0; }
      .block .minicalendar td.duration_category.duration_finish {
 -      background-color: #d8bfd8; }
 +      background-color: #e0cbe0; }
    .block .minicalendar td.duration_course {
      border-top: 1px solid #ffd3bd;
      border-bottom: 1px solid #ffd3bd; }
  
  .block .calendar_filters li {
    margin-bottom: 0.2em; }
 +  .block .calendar_filters li span.calendar_event_category i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_course i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_site i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_group i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_user i {
 +    color: #0d5ca1; }
 +  .block .calendar_filters li span.calendar_event_other i {
 +    color: #0d5ca1; }
    .block .calendar_filters li span img {
      padding: 0 0.2em;
      margin: 0; }
@@@ -13757,11 -13726,16 +13757,16 @@@ span.editinstructions 
    margin-left: 30px;
    font-size: 0.8203125rem;
    padding: .1em .4em;
-   background-color: #cce6ea;
-   color: #008196;
    text-decoration: none;
    z-index: 9999;
-   border: 1px solid #b8dce2; }
+   border: 0 solid transparent;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2; }
+   span.editinstructions hr {
+     border-top-color: #a6d3db; }
+   span.editinstructions .alert-link {
+     color: #00171b; }
  
  /* Course drag and drop upload styles */
  #dndupload-status {
    width: 40%;
    margin: 0 30%;
    padding: 6px;
-   border: 1px solid #b8dce2;
    text-align: center;
-   background: #cce6ea;
-   color: #008196;
    z-index: 1;
-   border-radius: 8px; }
+   border: 0 solid transparent;
+   color: #00434e;
+   background-color: #cce6ea;
+   border-color: #b8dce2; }
+   #dndupload-status hr {
+     border-top-color: #a6d3db; }
+   #dndupload-status .alert-link {
+     color: #00171b; }
  
  .dndupload-preview {
    color: #909090;
@@@ -19284,65 -19262,6 +19293,65 @@@ span[data-flexitour="container"][x-plac
        height: 1em;
        font-size: 4em; }
  
 +.form-control:-ms-input-placeholder {
 +  color: #6c757d; }
 +
 +.custom-select {
 +  -webkit-appearance: none;
 +  -moz-appearance: none; }
 +
 +.custom-range {
 +  -webkit-appearance: none;
 +  -moz-appearance: none; }
 +  .custom-range::-webkit-slider-thumb, .custom-range::-moz-range-thumb, .custom-range::-ms-thumb {
 +    -webkit-appearance: none;
 +    -moz-appearance: none; }
 +
 +input[type="date"].form-control,
 +input[type="time"].form-control,
 +input[type="datetime-local"].form-control,
 +input[type="month"].form-control {
 +  -webkit-appearance: none;
 +  -moz-appearance: none; }
 +
 +@media (min-width: 576px) {
 +  .card-columns {
 +    -webkit-column-gap: 1.25rem;
 +    -moz-column-gap: 1.25rem; } }
 +
 +.carousel-item {
 +  -webkit-backface-visibility: hidden; }
 +
 +.card {
 +  -webkit-background-clip: border-box; }
 +
 +.carousel-indicators li,
 +.dropdown-menu,
 +.form-control,
 +.modal-content,
 +.popover,
 +.toast {
 +  -webkit-background-clip: padding-box; }
 +
 +.btn {
 +  -webkit-user-select: none;
 +  -ms-user-select: none; }
 +
 +.user-select-all {
 +  -webkit-user-select: all !important;
 +  /* stylelint-disable-line declaration-no-important */
 +  -ms-user-select: none; }
 +
 +.user-select-auto {
 +  -webkit-user-select: auto !important;
 +  /* stylelint-disable-line declaration-no-important */
 +  -ms-user-select: none; }
 +
 +.user-select-none {
 +  -webkit-user-select: none !important;
 +  /* stylelint-disable-line declaration-no-important */
 +  -ms-user-select: none; }
 +
  body {
    -webkit-font-smoothing: antialiased;
    -moz-osx-font-smoothing: grayscale; }