Merge branch 'MDL-68330-master-2' of git://github.com/mihailges/moodle

diff --git a/course/renderer.php b/course/renderer.php
index 784d6ee..6f1a956 100644 (file)
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -903,7 +903,7 @@ class core_course_renderer extends plugin_renderer_base {
             $output .= course_get_cm_move($mod, $sectionreturn);
         }
 
-        $output .= html_writer::start_tag('div', array('class' => 'mod-indent-outer'));
+        $output .= html_writer::start_tag('div', array('class' => 'mod-indent-outer w-100'));
 
         // This div is used to indent the content.
         $output .= html_writer::div('', $indentclasses);

diff --git a/media/player/videojs/classes/plugin.php b/media/player/videojs/classes/plugin.php
index 1f29e2e..dfcf80a 100644 (file)
--- a/media/player/videojs/classes/plugin.php
+++ b/media/player/videojs/classes/plugin.php
@@ -201,7 +201,7 @@ class media_videojs_plugin extends core_media_player_native {
             }
         }
 
-        return html_writer::div($text, 'mediaplugin mediaplugin_videojs');
+        return html_writer::div($text, 'mediaplugin mediaplugin_videojs d-block');
     }
 
     /**