diff options
author | Pushkar Joshi | 2012-05-11 08:55:46 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-11 08:55:46 -0700 |
commit | d7d6f03257f9e938321cfea0e9f98e99cca7c397 (patch) | |
tree | 05f89cf903b26cab6233dc6dfa7c6f18b5947c2c /js/stage/stage-view.reel | |
parent | de9f718b739ef2b31a161d9dac6e81d614fab853 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-d7d6f03257f9e938321cfea0e9f98e99cca7c397.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/stage/stage-view.reel')
-rwxr-xr-x | js/stage/stage-view.reel/stage-view.css | 29 |
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 | ||
44 | span.CodeMirror-matchhighlight { background: #e9e9e9 } | 35 | span.CodeMirror-matchhighlight { background: #e9e9e9 } |
45 | .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } | 36 | .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } |