Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/src/less2/include/colortheme.less

@@ -41,6 +41,7 @@
 
 @colortheme_pad-bg: #1c4fa0;
 @colortheme_pad-color: #fff;
+@colortheme_pad-toolbar-bg: #c1e7ff;
 
 @colortheme_slide-bg: #e57614;
 @colortheme_slide-color: #fff;
@@ -50,6 +51,9 @@
 
 @colortheme_poll-bg: #006304;
 @colortheme_poll-color: #fff;
+@colortheme_poll-help-bg: #bbffbb;
+@colortheme_poll-th-bg: #005bef;
+@colortheme_poll-th-fg: #fff;
 
 @colortheme_whiteboard-bg: #800080;
 @colortheme_whiteboard-color: #fff;
@@ -60,7 +64,7 @@
 @colortheme_file-bg: #cd2532;
 @colortheme_file-color: #fff;
 
-@colortheme_friends-bg: #607B8D;
+@colortheme_friends-bg: #607b8d;
 @colortheme_friends-color: #fff;
 
 @colortheme_default-bg: #ddd;

www/assert/main.js

@@ -237,6 +237,14 @@ define([
             !secret.hashData.present);
     }, "test support for trailing slashes in version 1 hash failed to parse");
 
+    assert(function (cb) {
+        var secret = Cryptpad.parsePadUrl('/invite/#/1/ilrOtygzDVoUSRpOOJrUuQ/e8jvf36S3chzkkcaMrLSW7PPrz7VDp85lIFNI26dTmr=/');
+        var hd = secret.hashData;
+        cb(hd.channel === "ilrOtygzDVoUSRpOOJrUuQ" &&
+            hd.pubkey === "e8jvf36S3chzkkcaMrLSW7PPrz7VDp85lIFNI26dTmr=" &&
+            hd.type === 'invite');
+    }, "test support for invite urls");
+
     assert(function (cb) {
         // TODO
         return cb(true);

www/pad/app-pad.less

@@ -1,3 +1,7 @@
+// Defaults to avoid breaking existing themes
+
+@colortheme_pad-toolbar-bg: #c1e7ff;
+
 @import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tokenfield.less';
@@ -16,7 +20,7 @@
     #cke_1_toolbox {
         display: inline-block;
         width: 100%;
-        background-color: #c1e7ff;
+        background-color: @colortheme_pad-toolbar-bg;
     }
     #cke_1_toolbox .cke_toolbar {
         height: 28px;

www/poll/app-poll.less

@@ -1,3 +1,9 @@
+// Defaults to avoid breaking existing themes
+
+@colortheme_poll-th-bg: #005bef;
+@colortheme_poll-th-fg: #fff;
+@colortheme_poll-help-bg: #bbffbb;
+
 @import (once) "../../customize/src/less2/include/browser.less";
 @import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
@@ -14,15 +20,15 @@
 
 @poll-fore: #555;
 
-@poll-th-bg: #005bef;
-@poll-th-fg: #fff;
+@poll-th-bg: @colortheme_poll-th-bg;
+@poll-th-fg: @colortheme_poll-th-fg;
 @poll-th-user-bg: darken(@poll-th-bg, 10%);
 @poll-editing: lighten(@poll-th-bg, 10%);
 @poll-winner: darken(@poll-th-bg, 15%);
 @poll-td-bg: @poll-th-bg;
 @poll-td-fg: @poll-th-fg;
 
-@poll-help-bg: #bbffbb; // lightgreen
+@poll-help-bg: @colortheme_poll-help-bg;
 
 @poll-uncommitted-cell: #eee;
 @poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%);