diff options
author | Kruti Shah | 2012-06-27 09:25:42 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-27 09:25:42 -0700 |
commit | d6bffa2450f68bdf9bfff0f4e155778f59f3624a (patch) | |
tree | c37300f67a3fb502d7f4e277600944739d48fd82 /js/stage/stage.reel/stage.css | |
parent | b52747edbeba7d210fca98acccb2d2df52134bca (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-d6bffa2450f68bdf9bfff0f4e155778f59f3624a.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/stage/stage.reel/stage.css')
-rwxr-xr-x | js/stage/stage.reel/stage.css | 13 |
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 @@ | |||
12 | overflow: hidden; | 12 | overflow: hidden; |
13 | } | 13 | } |
14 | 14 | ||
15 | .montage-editor-container { | ||
16 | z-index: 8; | ||
17 | display: none; | ||
18 | position: absolute; | ||
19 | } | ||
20 | |||
21 | .stageAndScenesContainer .montage-editor { | ||
22 | -webkit-user-select:text; | ||
23 | } | ||
24 | |||
15 | .codeViewContainer { | 25 | .codeViewContainer { |
16 | position: absolute; | 26 | position: absolute; |
17 | top: 0px; | 27 | top: 0px; |
@@ -55,4 +65,5 @@ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;backgroun | |||
55 | .cm-s-monokai .activeline {background: #8da6ce; !important} | 65 | .cm-s-monokai .activeline {background: #8da6ce; !important} |
56 | .cm-s-rubyblue .activeline {background: #3E7087; !important} | 66 | .cm-s-rubyblue .activeline {background: #3E7087; !important} |
57 | .cm-s-lesser-dark .activeline {background: #8da6ce; !important} | 67 | .cm-s-lesser-dark .activeline {background: #8da6ce; !important} |
58 | .cm-s-xq-dark .activeline {background: #8da6ce; !important} \ No newline at end of file | 68 | .cm-s-xq-dark .activeline {background: #8da6ce; !important} |
69 | |||