From 6cd0de19f9ecccd18e6aa7b2c2e06ba31f3ac7ca Mon Sep 17 00:00:00 2001
From: Oleksandr Zhurbenko <xaerok.od.ua@gmail.com>
Date: Thu, 21 Apr 2016 12:21:01 -0700
Subject: [PATCH] Added necessary imports and temporary styling to make it all
 work after the merge

---
 bigbluebutton-html5/client/stylesheets/style.less           | 6 ++++++
 .../client/views/whiteboard/EmojiContainer.jsx              | 2 ++
 bigbluebutton-html5/client/views/whiteboard/Whiteboard.jsx  | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/bigbluebutton-html5/client/stylesheets/style.less b/bigbluebutton-html5/client/stylesheets/style.less
index 4daebca9c3..1056765b7a 100755
--- a/bigbluebutton-html5/client/stylesheets/style.less
+++ b/bigbluebutton-html5/client/stylesheets/style.less
@@ -1,6 +1,12 @@
 @import "variables";
 @import "mixins";
 
+#testing {
+  width: 100%;
+  height: 100%;
+}
+
+
 body {
   background: extract(@white, 3);
   bottom: 0;
diff --git a/bigbluebutton-html5/client/views/whiteboard/EmojiContainer.jsx b/bigbluebutton-html5/client/views/whiteboard/EmojiContainer.jsx
index be8a1232db..c13d9436f3 100755
--- a/bigbluebutton-html5/client/views/whiteboard/EmojiContainer.jsx
+++ b/bigbluebutton-html5/client/views/whiteboard/EmojiContainer.jsx
@@ -1,3 +1,5 @@
+import classNames from 'classnames';
+
 EmojiContainer = React.createClass ({
   mixins: [ReactMeteorData],
   getMeteorData() {
diff --git a/bigbluebutton-html5/client/views/whiteboard/Whiteboard.jsx b/bigbluebutton-html5/client/views/whiteboard/Whiteboard.jsx
index 51117604cb..07c8c69a57 100755
--- a/bigbluebutton-html5/client/views/whiteboard/Whiteboard.jsx
+++ b/bigbluebutton-html5/client/views/whiteboard/Whiteboard.jsx
@@ -1,3 +1,5 @@
+import classNames from 'classnames';
+
 Whiteboard = React.createClass({
   mixins: [ReactMeteorData],
   getMeteorData() {