L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-69945 core_calendar: let circles appear as circles

Browse Source
This commit is contained in:
Luca Bösch
2020-10-16 15:43:50 +02:00
parent 81e84d2034
commit a04cc0b511
4 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/templates/month_detailed.mustache
+1 -1
View File
@@ -110,7 +110,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}}
theme/boost/scss/moodle/calendar.scss
+24 -26
View File
@@ -151,36 +151,34 @@ $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;
&.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;
}
}
}
theme/boost/style/moodle.css
+6 -6
View File
@@ -12458,24 +12458,24 @@ body.h5p-embed .h5pmessages {
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 {
.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 td {
theme/classic/style/moodle.css
+6 -6
View File
@@ -12699,24 +12699,24 @@ body.h5p-embed .h5pmessages {
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 {
.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 td {