Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/drive/file.less

@@ -154,8 +154,8 @@ li {
 
 span {
     &.fa-folder, &.fa-folder-open {
-        color: #FEDE8B;
-        text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
+        //color: #FEDE8B;
+        //text-shadow: -1px 0 black, 0 1px black, 1px 0 black, 0 -1px black;
     }
 }
 

www/drive/main.js

@@ -152,11 +152,11 @@ define([
     };
 
     // Icons
-    //var $folderIcon = $('<span>', {"class": "fa fa-folder folder icon"});
-    var $folderIcon = $('<img>', {src: "/customize/images/icons/folder.svg", "class": "folder icon"});
+    var $folderIcon = $('<span>', {"class": "fa fa-folder folder icon"});
+    //var $folderIcon = $('<img>', {src: "/customize/images/icons/folder.svg", "class": "folder icon"});
     var $folderEmptyIcon = $folderIcon.clone();
-    //var $folderOpenedIcon = $('<span>', {"class": "fa fa-folder-open folder"});
-    var $folderOpenedIcon = $('<img>', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"});
+    var $folderOpenedIcon = $('<span>', {"class": "fa fa-folder-open folder"});
+    //var $folderOpenedIcon = $('<img>', {src: "/customize/images/icons/folderOpen.svg", "class": "folder icon"});
     var $folderOpenedEmptyIcon = $folderOpenedIcon.clone();
     //var $upIcon = $('<span>', {"class": "fa fa-arrow-circle-up"});
     var $unsortedIcon = $('<span>', {"class": "fa fa-files-o"});

www/pad/main.js

@@ -496,7 +496,6 @@ define([
                     editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
                 }
 
-                var $existingButton = $bar.find('#cke_1_toolbar_collapser').hide();
                 if (!readOnly) {
                     // Expand / collapse the toolbar
                     var $collapse = Cryptpad.createButton(null, true);