Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index 13537ba1..2c2e30d3 100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
@@ -12,6 +12,16 @@
     overflow: hidden;
 }
 
+.montage-editor-container {
+    z-index: 8;
+    display: none;
+    position: absolute;
+}
+
+.stageAndScenesContainer .montage-editor {
+    -webkit-user-select:text;
+}
+
 .codeViewContainer {
   position: absolute;
   top: 0px;
@@ -55,4 +65,5 @@ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;backgroun
 .cm-s-monokai .activeline {background: #8da6ce; !important}
 .cm-s-rubyblue .activeline {background: #3E7087; !important}
 .cm-s-lesser-dark .activeline {background: #8da6ce; !important}
-.cm-s-xq-dark .activeline {background: #8da6ce; !important}
\ No newline at end of file
+.cm-s-xq-dark .activeline {background: #8da6ce; !important}
+