Merge branch 'staging'

Author: beowulf11

client-participation/css/conversationView.scss

@@ -103,6 +103,7 @@ img {
 }
 
 .conversationViewRoot {
+  margin-top: 1px;
   overflow: hidden; // trim carousel contents. carousel lives in an overflow: visible container, this crops it.
 }
 

client-participation/js/main.js

@@ -72,14 +72,16 @@ function getHeight() {
   var DOCUMENT_HEIGHT_FUDGE_FACTOR = 10; // prevent scrollbar, not sure why it's not correct without this.
   return $(document.body).outerHeight() + DOCUMENT_HEIGHT_FUDGE_FACTOR;
 }
-var oldDocumentHeight = undefined;
-setInterval(function() {
-  var nu = getHeight();
-  if (nu !== oldDocumentHeight) {
-    oldDocumentHeight = nu;
-    PostMessageUtils.postResizeEvent(nu);
-  }
-}, 200);
+if (isEmbedded()) {
+  var oldDocumentHeight = undefined;
+  setInterval(function () {
+    var nu = getHeight();
+    if (nu !== oldDocumentHeight) {
+      oldDocumentHeight = nu;
+      PostMessageUtils.postResizeEvent(nu);
+    }
+  }, 200);
+}
 
 function stripParams(paramsToStrip) {
   var params = Utils.decodeParams(encodedParams);