Merge branch 'MDL-59820-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE

calendar/renderer.php

@@ -606,7 +606,7 @@ class core_calendar_renderer extends plugin_renderer_base {
         $courseurl = new moodle_url($returnurl);
         $courseurl->remove_params('course');
         $select = new single_select($courseurl, 'course', $courseoptions, $selected, null);
-        $select->class = 'cal_courses_flt m-r-1';
+        $select->class = 'm-r-1';
         if ($label !== null) {
             $select->set_label($label);
         } else {

theme/bootstrapbase/less/moodle/calendar.less

@@ -58,13 +58,6 @@
             width: 100%;
         }
     }
-    .cal_courses_flt {
-        float: left;
-
-        label {
-            margin-right: .45em;
-        }
-    }
     .maincalendar {
         vertical-align: top;
         padding: 0;

theme/bootstrapbase/style/moodle.css

@@ -5586,12 +5586,6 @@ img.iconsmall {
   border-spacing: 2px;
   width: 100%;
 }
-.path-calendar .cal_courses_flt {
-  float: left;
-}
-.path-calendar .cal_courses_flt label {
-  margin-right: .45em;
-}
 .path-calendar .maincalendar {
   vertical-align: top;
   padding: 0;