Merge branch 'staging' into ro

2019-10-08 17:22:44 +02:00
parent 3015d7f22b d9e7fc24fe
commit e0a1b8724b
12 changed files with 128 additions and 26 deletions
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1141,6 +1141,9 @@ define([
                        //hide.push('download');
                        hide.push('openincode');
                    }
+                    if ($element.is('.cp-border-color-sheet')) {
+                        hide.push('download');
+                    }
                    if ($element.is('.cp-app-drive-element-file')) {
                        // No folder in files
                        hide.push('color');