Merge branch 'staging' into inviteUI

2019-12-18 15:12:43 +01:00
parent 091ffc6070 a34aad78ab
commit e6e1ef72e7
21 changed files with 577 additions and 177 deletions
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -493,8 +493,9 @@ define([
        refreshCreate(common, cb);
    });

-    makeBlock('drive', function (common, cb) {
+    makeBlock('drive', function (common, cb, $div) {
        $('div.cp-team-drive').empty();
+        $div.removeClass('cp-sidebarlayout-element'); // Don't apply buttons and input styles from sidebarlayout
        var content = [
            h('div.cp-app-drive-container', {tabindex:0}, [
                h('div#cp-app-drive-tree'),