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

2017-12-11 12:21:17 +01:00
parent 0080dd7624 5f0a865028
commit 353b146644
57 changed files with 734 additions and 2711 deletions
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -5,9 +5,11 @@
@import (once) '../../customize/src/less2/include/alertify.less';
@import (once) '../../customize/src/less2/include/tokenfield.less';

-@_cp-toolbar-color-warn: @colortheme_code-warn;
-
-.toolbar_main();
+.toolbar_main(
+    @bg-color: @colortheme_code-bg,
+    @warn-color: @colortheme_code-warn,
+    @color: @colortheme_code-color
+);
 .fileupload_main();
 .alertify_main();
 .tokenfield_main();