Merge branch 'mdl59843-master' of https://github.com/tlock/moodle

diff --combined theme/bootstrapbase/style/moodle.css
index 70fbd7f,6789117..20ef913
--- 1/theme/bootstrapbase/style/moodle.css
--- 2/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@@ -5563,9 -5563,6 +5563,9 @@@ img.iconsmall 
    background-color: #fcf8e3;
  }
  /* calendar.less */
 +.calendar_event_category {
 +  background-color: #d8bfd8;
 +}
  .calendar_event_course {
    background-color: #ffd3bd;
  }
@@@ -5580,7 -5577,6 +5580,7 @@@
  }
  .path-calendar .calendartable {
    width: 100%;
 +  table-layout: fixed;
  }
  .path-calendar .calendartable th,
  .path-calendar .calendartable td {
@@@ -5637,45 -5633,10 +5637,45 @@@
  }
  .path-calendar .maincalendar .calendarmonth ul {
    margin: 0;
 +  padding: 0;
  }
  .path-calendar .maincalendar .calendarmonth ul li {
    list-style-type: none;
 -  margin-top: 4px;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li > a {
 +  overflow: hidden;
 +  text-overflow: ellipsis;
 +  white-space: nowrap;
 +  max-width: 100%;
 +  display: inline-block;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li .icon {
 +  margin-left: 0.25em;
 +  margin-right: 0.25em;
 +  padding: 0;
 +  vertical-align: initial;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle {
 +  width: 12px;
 +  height: 12px;
 +  padding: 0;
 +  border-radius: 6px;
 +  vertical-align: middle;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_category {
 +  background-color: #d8bfd8;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_course {
 +  background-color: #ffd3bd;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_site {
 +  background-color: #d6f8cd;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_group {
 +  background-color: #fee7ae;
 +}
 +.path-calendar .maincalendar .calendarmonth ul li .badge.badge-circle.calendar_event_user {
 +  background-color: #dce7ec;
  }
  .path-calendar .maincalendar .calendarmonth td {
    height: 5em;
@@@ -5694,7 -5655,6 +5694,7 @@@
    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,
@@@ -5702,9 -5662,6 +5702,9 @@@
    color: #003d5c;
    text-decoration: underline;
  }
 +.path-calendar .maincalendar .calendar_event_category {
 +  border-color: #d8bfd8;
 +}
  .path-calendar .maincalendar .calendar_event_course {
    border-color: #ffd3bd;
  }
@@@ -5726,9 -5683,10 +5726,9 @@@
  }
  .path-calendar .maincalendar .calendartable td,
  .path-calendar .maincalendar .calendartable li {
 -  padding: 5px;
 +  padding: 0 4px 4px 4px;
  }
  .path-calendar .maincalendar .calendartable li {
 -  padding-left: 10px;
    text-align: left;
  }
  .path-calendar .maincalendar .header {
@@@ -5810,13 -5768,6 +5810,13 @@@
  .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;
@@@ -5870,18 -5821,32 +5870,18 @@@
    margin-bottom: 0.2em;
  }
  .block .calendar_filters li span img {
 +  margin: 0 0.25em;
 +}
 +.block .calendar_filters li span .icon {
    padding: 0 0.2em;
  }
 -.block .calendar_filters .eventname {
 -  padding-left: 0.2em;
 +.block .calendar_filters li .icon {
 +  padding: 0;
 +  margin-left: 0.25em;
  }
  .block .content h3.eventskey {
    margin-top: 0.5em;
  }
 -.ical-link {
 -  font-size: 10px;
 -  font-weight: bold;
 -  background-color: #f60;
 -  padding: 0 5px;
 -  color: #fff;
 -  border-top: 1px solid #f93;
 -  border-left: 1px solid #f93;
 -  border-bottom: 1px solid #013;
 -  border-right: 1px solid #013;
 -}
 -.ical-link:hover,
 -.ical-link:active,
 -.ical-link:focus,
 -.ical-link:visited {
 -  color: #fff;
 -  text-decoration: none;
 -}
  @media (min-width: 768px) {
    #page-calender-view .container-fluid {
      min-width: 1024px;
@@@ -17401,6 -17366,9 +17401,9 @@@ div#dock 
    float: left;
    padding-right: 1em;
  }
+ .path-mod-choice .horizontal .choices .option {
+   display: inline-block;
+ }
  .path-mod-lesson .firstpageoptions {
    margin: auto;
    min-width: 280px;
@@@ -21942,6 -21910,3 +21945,6 @@@ ul.indented-list 
  .bg-primary[href] {
    background-color: #0378a9;
  }
 +.bg-faded {
 +  background-color: #eee;
 +}