aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorhwc4872012-05-08 15:54:15 -0700
committerhwc4872012-05-08 15:54:15 -0700
commit7af54816bb6311421f976661d07b7776d5cd37c9 (patch)
treefd5b734778b01a9c938b0094b8dd7291f6648d3d /js/stage
parent91a9e02bff0397ec9b1f55fdf61cef72eb0d8a0f (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-7af54816bb6311421f976661d07b7776d5cd37c9.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.css29
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 @@
17 cursor:text; 17 cursor:text;
18} 18}
19 19
20.codeViewContainer>div{ 20.codeViewContainer .CodeMirror {
21 width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/ 21 width: 100%;
22 height: 100%;
23 background: white;
22} 24}
23 25
24/* OLD CSS for reference 26.codeViewContainer .CodeMirror-scroll {
25#mainContent #codeMirror_1 { 27 height: 100%;
26 height:100%; 28 overflow: auto;
27} 29}
28*/
29
30/*.CodeMirror {*/
31 /*width: 100%;*/
32 /*height: 100%;*/
33 /*background: white;*/
34/*}*/
35
36/*.CodeMirror .CodeMirror-scroll {*/
37 /*height: 100%;*/
38 /*overflow: scroll;*/
39 /*overflow-x: auto;*/
40 /*overflow-y: auto;*/
41/*}*/
42 30
31.codeViewContainer>div{
32 width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
33}
43 34
44span.CodeMirror-matchhighlight { background: #e9e9e9 } 35span.CodeMirror-matchhighlight { background: #e9e9e9 }
45.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } 36.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }