Merge branch 'MDL-52371-Activity-Chooser-alignment-of-strings-that-need-line-wrap' of git://github.com/synergylearning/moodle

theme/base/style/core.css

@@ -1628,6 +1628,14 @@ sup {vertical-align: super;}
     -webkit-box-shadow: inset 0px 0px 30px 0px #CCCCCC;
     -moz-box-shadow: inset 0px 0px 30px 0px #CCCCCC;
 }
+.jschooser .choosercontainer #chooseform .alloptions .option input[type=radio],
+.jschooser .choosercontainer #chooseform .alloptions .option .modicon {
+    display: inline-block;
+}
+.jschooser .choosercontainer #chooseform .alloptions .option .typename {
+    display: inline-block;
+    width: 65%;
+}
 .dir-rtl.jschooser .choosercontainer #chooseform .alloptions {
     max-width: 18.3em;
 }

theme/bootstrapbase/less/moodle/core.less

@@ -1710,6 +1710,18 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
     overflow-y: auto;
     max-width: 20.3em;
     .box-shadow(inset 0 0 30px 0px #ccc);
+    .option {
+        input[type=radio] {
+            display: inline-block;
+        }
+        .modicon {
+            display: inline-block;
+        }
+        .typename {
+            display: inline-block;
+            width: 65%;
+        }
+    }
 }
 .dir-rtl.jschooser .choosercontainer #chooseform .alloptions {
     max-width: 18.3em;