Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

theme/bootstrapbase/less/moodle/filemanager.less

@@ -1196,4 +1196,59 @@ a.ygtvspacer:hover {
             left: 0;
         }
     }
-}
+}
+// Upload form for file picker.
+.fp-formset {
+    max-width: 500px;
+    padding: 10px;
+    input[type="file"] {
+        line-height: inherit;
+    }
+}
+.fp-forminset {
+    max-width: 400px;
+    padding: 10px;
+    .control-group {
+        label.control-label {
+           width: 105px;
+        }
+        .controls {
+            margin-left: 125px;
+        }
+    }
+    .fp-select-buttons {
+        float: none;
+    }
+
+}
+
+.dir-rtl .fp-forminset {
+    max-width: 400px;
+    .control-group {
+        label.control-label {
+            float: right;
+            text-align: left;
+        }
+        .controls {
+            margin-left: 0;
+            margin-right: 125px;
+        }
+    }
+    .fp-select-buttons {
+        float: left;
+    }
+    input[type="text"] {
+        width: 248px;
+    }
+}
+
+.dir-rtl .filepicker .fp-formset {
+    label {
+        float: right;
+        text-align: left;
+    }
+    .controls {
+        margin-left: 0;
+        text-align: right;
+    }
+}

theme/bootstrapbase/less/moodle/responsive.less

@@ -99,9 +99,11 @@
         }
     }
 
+    .fp-formset div {
+        height: auto;
+    }
 }
 
-// login page
 @media (min-width: 1200px) {
     .loginbox.twocolumns .loginpanel {
         margin-left: 0;
@@ -537,3 +539,26 @@
        text-align: left;
    }
 }
+
+
+// File Picker.
+@media (max-width: 768px) {
+    .fp-forminset .control-group .controls {
+        margin-left: 0;
+    }
+    .dir-rtl .fp-formset .control-group {
+        label.control-label {
+            text-align: right;
+            float: none;
+        }
+    }
+    .dir-rtl .fp-forminset .control-group {
+        label.control-label {
+            text-align: right;
+            float: none;
+        }
+        .controls {
+            margin-right: 0;
+        }
+    }
+}