Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Jun Pataleta 2017-10-04 11:19:33 +08:00
commit cd7cd9d9c1
66 changed files with 1410 additions and 123 deletions

View file

@ -1,12 +1,16 @@
/* calendar.less */
// Calendar colour variables defined.
$calendarEventCategoryColor: #d8bfd8 !default; // Pale purple.
$calendarEventCourseColor: #ffd3bd !default; // Pale red.
$calendarEventGlobalColor: #d6f8cd !default; // Pale green.
$calendarEventGroupColor: #fee7ae !default; // Pale yellow.
$calendarEventUserColor: #dce7ec !default; // Pale blue.
// Calendar event background colours defined.
.calendar_event_category {
background-color: $calendarEventCategoryColor;
}
.calendar_event_course {
background-color: $calendarEventCourseColor;
}
@ -129,6 +133,7 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
margin: 10px auto;
}
.calendar_event_category,
.calendar_event_course,
.calendar_event_site,
.calendar_event_group,
@ -141,6 +146,9 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
}
}
.calendar_event_category {
border-color: $calendarEventCategoryColor;
}
.calendar_event_course {
border-color: $calendarEventCourseColor;
}
@ -231,6 +239,15 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
}
}
&.duration_category {
border-top: 1px solid $calendarEventCategoryColor;
border-bottom: 1px solid $calendarEventCategoryColor;
&.duration_finish {
background-color: $calendarEventCategoryColor;
}
}
&.duration_course {
border-top: 1px solid $calendarEventCourseColor;
border-bottom: 1px solid $calendarEventCourseColor;