Merge branch 'staging' into newCk

customize.dist/src/less/cryptpad.less

@@ -600,6 +600,52 @@ noscript {
     }
 }
 
+/* Upload status table */
+#uploadStatusContainer {
+    position: absolute;
+    left: 10vw; right: 10vw;
+    bottom: 100px;
+    background-color: rgba(0,0,0,0.5);
+    color: white;
+    opacity: 0.7;
+    font-family: Ubuntu,Georgia,Cambria,serif;
+    box-sizing: border-box;
+    z-index:10;
+    display: none;
+    #uploadStatus {
+        width: 80vw;
+        border: 1px solid black;
+        border-collapse: collapse;
+        tr:nth-child(1) {
+            background-color: #888;
+            border: 1px solid #999;
+            td { text-align: center; }
+        }
+        td {
+            border-left: 1px solid #BBB;
+            border-right: 1px solid #BBB;
+            padding: 0 10px;
+        }
+        .upProgress {
+            width: 200px;
+            position: relative;
+            text-align: center;
+            box-sizing: border-box;
+        }
+        .progressContainer {
+            position: absolute;
+            width: 0px;
+            left: 5px;
+            top: 1px; bottom: 1px;
+            background-color: rgba(0,0,255,0.3);
+        }
+        .upCancel { text-align: center; }
+        .fa.cancel {
+            color: rgb(255, 0, 115);
+        }
+    }
+}
+
 // hack for our cross-origin iframe
 #cors-store {
     display: none;