Merge branch 'master' of github.com:chamilo/chamilo-lms

assets/css/app.scss

@@ -259,6 +259,11 @@
     @apply -mt-2 mx-2;
   }
 
+  // free-jqGrid override
+  .ui-jqgrid-bootstrap.modal {
+    @apply bg-white;
+  }
+
   @import "scss/index.scss";
 }
 

public/main/inc/lib/display.lib.php

@@ -1194,7 +1194,7 @@ class Display
         $obj->datatype = 'json';
         $obj->viewrecords = 'true';
         $obj->guiStyle = 'bootstrap4';
-        $obj->iconSet = 'fontAwesomeSolid';
+        $obj->iconSet = 'materialDesignIcons';
         $all_value = 10000000;
 
         // Sets how many records we want to view in the grid