Merge branch 'MDL-74813-311' of https://github.com/mihailges/moodle i…

…nto MOODLE_311_STABLE
moodle · Jul 6, 2022 · d7f72ff · d7f72ff
2 parents b7d7906 + 60d8572
commit d7f72ff
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -2725,10 +2725,18 @@ public function render_file_picker(file_picker $fp) {
             $html .= <<<EOD
     <div id="file_info_{$client_id}" class="mdl-left filepicker-filelist" style="position: relative">
     <div class="filepicker-filename">
-        <div class="filepicker-container">$currentfile<div class="dndupload-message">$strdndenabled <br/><div class="dndupload-arrow"></div></div></div>
+        <div class="filepicker-container">$currentfile
+            <div class="dndupload-message">$strdndenabled <br/>
+                <div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
+            </div>
+        </div>
         <div class="dndupload-progressbars"></div>
     </div>
-    <div><div class="dndupload-target">{$strdroptoupload}<br/><div class="dndupload-arrow"></div></div></div>
+    <div>
+        <div class="dndupload-target">{$strdroptoupload}<br/>
+            <div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
+        </div>
+    </div>
     </div>
 EOD;
         }

diff --git a/lib/templates/filemanager_page_generallayout.mustache b/lib/templates/filemanager_page_generallayout.mustache
@@ -80,9 +80,17 @@
         <div class="fm-content-wrapper">
             <div class="fp-content"></div>
             <div class="fm-empty-container">
-                <div class="dndupload-message">{{#str}}dndenabled_inbox{{/str}}<br/><div class="dndupload-arrow"></div></div>
+                <div class="dndupload-message">{{#str}}dndenabled_inbox{{/str}}<br/>
+                    <div class="dndupload-arrow d-flex">
+                        <i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i>
+                    </div>
+                </div>
+            </div>
+            <div class="dndupload-target">{{#str}}droptoupload{{/str}}<br/>
+                <div class="dndupload-arrow d-flex">
+                    <i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i>
+                </div>
             </div>
-            <div class="dndupload-target">{{#str}}droptoupload{{/str}}<br/><div class="dndupload-arrow"></div></div>
             <div class="dndupload-progressbars"></div>
             <div class="dndupload-uploadinprogress">{{#pix}}i/loading_small{{/pix}}<span class="sr-only">{{#str}}loadinghelp{{/str}}</span></div>
         </div>

diff --git a/theme/boost/scss/moodle/filemanager.scss b/theme/boost/scss/moodle/filemanager.scss
@@ -839,11 +839,11 @@ a.ygtvspacer:hover {
 }
 
 .dndupload-arrow {
-    background: url([[pix:theme|fp/dnd_arrow]]) center no-repeat;
     width: 100%;
     height: 80px;
     position: absolute;
     top: 5px;
+    color: $gray-500;
 }
 
 .fitem.disabled .filepicker-container,

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -15025,11 +15025,11 @@ a.ygtvspacer:hover {
   display: block; }
 
 .dndupload-arrow {
-  background: url([[pix:theme|fp/dnd_arrow]]) center no-repeat;
   width: 100%;
   height: 80px;
   position: absolute;
-  top: 5px; }
+  top: 5px;
+  color: #8f959e; }
 
 .fitem.disabled .filepicker-container,
 .fitem.disabled .fm-empty-container {

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -15249,11 +15249,11 @@ a.ygtvspacer:hover {
   display: block; }
 
 .dndupload-arrow {
-  background: url([[pix:theme|fp/dnd_arrow]]) center no-repeat;
   width: 100%;
   height: 80px;
   position: absolute;
-  top: 5px; }
+  top: 5px;
+  color: #8f959e; }
 
 .fitem.disabled .filepicker-container,
 .fitem.disabled .fm-empty-container {