MDL-42887 Form collapsing CSS fixes.

.fcontainer is not guaranteed to be in the form - we still need something else
for this selector to make it specific enough - so have replaced with #region-main (required).

Also - redid the question edit styles to be specific enough.

theme/base/style/core.css

@@ -331,44 +331,44 @@ input#id_externalurl {direction:ltr;}
 /**
  * Show the labels above text editors and file managers except on wide screens.
  */
-.mform .fcontainer .fitem .fitemtitle label {
+#region-main .mform .fitem .fitemtitle label {
     font-weight: bold;
 }
 @media (max-width: 1199px) {
-    .mform .fcontainer .fitem .fitemtitle {
+    #region-main .mform .fitem .fitemtitle {
         display: block;
         margin-top: 4px;
         margin-bottom: 4px;
         text-align: left;
         width: 100%;
     }
-    .dir-rtl .mform .fcontainer .fitem .fitemtitle {
+    .dir-rtl #region-main .mform .fitem .fitemtitle {
         text-align: right;
     }
 
-    .mform .fcontainer .fitem .felement {
+    #region-main .mform .fitem .felement {
         margin-left: 0;
         width: 100%;
         float: left;
         margin-bottom: 6px;
         padding-left: 0;
         padding-right: 0;
     }
-    .dir-rtl .mform .fcontainer .fitem .felement {
+    .dir-rtl #region-main .mform .fitem .felement {
         margin-right: 0;
         float: right;
         padding-right: 0;
         padding-left: 0;
     }
-    .mform .fcontainer .fitem_fcheckbox .fitemtitle,
-    .mform .fcontainer .fitem_fcheckbox .felement {
+    #region-main .mform .fitem_fcheckbox .fitemtitle,
+    #region-main .mform .fitem_fcheckbox .felement {
         display: inline-block;
         width: auto;
     }
-    .dir-rtl .mform .fcontainer .fitem_fcheckbox .felement {
+    .dir-rtl #region-main .mform .fitem_fcheckbox .felement {
         float: right;
     }
-    .mform .fcontainer .fitem_fcheckbox .felement {
+    #region-main .mform .fitem_fcheckbox .felement {
         padding: 6px;
     }
 }

theme/base/style/question.css

@@ -131,21 +131,21 @@ body.path-question-type .fitem_fgroup .accesshide {font: inherit;left: 0;positio
 }
 
 /* Add a little padding to the answer sections of edit question forms. */
-.path-question-type.editing #id_answerhdr .fitem .fitemtitle,
-.path-question-type.editing #id_answerhdr .fitem .felement {
+.path-question-type #id_answerhdr .fitem .fitemtitle,
+.path-question-type #id_answerhdr .fitem .felement {
     margin-left: 6px;
     margin-right: 6px;
 }
-.path-question-type.editing #id_answerhdr .fitem_feditor .felement {
+.path-question-type #id_answerhdr .fitem_feditor .felement {
     margin-left: 0px;
     margin-right: 0px;
 }
 @media (min-width: 1200px) {
-    .path-question-type.editing #id_answerhdr .fitem_feditor .felement {
+    .path-question-type #id_answerhdr .fitem_feditor .felement {
         margin-left: 16%;
         margin-right: 0px;
     }
-    .dir-rtl .path-question-type.editing #id_answerhdr .fitem_feditor .felement {
+    .dir-rtl .path-question-type #id_answerhdr .fitem_feditor .felement {
         margin-right: 16%;
         margin-left: 0px;
     }

theme/bootstrapbase/less/moodle/forms.less

@@ -386,42 +386,44 @@ fieldset.coursesearchbox label {
 /**
  * Show the labels above text editors and file managers except on wide screens.
  */
-.mform .fcontainer .fitem .fitemtitle label {
+#region-main .mform .fitem .fitemtitle label {
     font-weight: bold;
 }
 @media (max-width: 1199px) {
-    .mform .fcontainer .fitem .fitemtitle {
+    #region-main .mform .fitem .fitemtitle {
         display: block;
         margin-top: 4px;
         margin-bottom: 4px;
         text-align: left;
         width: 100%;
     }
-    .dir-rtl .mform .fcontainer .fitem .fitemtitle {
+    .dir-rtl #region-main .mform .fitem .fitemtitle {
         text-align: right;
     }
 
-    .mform .fcontainer .fitem .felement {
+    #region-main .mform .fitem .felement {
         margin-left: 0;
         width: 100%;
         float: left;
+        margin-bottom: 6px;
         padding-left: 0;
         padding-right: 0;
     }
-    .dir-rtl .mform .fcontainer .fitem .felement {
+    .dir-rtl #region-main .mform .fitem .felement {
         margin-right: 0;
-        padding-left: 0;
+        float: right;
         padding-right: 0;
+        padding-left: 0;
     }
-    .mform .fcontainer .fitem_fcheckbox .fitemtitle,
-    .mform .fcontainer .fitem_fcheckbox .felement {
+    #region-main .mform .fitem_fcheckbox .fitemtitle,
+    #region-main .mform .fitem_fcheckbox .felement {
         display: inline-block;
         width: auto;
     }
-    .dir-rtl .mform .fcontainer .fitem_fcheckbox .felement {
+    .dir-rtl #region-main .mform .fitem_fcheckbox .felement {
         float: right;
     }
-    .mform .fcontainer .fitem_fcheckbox .felement {
+    #region-main .mform .fitem_fcheckbox .felement {
         padding: 6px;
     }
 }

theme/bootstrapbase/less/moodle/question.less

@@ -462,12 +462,12 @@ a#hidebankcmd {
 }
 
 /* Add a little padding to the answer sections of edit question forms. */
-.path-question-type.editing #id_answerhdr .fitem .fitemtitle,
-.path-question-type.editing #id_answerhdr .fitem .felement {
+.path-question-type #id_answerhdr .fitem .fitemtitle,
+.path-question-type #id_answerhdr .fitem .felement {
     margin-left: 6px;
     margin-right: 6px;
 }
-.path-question-type.editing #id_answerhdr .fitem_feditor .felement {
+.path-question-type #id_answerhdr .fitem_feditor .felement {
     margin-left: 0px;
     margin-right: 0px;
 }