Merge branch 'refs/heads/ninja-internal' into WebGLFixes

1 files changed, 10 insertions, 19 deletions

diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css
index e2c4bb0e..8afb52a2 100755
--- a/js/stage/stage-view.reel/stage-view.css
+++ b/js/stage/stage-view.reel/stage-view.css
@@ -17,29 +17,20 @@
   cursor:text;
 }
 
-.codeViewContainer>div{
-    width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
+.codeViewContainer .CodeMirror {
+    width: 100%;
+    height: 100%;
+    background: white;
 }
 
-/* OLD CSS for reference
-#mainContent #codeMirror_1 {
-    height:100%;
+.codeViewContainer .CodeMirror-scroll {
+    height: 100%;
+    overflow: auto;
 }
-*/
-
-/*.CodeMirror {*/
-    /*width: 100%;*/
-    /*height: 100%;*/
-    /*background: white;*/
-/*}*/
-
-/*.CodeMirror .CodeMirror-scroll {*/
-    /*height: 100%;*/
-    /*overflow: scroll;*/
-    /*overflow-x: auto;*/
-    /*overflow-y: auto;*/
-/*}*/
 
+.codeViewContainer>div{
+    width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
+}
 
 span.CodeMirror-matchhighlight { background: #e9e9e9 }
 .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }