Merge branch 'MDL-56197-33' of git://github.com/mihailges/moodle into…

… MOODLE_33_STABLE
moodle · Dec 11, 2017 · 5fd29e7 · 5fd29e7
2 parents 5fea116 + 384947b
commit 5fd29e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/theme/boost/scss/moodle/modules.scss b/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,

diff --git a/theme/bootstrapbase/less/moodle/modules.less b/theme/bootstrapbase/less/moodle/modules.less
@@ -448,6 +448,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

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
@@ -17457,6 +17457,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
  **/