From c51a1317a767dcd5dfded822815305d4330f4892 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 7 May 2012 15:43:24 -0700
Subject: removed incorrect id selector css for code view container since its
 breaking it.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 css/ninja.css                           |  8 --------
 js/stage/stage-view.reel/stage-view.css | 29 ++++++++++-------------------
 scss/imports/scss/_Stage.scss           | 27 ---------------------------
 3 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/css/ninja.css b/css/ninja.css
index 6a804e99..cd7a35ab 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -204,14 +204,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 .layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; }
 
-#codeViewContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; background: black; width: 100%; height: 100%; display: none; }
-
-#mainContent #codeMirror_1 { height: 100%; }
-
-#mainContent .CodeMirror { width: 100%; height: 100%; background: white; }
-
-#mainContent .CodeMirror-scroll { height: 100%; overflow: auto; }
-
 .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
 
 .montage-editor { padding: 0px; word-wrap: normal; }
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 }
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 4644e3ba..ed8d0656 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -164,33 +164,6 @@
     z-index: 4;
 }
 
-#codeViewContainer {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    margin: 0px;
-    padding: 0px;
-    background: $color-app-bg;
-    width:100%;
-    height:100%;
-    display:none;
-}
-
-#mainContent #codeMirror_1 {
-    height:100%;
-}
-
-#mainContent .CodeMirror {
-    width: 100%;
-    height: 100%;
-    background: white;
-}
-
-#mainContent .CodeMirror-scroll {
-    height: 100%;
-    overflow: auto;
-}
-
 .montage-editor-frame {
     position:absolute;
     z-index:7;
-- 
cgit v1.2.3