manual merge

2017-11-09 15:38:32 +01:00
parent 75130150d5 cf5ccf04f2
commit 840cd91bcb
24 changed files with 2068 additions and 673 deletions
--- a/www/drive/app-drive.less
+++ b/www/drive/app-drive.less
@@ -280,8 +280,8 @@ span {
    .cp-app-drive-tree-category:last-child {
        margin-bottom: 20px;
    }
-    .limit-container {
-        margin-top: 0;
+    .cp-limit-container {
+        margin-top: 5px;
    }
    #cp-app-drive-tree-search {
        text-align: center;