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

theme/boost/scss/moodle/modules.scss

@@ -237,6 +237,9 @@ div#dock {
 .path-mod-lesson .invisiblefieldset.fieldsetfix {
     display: block;
 }
+.path-mod-lesson .answeroption .checkbox label p {
+    display: inline;
+}
 
 .path-mod-wiki .wiki_headingtitle,
 .path-mod-wiki .midpad,

theme/bootstrapbase/less/moodle/modules.less

@@ -400,6 +400,10 @@ div#dock {
 .path-mod-lesson .answeroptiongroup .felement label p:last-child {
     margin-bottom: 0;
 }
+.path-mod-lesson .answeroption .fradio label p,
+.path-mod-lesson .answeroption .fcheckbox label p {
+    display: inline;
+}
 
 /**
  * Style for view.php

theme/bootstrapbase/style/moodle.css

@@ -17571,6 +17571,10 @@ div#dock {
 .path-mod-lesson .answeroptiongroup .felement label p:last-child {
   margin-bottom: 0;
 }
+.path-mod-lesson .answeroption .fradio label p,
+.path-mod-lesson .answeroption .fcheckbox label p {
+  display: inline;
+}
 /**
  * Style for view.php
  **/