mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-69945-master' of git://github.com/lucaboesch/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2020-10-21 16:03:20 +08:00
commit 04d7c59e30
4 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/templates/month_detailed.mustache
View File

@ -112,7 +112,7 @@
{{/draggable}}>
<a data-action="view-event" data-event-id="{{id}}" href="{{url}}" title="{{name}}">
<span class="badge badge-circle calendar_event_{{normalisedeventtype}}">
<span class="calendar-circle calendar_event_{{normalisedeventtype}}">
&nbsp;
</span>
{{> core_calendar/event_icon}}

59
theme/boost/scss/moodle/calendar.scss
View File

@ -159,41 +159,40 @@ $calendarEventColor: #0d5ca1 !default;
vertical-align: initial;
}
.badge {
&.badge-circle {
width: 12px;
height: 12px;
border-radius: 6px;
vertical-align: middle;
.calendar-circle {
width: 12px;
height: 12px;
border-radius: 6px;
vertical-align: middle;
display: inline-block;
&.calendar_event_category {
background-color: $calendarEventCategoryColor;
border: $calendarEventCategoryBorder;
}
&.calendar_event_course {
background-color: $calendarEventCourseColor;
border: $calendarEventCourseBorder;
}
&.calendar_event_category {
background-color: $calendarEventCategoryColor;
border: $calendarEventCategoryBorder;
}
&.calendar_event_course {
background-color: $calendarEventCourseColor;
border: $calendarEventCourseBorder;
}
&.calendar_event_site {
background-color: $calendarEventGlobalColor;
border: $calendarEventGlobalBorder;
}
&.calendar_event_site {
background-color: $calendarEventGlobalColor;
border: $calendarEventGlobalBorder;
}
&.calendar_event_group {
background-color: $calendarEventGroupColor;
border: $calendarEventGroupBorder;
}
&.calendar_event_group {
background-color: $calendarEventGroupColor;
border: $calendarEventGroupBorder;
}
&.calendar_event_user {
background-color: $calendarEventUserColor;
border: $calendarEventUserBorder;
}
&.calendar_event_user {
background-color: $calendarEventUserColor;
border: $calendarEventUserBorder;
}
&.calendar_event_other {
background-color: $calendarEventOtherColor;
border: $calendarEventOtherBorder;
}
&.calendar_event_other {
background-color: $calendarEventOtherColor;
border: $calendarEventOtherBorder;
}
}
}

17
theme/boost/style/moodle.css
View File

@ -12856,27 +12856,28 @@ input[disabled] {
margin-left: 0.25em;
margin-right: 0.25em;
vertical-align: initial; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle {
width: 12px;
height: 12px;
border-radius: 6px;
vertical-align: middle; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_category {
vertical-align: middle;
display: inline-block; }
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_category {
background-color: #e0cbe0;
border: 2px solid #9e619f; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_course {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_course {
background-color: #ffd3bd;
border: 2px solid #d34600; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_site {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_site {
background-color: #d6f8cd;
border: 2px solid #2b8713; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_group {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_group {
background-color: #fee7ae;
border: 2px solid #9a6e02; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_user {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_user {
background-color: #dce7ec;
border: 2px solid #4e7c91; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_other {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_other {
background-color: #ced4da;
border: 2px solid #687889; }
.path-calendar .maincalendar .calendarmonth td {

17
theme/classic/style/moodle.css
View File

@ -13070,27 +13070,28 @@ input[disabled] {
margin-left: 0.25em;
margin-right: 0.25em;
vertical-align: initial; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle {
width: 12px;
height: 12px;
border-radius: 6px;
vertical-align: middle; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_category {
vertical-align: middle;
display: inline-block; }
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_category {
background-color: #e0cbe0;
border: 2px solid #9e619f; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_course {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_course {
background-color: #ffd3bd;
border: 2px solid #d34600; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_site {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_site {
background-color: #d6f8cd;
border: 2px solid #2b8713; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_group {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_group {
background-color: #fee7ae;
border: 2px solid #9a6e02; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_user {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_user {
background-color: #dce7ec;
border: 2px solid #4e7c91; }
.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_other {
.path-calendar .maincalendar .calendarmonth ul li .calendar-circle.calendar_event_other {
background-color: #ced4da;
border: 2px solid #687889; }
.path-calendar .maincalendar .calendarmonth td {