From 8abc94d37bf75d9c9d595eeba8d967da57729eca Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 29 Jun 2017 18:03:19 +0200
Subject: [PATCH 1/2] Replace folder images in the drive

---
 www/drive/file.less | 4 ++--
 www/drive/main.js   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/drive/file.less b/www/drive/file.less
index d5840332b..55c25da66 100644
--- a/www/drive/file.less
+++ b/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;
     }
 }
 
diff --git a/www/drive/main.js b/www/drive/main.js
index f2acbea38..394b48fd2 100644
--- a/www/drive/main.js
+++ b/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"});

From ed0121d172a82596864562988d2c6d60b61980fb Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 29 Jun 2017 18:05:34 +0200
Subject: [PATCH 2/2] Lint errors

---
 www/common/cryptpad-common.js | 2 +-
 www/pad/main.js               | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 92254b9fa..d82c013ab 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1275,7 +1275,7 @@ define([
                 setActive($val);
                 $innerblock.scrollTop($val.position().top + $innerblock.scrollTop());
             }
-            if (config.feedback) { Cryptpad.feedback(config.feedback); }
+            if (config.feedback) { common.feedback(config.feedback); }
         };
 
         $container.click(function (e) {
diff --git a/www/pad/main.js b/www/pad/main.js
index 654f34d5c..00e81e2b9 100644
--- a/www/pad/main.js
+++ b/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);