diff options
author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/stage/stage.reel/stage.css | |
parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage/stage.reel/stage.css')
-rwxr-xr-x | js/stage/stage.reel/stage.css | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css index 54b9761b..2271cd8a 100755 --- a/js/stage/stage.reel/stage.css +++ b/js/stage/stage.reel/stage.css | |||
@@ -10,4 +10,57 @@ | |||
10 | box-flex: 1; | 10 | box-flex: 1; |
11 | position: relative; | 11 | position: relative; |
12 | overflow: hidden; | 12 | overflow: hidden; |
13 | } \ No newline at end of file | 13 | } |
14 | |||
15 | .montage-editor-container { | ||
16 | z-index: 8; | ||
17 | } | ||
18 | |||
19 | .stageAndScenesContainer .montage-editor { | ||
20 | -webkit-user-select:text; | ||
21 | } | ||
22 | |||
23 | .codeViewContainer { | ||
24 | position: absolute; | ||
25 | top: 0px; | ||
26 | left: 0px; | ||
27 | margin: 0px; | ||
28 | padding: 0px; | ||
29 | background-color: #ffffff; | ||
30 | width: 100%; | ||
31 | height: 100%; | ||
32 | overflow:auto; | ||
33 | cursor:text; | ||
34 | } | ||
35 | |||
36 | .codeViewContainer .CodeMirror { | ||
37 | width: 100%; | ||
38 | height: 100%; | ||
39 | background: white; | ||
40 | } | ||
41 | |||
42 | .codeViewContainer .CodeMirror-scroll { | ||
43 | height: 100%; | ||
44 | overflow: auto; | ||
45 | } | ||
46 | |||
47 | .codeViewContainer>div{ | ||
48 | width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/ | ||
49 | } | ||
50 | |||
51 | span.CodeMirror-matchhighlight { background: #e9e9e9 } | ||
52 | .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important } | ||
53 | div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;background-color: #ffd500;} | ||
54 | .CodeMirror-completions select {background-color:#e8f2ff;border:1px solid #c1c1c1;box-shadow: 8px 8px 8px rgba(0, 0, 0, 0.8);} | ||
55 | .CodeMirror-completions {z-index:6001 !important;} | ||
56 | |||
57 | .cm-s-default .activeline {background: #e8f2ff; !important} | ||
58 | .cm-s-eclipse .activeline {background: #e8f2ff; !important} | ||
59 | .cm-s-elegant .activeline {background: #e8f2ff; !important} | ||
60 | .cm-s-neat .activeline {background: #e8f2ff; !important} | ||
61 | .cm-s-night .activeline {background: #8da6ce; !important} | ||
62 | .cm-s-cobalt .activeline {background: #8da6ce; !important} | ||
63 | .cm-s-monokai .activeline {background: #8da6ce; !important} | ||
64 | .cm-s-rubyblue .activeline {background: #3E7087; !important} | ||
65 | .cm-s-lesser-dark .activeline {background: #8da6ce; !important} | ||
66 | .cm-s-xq-dark .activeline {background: #8da6ce; !important} | ||