Merge branch 'mdl59843-master' of https://github.com/tlock/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 00:22:01 +0000 (13:22 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 00:22:01 +0000 (13:22 +1300)
theme/boost/scss/moodle/modules.scss
theme/bootstrapbase/less/moodle/modules.less
theme/bootstrapbase/style/moodle.css

index a7ea755..7c1976b 100644 (file)
@@ -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 */
 }
index dfbe424..bf26b2f 100644 (file)
@@ -266,6 +266,10 @@ div#dock {
         float: left;
         padding-right: 1em;
     }
+
+    .horizontal .choices .option {
+        display: inline-block;
+    }
 }
 
 // Lesson module
index 70fbd7f..20ef913 100644 (file)
@@ -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;