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

2017-09-13 18:18:45 +02:00
parent e0ae0fcd91 47cfa0cf45
commit 2797a77f5d
19 changed files with 71 additions and 583 deletions
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -21,6 +21,9 @@
@colortheme_modal-link-visited: lighten(@colortheme_modal-link, 10%);
@colortheme_modal-dim: rgba(0, 0, 0, 0.4);

+@colortheme_loading-bg: #222;
+@colortheme_loading-color: @colortheme_old-fore;
+
@colortheme_modal-input: #111;

@colortheme_alertify-red: #E55236;