Merge branch 'mdl59843-master' of https://github.com/tlock/moodle

moodle · Oct 19, 2017 · 2fbb83f · 2fbb83f
2 parents 9644c0e + 1d6964d
commit 2fbb83f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
@@ -9,6 +9,14 @@ select {
     width: auto;
 }
 
+// Choice module
+
+.path-mod-choice {
+    .horizontal .choices .option {
+        display: inline-block;
+    }
+}
+
 .path-mod-feedback .feedback_form .col-form-label {
     display: block !important; /* stylelint-disable-line declaration-no-important */
 }

diff --git a/theme/bootstrapbase/less/moodle/modules.less b/theme/bootstrapbase/less/moodle/modules.less
@@ -266,6 +266,10 @@ div#dock {
         float: left;
         padding-right: 1em;
     }
+
+    .horizontal .choices .option {
+        display: inline-block;
+    }
 }
 
 // Lesson module

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
@@ -17401,6 +17401,9 @@ div#dock {
   float: left;
   padding-right: 1em;
 }
+.path-mod-choice .horizontal .choices .option {
+  display: inline-block;
+}
 .path-mod-lesson .firstpageoptions {
   margin: auto;
   min-width: 280px;