moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

17
theme/boost/scss/moodle/calendar.scss
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;

15
theme/bootstrapbase/less/moodle/calendar.less
View file

@ -1,12 +1,16 @@
/* calendar.less */
// Calendar colour variables defined.
@calendarEventCategoryColor: #d8bfd8; // Pale purple.
@calendarEventCourseColor: #ffd3bd; // Pale red.
@calendarEventGlobalColor: #d6f8cd; // Pale green.
@calendarEventGroupColor: #fee7ae; // Pale yellow.
@calendarEventUserColor: #dce7ec; // Pale blue.
// Calendar event background colours defined.
.calendar_event_category {
background-color: @calendarEventCategoryColor;
}
.calendar_event_course {
background-color: @calendarEventCourseColor;
}
@ -110,6 +114,7 @@
width: 98%;
margin: 10px auto;
}
.calendar_event_category,
.calendar_event_course,
.calendar_event_site,
.calendar_event_group,
@ -121,6 +126,9 @@
}
}
}
.calendar_event_category {
border-color: @calendarEventCategoryColor;
}
.calendar_event_course {
border-color: @calendarEventCourseColor;
}
@ -244,6 +252,13 @@
background-color: @calendarEventGlobalColor;
}
}
&.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;

14
theme/bootstrapbase/style/moodle.css
View file

@ -5563,6 +5563,9 @@ img.iconsmall {
background-color: #fcf8e3;
}
/* calendar.less */
.calendar_event_category {
background-color: #d8bfd8;
}
.calendar_event_course {
background-color: #ffd3bd;
}
@ -5655,6 +5658,7 @@ img.iconsmall {
width: 98%;
margin: 10px auto;
}
.path-calendar .maincalendar .calendar_event_category:hover a,
.path-calendar .maincalendar .calendar_event_course:hover a,
.path-calendar .maincalendar .calendar_event_site:hover a,
.path-calendar .maincalendar .calendar_event_group:hover a,
@ -5662,6 +5666,9 @@ img.iconsmall {
color: #003d5c;
text-decoration: underline;
}
.path-calendar .maincalendar .calendar_event_category {
border-color: #d8bfd8;
}
.path-calendar .maincalendar .calendar_event_course {
border-color: #ffd3bd;
}
@ -5768,6 +5775,13 @@ img.iconsmall {
.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;
}
.block .minicalendar td.duration_category.duration_finish {
background-color: #d8bfd8;
}
.block .minicalendar td.duration_course {
border-top: 1px solid #ffd3bd;
border-bottom: 1px solid #ffd3bd;