Merge branch 'wb' into staging

2017-10-13 16:58:59 +02:00
parent 7b6432f134 5e7bf0cfb8
commit 2fd120100a
4 changed files with 85 additions and 21 deletions
--- a/www/whiteboard/app-whiteboard.less
+++ b/www/whiteboard/app-whiteboard.less
@@ -25,6 +25,10 @@
        display: none;
    }

+    #cp-app-whiteboard-media-hidden {
+        display: none;
+    }
+
    // created in the html
    #cp-app-whiteboard-canvas-area {
        flex: 1;