Merge branch 'MDL-56178-master' of git://github.com/FMCorz/moodle

theme/boost/scss/moodle/question.scss

@@ -207,10 +207,23 @@
     margin-right: 0.3em;
 }
 
-body.path-question-type .fitem_fgroup .accesshide {
-    font: inherit;
-    position: static;
-    padding-right: .3em;
+body.path-question-type {
+    /* Hacks to display the labels within a form group. */
+    .fitem_fgroup .accesshide {
+        font: inherit;
+        position: static;
+        padding-right: .3em;
+    }
+    .form-group .sr-only {
+        position: static;
+        width: auto;
+        height: auto;
+        padding: 0;
+        margin: 0;
+        overflow: visible;
+        clip: auto;
+        border: 0;
+    }
 }
 
 .que {

theme/bootstrapbase/less/moodle/forms.less

@@ -102,14 +102,6 @@ form {
     display: inline;
     float: none;
 }
-.mform .ftags label.accesshide {
-    display: block;
-    position: static;
-}
-.mform .ftags select {
-    margin-bottom: 0.7em;
-    min-width: 22em;
-}
 .mform .helplink img {
     margin: 0 .45em;
     padding: 0;

theme/bootstrapbase/less/moodle/question.less

@@ -177,6 +177,7 @@
     margin-right: 0.3em;
 }
 body.path-question-type .fitem_fgroup .accesshide {
+    /* Hack to display the labels within a form group. */
     font: inherit;
     position: static;
     padding-right: .3em;

theme/bootstrapbase/style/moodle.css

@@ -6340,6 +6340,7 @@ table.message .searchresults td {
   margin-right: 0.3em;
 }
 body.path-question-type .fitem_fgroup .accesshide {
+  /* Hack to display the labels within a form group. */
   font: inherit;
   position: static;
   padding-right: .3em;
@@ -12862,14 +12863,6 @@ form {
   display: inline;
   float: none;
 }
-.mform .ftags label.accesshide {
-  display: block;
-  position: static;
-}
-.mform .ftags select {
-  margin-bottom: 0.7em;
-  min-width: 22em;
-}
 .mform .helplink img {
   margin: 0 .45em;
   padding: 0;