Merge branch 'MDL-39684-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css

theme/base/style/filemanager.css

@@ -283,7 +283,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
  /*
  * File Manager layout
  */
-.fp-restrictions{text-align: right;}
+.filemanager .fp-restrictions {text-align:right;}
 .filemanager .fp-navbar {background: #F2F2F2;border-top: 1px solid #BBBBBB;border-left: 1px solid #BBBBBB;border-right: 1px solid #BBBBBB;}
 .filemanager-toolbar{padding: 5px 8px;min-height:22px;}
 .fp-pathbar {border-top: 1px solid #BBBBBB;padding: 5px 8px 1px;min-height: 20px;}
@@ -420,3 +420,4 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
 .dir-rtl .filepicker .yui-layout-unit-center {left: 0;}
 .dir-rtl #filemenu .yuimenuitemlabel {text-align: right;}
 .dir-rtl .filemanager-container .yui3-skin-sam .yui3-datatable-header {text-align: right;}
+.dir-rtl .filemanager .fp-restrictions { text-align: left; }

theme/bootstrapbase/less/moodle/filemanager.less

@@ -813,8 +813,10 @@ a.ygtvspacer:hover {
     display: none;
 }
 // File Manager layout
-.fp-restrictions{
-    text-align: right;
+.filemanager {
+    .fp-restrictions{
+        text-align: right;
+    }
 }
 .filemanager .fp-navbar {
     background: #F2F2F2;
@@ -1151,17 +1153,27 @@ a.ygtvspacer:hover {
 .file-picker div.bd {
     text-align: left;
 }
+
 // RTL Overrides
-.dir-rtl .file-picker div.bd,
-.dir-rtl .file-picker .fp-pathbar,
-.dir-rtl .file-picker .fp-list,
-.dir-rtl #filemenu .yuimenuitemlabel,
-.dir-rtl .filemanager-container .yui3-skin-sam .yui3-datatable-header {
-    text-align: right;
-}
-.dir-rtl .filepicker .yui-layout-unit-left {
-    left: 500px;
-}
-.dir-rtl .filepicker .yui-layout-unit-center {
-    left: 0;
+.dir-rtl {
+    .filemanager {
+        .fp-restrictions{
+            text-align: left;
+        }
+    }
+    .file-picker div.bd,
+    .file-picker .fp-pathbar,
+    .file-picker .fp-list,
+    #filemenu .yuimenuitemlabel,
+    .filemanager-container .yui3-skin-sam .yui3-datatable-header {
+        text-align: right;
+    }
+    .filepicker {
+        .yui-layout-unit-left {
+            left: 500px;
+        }
+        .yui-layout-unit-center {
+            left: 0;
+        }
+    }
 }