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

2017-04-07 14:54:13 +02:00
parent dedf2b3c69 e87992c7ec
commit a13261abaa
8 changed files with 130 additions and 233 deletions
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@@ -12,5 +12,24 @@ define(function() {
     */
    config.notificationTimeout = 5000;

+    config.whiteboardPalette = [
+        '#000000', // black
+        '#FFFFFF', // white
+        '#848484', // grey
+        '#8B4513', // saddlebrown
+        '#FF0000', // red
+        '#FF8080', // peach?
+        '#FF8000', // orange
+        '#FFFF00', // yellow
+        '#80FF80', // light green
+        '#00FF00', // green
+        '#00FFFF', // cyan
+        '#008B8B', // dark cyan
+        '#0000FF', // blue
+        '#FF00FF', // fuschia
+        '#FF00C0', // hot pink
+        '#800080', // purple
+    ];
+
    return config;
 });