Merge branch 'staging' into newdrive

2017-09-25 17:35:06 +02:00
parent d2f1d0c0e9 a8eecee590
commit cdeac00633
19 changed files with 105 additions and 92 deletions
--- a/customize.dist/src/less2/include/fileupload.less
+++ b/customize.dist/src/less2/include/fileupload.less
@@ -28,6 +28,11 @@
            td {
                padding: @upload_pad_h @upload_pad_v;
            }
+            .cp-fileupload-table-link {
+                .fa {
+                    margin-right: 5px;
+                }
+            }
            .cp-fileupload-table-progress {
                width: 200px;
                position: relative;
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -650,6 +650,14 @@
                    }
                }
            }
+            p.cp-toolbar-account {
+                &> span {
+                    font-weight: bold;
+                    span {
+                        font-weight: normal;
+                    }
+                }
+            }
            .cp-toolbar-backup {
                margin: 0;
                border-radius: 0;